rpms/iproute/devel iproute2-2.6.29-fix_headers_for_gre.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 iproute-ip-man.patch, 1.6, 1.7 iproute.spec, 1.93, 1.94 iproute2-2.6.25-segfault.patch, 1.4, 1.5 iproute2-2.6.9-kernel.patch, 1.6, 1.7 iproute2-sharepath.patch, 1.1, 1.2 iproute2-ss050901-opt_flags.patch, 1.8, 1.9 sources, 1.28, 1.29 iproute2-ddr_support.patch, 1.1, NONE
Marcela Mašláňová
mmaslano at fedoraproject.org
Wed Mar 25 12:50:13 UTC 2009
Author: mmaslano
Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18094
Modified Files:
.cvsignore iproute-ip-man.patch iproute.spec
iproute2-2.6.25-segfault.patch iproute2-2.6.9-kernel.patch
iproute2-sharepath.patch iproute2-ss050901-opt_flags.patch
sources
Added Files:
iproute2-2.6.29-fix_headers_for_gre.patch
Removed Files:
iproute2-ddr_support.patch
Log Message:
* Wed Mar 25 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.29-1
- update to 2.6.29
- remove DDR patch which became part of sourc
- add patch with correct headers 1957a322c9932e1a1d2ca1fd37ce4b335ceb7113
iproute2-2.6.29-fix_headers_for_gre.patch:
--- NEW FILE iproute2-2.6.29-fix_headers_for_gre.patch ---
>From 1957a322c9932e1a1d2ca1fd37ce4b335ceb7113 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger at vyatta.com>
Date: Tue, 24 Mar 2009 15:40:54 -0700
Subject: [PATCH] Fix headers needed for gre
Need to get right headers or build breaks.
---
ip/link_gre.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ip/link_gre.c b/ip/link_gre.c
index 9109312..9f8bde6 100644
--- iproute-2.6.29/iproute2-2.6.29/ip/link_gre.c.old
+++ iproute-2.6.29/iproute2-2.6.29/ip/link_gre.c
@@ -12,11 +12,12 @@
#include <string.h>
#include <net/if.h>
-#include <linux/if_tunnel.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
+#include <linux/ip.h>
+#include <linux/if_tunnel.h>
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
--
1.6.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 19 Jan 2009 13:02:46 -0000 1.28
+++ .cvsignore 25 Mar 2009 12:49:42 -0000 1.29
@@ -1 +1 @@
-iproute2-2.6.28.tar.bz2
+iproute2-2.6.29.tar.bz2
iproute-ip-man.patch:
Index: iproute-ip-man.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute-ip-man.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iproute-ip-man.patch 19 Jan 2009 13:02:46 -0000 1.6
+++ iproute-ip-man.patch 25 Mar 2009 12:49:42 -0000 1.7
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8.mm iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8
---- iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8.mm 2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.28/iproute2-2.6.28/man/man8/ip.8 2008-08-12 14:24:01.000000000 +0200
+diff -up iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8
+--- iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8.mm 2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.29/iproute2-2.6.29/man/man8/ip.8 2008-08-12 14:24:01.000000000 +0200
@@ -190,6 +190,8 @@ replace " | " monitor " } "
.IR NUMBER " ] [ "
.B cwnd
Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- iproute.spec 25 Feb 2009 07:44:53 -0000 1.93
+++ iproute.spec 25 Mar 2009 12:49:42 -0000 1.94
@@ -3,8 +3,8 @@
Summary: Advanced IP routing and network device configuration tools
Name: iproute
-Version: 2.6.28
-Release: 3%{?dist}
+Version: 2.6.29
+Release: 1%{?dist}
Group: Applications/System
Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
#Source1: iproute-doc-2.6.22.tar.gz
@@ -14,7 +14,7 @@
Patch3: iproute-ip-man.patch
Patch4: iproute2-2.6.25-segfault.patch
Patch5: iproute2-sharepath.patch
-Patch6: iproute2-ddr_support.patch
+Patch6: iproute2-2.6.29-fix_headers_for_gre.patch
License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,7 +33,7 @@
%patch3 -p1
%patch4 -p1 -b .seg
%patch5 -p1 -b .share
-%patch6 -p1 -b .ddr
+%patch6 -p1 -b .hdrs
%build
export LIBDIR=%{_libdir}
@@ -109,6 +109,11 @@
%config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
%changelog
+* Wed Mar 25 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.29-1
+- update to 2.6.29
+- remove DDR patch which became part of sourc
+- add patch with correct headers 1957a322c9932e1a1d2ca1fd37ce4b335ceb7113
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.28-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
iproute2-2.6.25-segfault.patch:
Index: iproute2-2.6.25-segfault.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.25-segfault.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- iproute2-2.6.25-segfault.patch 19 Jan 2009 13:02:46 -0000 1.4
+++ iproute2-2.6.25-segfault.patch 25 Mar 2009 12:49:42 -0000 1.5
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c.seg iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c
---- iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c.seg 2008-07-21 17:23:12.000000000 +0200
-+++ iproute2-2.6.28/iproute2-2.6.28/ip/xfrm_state.c 2008-07-22 09:27:12.000000000 +0200
+diff -up iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c.seg iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c
+--- iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c.seg 2008-07-21 17:23:12.000000000 +0200
++++ iproute2-2.6.29/iproute2-2.6.29/ip/xfrm_state.c 2008-07-22 09:27:12.000000000 +0200
@@ -158,12 +158,16 @@ static int xfrm_algo_parse(struct xfrm_a
buf[j] = val;
}
iproute2-2.6.9-kernel.patch:
Index: iproute2-2.6.9-kernel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-2.6.9-kernel.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iproute2-2.6.9-kernel.patch 19 Jan 2009 13:02:46 -0000 1.6
+++ iproute2-2.6.9-kernel.patch 25 Mar 2009 12:49:42 -0000 1.7
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.28/iproute2-2.6.28/Makefile.kernel iproute2-2.6.28/iproute2-2.6.28/Makefile
---- iproute2-2.6.28/iproute2-2.6.28/Makefile.kernel 2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.28/iproute2-2.6.28/Makefile 2008-08-12 14:19:58.000000000 +0200
+diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.kernel iproute2-2.6.29/iproute2-2.6.29/Makefile
+--- iproute2-2.6.29/iproute2-2.6.29/Makefile.kernel 2008-07-25 22:46:07.000000000 +0200
++++ iproute2-2.6.29/iproute2-2.6.29/Makefile 2008-08-12 14:19:58.000000000 +0200
@@ -3,6 +3,7 @@ SBINDIR=/sbin
CONFDIR=/etc/iproute2
DOCDIR=/share/doc/iproute2
iproute2-sharepath.patch:
Index: iproute2-sharepath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-sharepath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iproute2-sharepath.patch 4 Feb 2009 08:33:47 -0000 1.1
+++ iproute2-sharepath.patch 25 Mar 2009 12:49:42 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c.movelib iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c
---- iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c.movelib 2009-01-15 21:25:04.000000000 +0100
-+++ iproute-2.6.28/iproute2-2.6.28/tc/tc_util.c 2009-02-04 08:58:36.000000000 +0100
+diff -up iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c.movelib iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c
+--- iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c.movelib 2009-01-15 21:25:04.000000000 +0100
++++ iproute-2.6.29/iproute2-2.6.29/tc/tc_util.c 2009-02-04 08:58:36.000000000 +0100
@@ -24,8 +24,8 @@
#include "utils.h"
#include "tc_util.h"
iproute2-ss050901-opt_flags.patch:
Index: iproute2-ss050901-opt_flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute2-ss050901-opt_flags.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- iproute2-ss050901-opt_flags.patch 19 Jan 2009 13:02:46 -0000 1.8
+++ iproute2-ss050901-opt_flags.patch 25 Mar 2009 12:49:42 -0000 1.9
@@ -1,6 +1,6 @@
-diff -up iproute2-2.6.28/iproute2-2.6.28/Makefile.opt iproute2-2.6.28/iproute2-2.6.28/Makefile
---- iproute2-2.6.28/iproute2-2.6.28/Makefile.opt 2008-08-12 14:19:58.000000000 +0200
-+++ iproute2-2.6.28/iproute2-2.6.28/Makefile 2008-08-12 14:21:42.000000000 +0200
+diff -up iproute2-2.6.29/iproute2-2.6.29/Makefile.opt iproute2-2.6.29/iproute2-2.6.29/Makefile
+--- iproute2-2.6.29/iproute2-2.6.29/Makefile.opt 2008-08-12 14:19:58.000000000 +0200
++++ iproute2-2.6.29/iproute2-2.6.29/Makefile 2008-08-12 14:21:42.000000000 +0200
@@ -22,7 +22,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
CC = gcc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 19 Jan 2009 13:02:46 -0000 1.28
+++ sources 25 Mar 2009 12:49:42 -0000 1.29
@@ -1 +1 @@
-595f9b17320f69e8d30d2fa80f1bca14 iproute2-2.6.28.tar.bz2
+a3ecfaa091289656fae786b027b44eda iproute2-2.6.29.tar.bz2
--- iproute2-ddr_support.patch DELETED ---
More information about the fedora-extras-commits
mailing list