From 9efa18f549f63854726230c40fa96a8b0daa679a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 22 May 2012 15:20:38 +0200 Subject: [PATCH] 3.4.0 bump --- .gitignore | 1 + iproute.spec | 29 +++++++++---------- iproute2-2.6.29-kernel.patch | 11 ------- iproute2-3.4.0-kernel.patch | 12 ++++++++ iproute2-3.4.0-optflags.patch | 13 +++++++++ ...th.patch => iproute2-3.4.0-sharepath.patch | 11 +++---- iproute2-print-route-u32.patch | 20 ------------- iproute2-ss050901-opt_flags.patch | 12 -------- man-pages.patch | 6 ---- sources | 2 +- 10 files changed, 46 insertions(+), 71 deletions(-) delete mode 100644 iproute2-2.6.29-kernel.patch create mode 100644 iproute2-3.4.0-kernel.patch create mode 100644 iproute2-3.4.0-optflags.patch rename iproute2-sharepath.patch => iproute2-3.4.0-sharepath.patch (50%) delete mode 100644 iproute2-print-route-u32.patch delete mode 100644 iproute2-ss050901-opt_flags.patch diff --git a/.gitignore b/.gitignore index 102c98b..56e0a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ iproute2-2.6.35.tar.bz2 /iproute2-3.1.0.tar.bz2 /iproute2-3.2.0.tar.bz2 /iproute2-3.3.0.tar.gz +/iproute2-3.4.0.tar.gz diff --git a/iproute.spec b/iproute.spec index b23b0bd..3261da3 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,24 +1,23 @@ %global cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools Name: iproute -Version: 3.3.0 -Release: 2%{?dist} +Version: 3.4.0 +Release: 1%{?dist} Group: Applications/System URL: http://kernel.org/pub/linux/utils/net/%{name}2/ Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz Source1: cbq-0000.example Source2: avpkt Patch0: man-pages.patch -Patch1: iproute2-2.6.29-kernel.patch -Patch2: iproute2-ss050901-opt_flags.patch -Patch3: iproute2-sharepath.patch +Patch1: iproute2-3.4.0-kernel.patch +Patch2: iproute2-3.4.0-optflags.patch +Patch3: iproute2-3.4.0-sharepath.patch Patch4: iproute2-2.6.31-tc_modules.patch Patch5: iproute2-2.6.29-IPPROTO_IP_for_SA.patch Patch6: iproute2-example-cbq-service.patch Patch7: iproute2-2.6.35-print-route.patch -Patch8: iproute2-print-route-u32.patch -Patch9: iproute2-2.6.39-create-peer-veth-without-a-name.patch -Patch10: iproute2-2.6.39-lnstat-dump-to-stdout.patch +Patch8: iproute2-2.6.39-create-peer-veth-without-a-name.patch +Patch9: iproute2-2.6.39-lnstat-dump-to-stdout.patch License: GPLv2+ and Public Domain BuildRequires: tex(latex) tex(dvips) linuxdoc-tools BuildRequires: flex linux-atm-libs-devel psutils db4-devel bison @@ -62,9 +61,8 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8 %patch5 -p1 -b .ipproto %patch6 -p1 -b .fix_cbq %patch7 -p1 -b .print-route -%patch8 -p1 -b .print-route-u32 -%patch9 -p1 -b .peer-veth-without-name -%patch10 -p1 -b .lnstat-dump-to-stdout +%patch8 -p1 -b .peer-veth-without-name +%patch9 -p1 -b .lnstat-dump-to-stdout %build export LIBDIR=/%{_libdir} @@ -127,11 +125,6 @@ iconv -f latin1 -t utf8 man/man8/ss.8 > man/man8/ss.8.utf8 && mv man/man8/ss.8.utf8 man/man8/ss.8 install -m644 man/man3/*.3 %{buildroot}%{_mandir}/man3 install -m644 man/man8/*.8 %{buildroot}%{_mandir}/man8 -cd %{buildroot}%{_mandir}/man8 - ln -s lnstat.8 ctstat.8 - ln -s lnstat.8 rtstat.8 - ln -s routel.8 routef.8 -cd - # Share files for shared in \ @@ -175,6 +168,10 @@ done %{_includedir}/libnetlink.h %changelog +* Tue May 22 2012 Petr Šabata - 3.4.0-1 +- 3.4.0 bump +- Drop the print route patch (included upstream) + * Mon Apr 30 2012 Petr Šabata - 3.3.0-2 - Let's install rtmon too... (#814819) diff --git a/iproute2-2.6.29-kernel.patch b/iproute2-2.6.29-kernel.patch deleted file mode 100644 index df9125a..0000000 --- a/iproute2-2.6.29-kernel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up iproute2-20091009/Makefile.kernel iproute2-20091009/Makefile ---- iproute2-20091009/Makefile.kernel 2009-09-21 10:26:11.000000000 +0200 -+++ iproute2-20091009/Makefile 2009-10-09 12:27:03.687382422 +0200 -@@ -6,6 +6,7 @@ CONFDIR=/etc/iproute2 - DOCDIR=/share/doc/iproute2 - MANDIR=/share/man - ARPDDIR=/var/lib/arpd -+KERNEL_INCLUDE=/usr/include - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include diff --git a/iproute2-3.4.0-kernel.patch b/iproute2-3.4.0-kernel.patch new file mode 100644 index 0000000..1e83729 --- /dev/null +++ b/iproute2-3.4.0-kernel.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index c107955..1e15c72 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,6 +7,7 @@ DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 + MANDIR=$(DATADIR)/man + ARPDDIR=/var/lib/arpd ++KERNEL_INCLUDE=/usr/include + + # Path to db_185.h include + DBM_INCLUDE:=$(ROOTDIR)/usr/include diff --git a/iproute2-3.4.0-optflags.patch b/iproute2-3.4.0-optflags.patch new file mode 100644 index 0000000..1dd23cf --- /dev/null +++ b/iproute2-3.4.0-optflags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 1e15c72..945d3b3 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,7 +36,7 @@ HOSTCC = gcc + DEFINES += -D_GNU_SOURCE + CCOPTS = -O2 + WFLAGS = -Wall -Wstrict-prototypes +-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) ++CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(RPM_OPT_FLAGS) + YACCFLAGS = -d -t -v + + SUBDIRS=lib ip tc misc netem genl man diff --git a/iproute2-sharepath.patch b/iproute2-3.4.0-sharepath.patch similarity index 50% rename from iproute2-sharepath.patch rename to iproute2-3.4.0-sharepath.patch index f314922..2a29677 100644 --- a/iproute2-sharepath.patch +++ b/iproute2-3.4.0-sharepath.patch @@ -1,14 +1,15 @@ -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 ---- iproute2-2.6.29/tc/tc_util.c.movelib 2009-01-15 21:25:04.000000000 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-02-04 08:58:36.000000000 +0100 +diff --git a/tc/tc_util.c b/tc/tc_util.c +index 926ed08..33f6974 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c @@ -24,8 +24,8 @@ #include "utils.h" #include "tc_util.h" -#ifndef LIBDIR --#define LIBDIR "/usr/lib/" +-#define LIBDIR "/usr/lib" +#ifndef SHAREDIR -+#define SHAREDIR "/usr/share/" ++#define SHAREDIR "/usr/share" #endif const char *get_tc_lib(void) diff --git a/iproute2-print-route-u32.patch b/iproute2-print-route-u32.patch deleted file mode 100644 index 48920d8..0000000 --- a/iproute2-print-route-u32.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- iproute2-2.6.35/ip/iproute.c 2010-08-31 13:01:39.151185561 +0200 -+++ iproute2-print-route-u32.c 2010-08-31 13:41:04.072928779 +0200 -@@ -368,7 +368,7 @@ - abuf, sizeof(abuf))); - } - if (tb[RTA_PRIORITY]) -- fprintf(fp, " metric %d ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY])); -+ fprintf(fp, " metric %u ", *(__u32*)RTA_DATA(tb[RTA_PRIORITY])); - if (r->rtm_flags & RTNH_F_DEAD) - fprintf(fp, "dead "); - if (r->rtm_flags & RTNH_F_ONLINK) -@@ -487,7 +487,7 @@ - if (i < sizeof(mx_names)/sizeof(char*) && mx_names[i]) - fprintf(fp, " %s", mx_names[i]); - else -- fprintf(fp, " metric %d", i); -+ fprintf(fp, " metric %u", i); - if (mxlock & (1<