From: Michael Tremer Date: Sun, 29 Jul 2012 10:39:55 +0000 (+0200) Subject: iproute2: Update to 3.4.0. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c33262e903cdec01b237395e2da569ea56424065;p=ipfire-3.x.git iproute2: Update to 3.4.0. Fixes #10196. --- diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 9d85951e3..31dd9da53 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -4,7 +4,7 @@ ############################################################################### name = iproute2 -version = 3.3.0 +version = 3.4.0 release = 1 groups = Networking/Tools @@ -18,7 +18,7 @@ description capabilities of the Linux 2.4.x and 2.6.x kernel. end -source_dl = +source_dl = http://kernel.org/pub/linux/utils/net/iproute2/ sources = %{thisapp}.tar.xz build @@ -52,7 +52,7 @@ build %{BUILDROOT}%{sysconfdir}/iproute2 # Install binaries. - for bin in genl/genl ip/{ifcfg,ip,routef,routel,rtpr} tc/tc \ + for bin in genl/genl ip/{ifcfg,ip,routef,routel,rtmon,rtpr} tc/tc \ misc/{arpd,ifstat,lnstat,nstat,rtacct,ss}; do install -v -m 755 ${bin} %{BUILDROOT}%{sbindir} done diff --git a/iproute2/patches/iproute2-2.6.29-kernel.patch b/iproute2/patches/iproute2-2.6.29-kernel.patch deleted file mode 100644 index df9125ac0..000000000 --- a/iproute2/patches/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/patches/iproute2-3.4.0-kernel.patch b/iproute2/patches/iproute2-3.4.0-kernel.patch new file mode 100644 index 000000000..1e8372978 --- /dev/null +++ b/iproute2/patches/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/patches/iproute2-3.4.0-optflags.patch b/iproute2/patches/iproute2-3.4.0-optflags.patch new file mode 100644 index 000000000..1dd23cf3a --- /dev/null +++ b/iproute2/patches/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/patches/iproute2-sharepath.patch b/iproute2/patches/iproute2-3.4.0-sharepath.patch similarity index 50% rename from iproute2/patches/iproute2-sharepath.patch rename to iproute2/patches/iproute2-3.4.0-sharepath.patch index f31492223..2a29677c1 100644 --- a/iproute2/patches/iproute2-sharepath.patch +++ b/iproute2/patches/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/patches/iproute2-print-route-u32.patch b/iproute2/patches/iproute2-print-route-u32.patch deleted file mode 100644 index 48920d8d4..000000000 --- a/iproute2/patches/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<