From dfc253724f99791bb449674d3a2735a41c744480115506fa356f23417b90033c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 14 Jul 2008 15:48:50 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=13 --- iproute2-2.6.23-iplink.diff | 12 ----- iproute2-2.6.23-qdisc.diff | 10 ---- iproute2-2.6.23-strip.diff | 36 -------------- iproute2-2.6.23.tar.bz2 | 3 -- ...-2.6.23-HZ.diff => iproute2-2.6.25-HZ.diff | 0 ...diff => iproute2-2.6.25-flushcheckuid.diff | 0 ...t.diff => iproute2-2.6.25-fragtimeout.diff | 44 ++++++++--------- ...ir-1.diff => iproute2-2.6.25-libdir-1.diff | 48 +++++++++---------- ...pdfdoc.diff => iproute2-2.6.25-pdfdoc.diff | 0 ...ff => iproute2-2.6.25-resolve-address.diff | 0 ...diff => iproute2-2.6.25-tc-flex-fixes.diff | 0 iproute2-2.6.25.tar.bz2 | 3 ++ iproute2.changes | 15 ++++++ iproute2.spec | 38 ++++++++------- 14 files changed, 86 insertions(+), 123 deletions(-) delete mode 100644 iproute2-2.6.23-iplink.diff delete mode 100644 iproute2-2.6.23-qdisc.diff delete mode 100644 iproute2-2.6.23-strip.diff delete mode 100644 iproute2-2.6.23.tar.bz2 rename iproute2-2.6.23-HZ.diff => iproute2-2.6.25-HZ.diff (100%) rename iproute2-2.6.23-flushcheckuid.diff => iproute2-2.6.25-flushcheckuid.diff (100%) rename iproute2-2.6.23-fragtimeout.diff => iproute2-2.6.25-fragtimeout.diff (91%) rename iproute2-2.6.23-libdir-1.diff => iproute2-2.6.25-libdir-1.diff (67%) rename iproute2-2.6.23-pdfdoc.diff => iproute2-2.6.25-pdfdoc.diff (100%) rename iproute2-2.6.23-resolve-address.diff => iproute2-2.6.25-resolve-address.diff (100%) rename iproute2-2.6.23-tc-flex-fixes.diff => iproute2-2.6.25-tc-flex-fixes.diff (100%) create mode 100644 iproute2-2.6.25.tar.bz2 diff --git a/iproute2-2.6.23-iplink.diff b/iproute2-2.6.23-iplink.diff deleted file mode 100644 index 930c70d..0000000 --- a/iproute2-2.6.23-iplink.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- ip/iplink.c 2008-07-11 11:00:24.000000000 +0200 -+++ ip/iplink.c 2008-07-11 11:02:05.000000000 +0200 -@@ -107,7 +107,8 @@ - { - struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(n); - -- if (n->nlmsg_type == NLMSG_ERROR && err->error == -EOPNOTSUPP) -+ if (n->nlmsg_type == NLMSG_ERROR && -+ (err->error == -EOPNOTSUPP || err->error == -EINVAL)) - have_rtnl_newlink = 0; - else - have_rtnl_newlink = 1; diff --git a/iproute2-2.6.23-qdisc.diff b/iproute2-2.6.23-qdisc.diff deleted file mode 100644 index a57b836..0000000 --- a/iproute2-2.6.23-qdisc.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libnetlink.c 2007-10-16 21:26:51.000000000 +0000 -+++ lib/libnetlink.c 2008-04-09 05:27:02.000000000 +0000 -@@ -632,6 +632,6 @@ - rta = RTA_DATA(rta) + RTA_ALIGN(len); - return parse_rtattr_nested(tb, max, rta); - } -- memset(tb, 0, sizeof(struct rtattr *) * max); -+ memset(tb, 0, sizeof(struct rtattr *) * (max + 1)); - return 0; - } diff --git a/iproute2-2.6.23-strip.diff b/iproute2-2.6.23-strip.diff deleted file mode 100644 index 92b95b3..0000000 --- a/iproute2-2.6.23-strip.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- ip/Makefile -+++ ip/Makefile -@@ -17,7 +17,7 @@ ip: $(IPOBJ) $(LIBNETLINK) $(LIBUTIL) - rtmon: $(RTMONOBJ) $(LIBNETLINK) - - install: all -- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) -+ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) - install -m 0755 $(SCRIPTS) $(DESTDIR)$(SBINDIR) - - clean: ---- misc/Makefile -+++ misc/Makefile -@@ -27,7 +27,7 @@ ssfilter.c: ssfilter.y - lnstat: $(LNSTATOBJ) - - install: all -- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) -+ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) - ln -sf lnstat $(DESTDIR)$(SBINDIR)/rtstat - ln -sf lnstat $(DESTDIR)$(SBINDIR)/ctstat - ---- tc/Makefile -+++ tc/Makefile -@@ -71,9 +71,9 @@ libtc.a: $(TCLIB) - - install: all - mkdir -p $(DESTDIR)/$(LIBDIR)/tc -- install -m 0755 -s tc $(DESTDIR)$(SBINDIR) -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ -- do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \ -+ do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \ - done - - clean: diff --git a/iproute2-2.6.23.tar.bz2 b/iproute2-2.6.23.tar.bz2 deleted file mode 100644 index 3db18ac..0000000 --- a/iproute2-2.6.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f19ed724484df3cb5de766b9bc67374f191d3f15a228b0a5605ef4c57a462fb8 -size 342323 diff --git a/iproute2-2.6.23-HZ.diff b/iproute2-2.6.25-HZ.diff similarity index 100% rename from iproute2-2.6.23-HZ.diff rename to iproute2-2.6.25-HZ.diff diff --git a/iproute2-2.6.23-flushcheckuid.diff b/iproute2-2.6.25-flushcheckuid.diff similarity index 100% rename from iproute2-2.6.23-flushcheckuid.diff rename to iproute2-2.6.25-flushcheckuid.diff diff --git a/iproute2-2.6.23-fragtimeout.diff b/iproute2-2.6.25-fragtimeout.diff similarity index 91% rename from iproute2-2.6.23-fragtimeout.diff rename to iproute2-2.6.25-fragtimeout.diff index 2afd5c1..ba2689d 100644 --- a/iproute2-2.6.23-fragtimeout.diff +++ b/iproute2-2.6.25-fragtimeout.diff @@ -1,6 +1,6 @@ --- doc/ip-cref.tex -+++ doc/ip-cref.tex 2007/07/12 09:13:47 -@@ -1322,7 +1322,11 @@ ++++ doc/ip-cref.tex 2008/05/13 08:23:52 +@@ -1315,7 +1315,11 @@ If it is not given, Linux uses the value selected with \verb|sysctl| variable \verb|net/ipv4/tcp_reordering|. @@ -12,25 +12,8 @@ \item \verb|nexthop NEXTHOP| ---- man/man8/ip.8 -+++ man/man8/ip.8 2007/07/12 09:26:54 -@@ -1095,6 +1095,14 @@ - .BR "net/ipv4/tcp_reordering" . - - .TP -+.BI fragtimeout " NUMBER " "(SuSE extension currently)" -+Fragment timeout in seconds for IP fragments arriving from this distination. -+If it is not given, Linux uses the value selected with -+.B sysctl -+variable -+.BR "net/ipv4/ipfrag_timeout" . -+ -+.TP - .BI nexthop " NEXTHOP" - the nexthop of a multipath route. - .I NEXTHOP ---- ip/iproute.c 2007-10-16 23:27:42.000000000 +0200 -+++ ip/iproute.c 2007-10-25 11:14:18.000000000 +0200 +--- ip/iproute.c ++++ ip/iproute.c 2008/05/13 08:28:32 @@ -37,6 +37,14 @@ #define RTAX_RTTVAR RTAX_HOPS #endif @@ -61,7 +44,7 @@ - fprintf(stderr, " [ rtt TIME ] [ rttvar TIME ]\n"); + fprintf(stderr, " [ rtt TIME ] [ rttvar TIME ] [ fragtimeout seconds ]\n"); fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n"); -- fprintf(stderr, " [ ssthresh NUMBER ] [ realms REALM ]\n"); +- fprintf(stderr, " [ ssthresh NUMBER ] [ realms REALM ] [ src ADDRESS ]\n"); + fprintf(stderr, " [ ssthresh NUMBER ] [ reordering NUMBER ] [ realms REALM ]\n"); fprintf(stderr, " [ rto_min TIME ]\n"); fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n"); @@ -81,3 +64,20 @@ } else if (strcmp(*argv, "rtt") == 0) { unsigned rtt; NEXT_ARG(); +--- man/man8/ip.8 ++++ man/man8/ip.8 2008/05/13 08:25:08 +@@ -1487,6 +1487,14 @@ + .BR "net/ipv4/tcp_reordering" . + + .TP ++.BI fragtimeout " NUMBER " "(SuSE extension currently)" ++Fragment timeout in seconds for IP fragments arriving from this distination. ++If it is not given, Linux uses the value selected with ++.B sysctl ++variable ++.BR "net/ipv4/ipfrag_timeout" . ++ ++.TP + .BI nexthop " NEXTHOP" + the nexthop of a multipath route. + .I NEXTHOP diff --git a/iproute2-2.6.23-libdir-1.diff b/iproute2-2.6.25-libdir-1.diff similarity index 67% rename from iproute2-2.6.23-libdir-1.diff rename to iproute2-2.6.25-libdir-1.diff index 97f32b8..abc939b 100644 --- a/iproute2-2.6.23-libdir-1.diff +++ b/iproute2-2.6.25-libdir-1.diff @@ -1,16 +1,5 @@ ---- include/iptables.h 2007-07-10 18:34:14.000000000 -0700 -+++ include/iptables.h 2007-09-02 08:29:41.000000000 -0700 -@@ -5,7 +5,7 @@ - #include "libiptc/libiptc.h" - - #ifndef IPT_LIB_DIR --#define IPT_LIB_DIR "/usr/local/lib/iptables" -+#define IPT_LIB_DIR LIBDIR - #endif - - #ifndef IPPROTO_SCTP ---- Makefile 2007-07-10 18:34:14.000000000 -0700 -+++ Makefile 2007-09-02 08:38:27.000000000 -0700 +--- Makefile ++++ Makefile 2008/05/13 08:16:28 @@ -1,5 +1,7 @@ DESTDIR= SBINDIR=/usr/sbin @@ -28,8 +17,19 @@ YACCFLAGS = -d -t -v LDLIBS += -L../lib -lnetlink -lutil ---- misc/arpd.c 2007-07-10 18:34:14.000000000 -0700 -+++ misc/arpd.c 2007-09-02 08:38:08.000000000 -0700 +--- include/iptables.h ++++ include/iptables.h 2008/05/13 08:14:15 +@@ -5,7 +5,7 @@ + #include "libiptc/libiptc.h" + + #ifndef IPT_LIB_DIR +-#define IPT_LIB_DIR "/usr/local/lib/iptables" ++#define IPT_LIB_DIR LIBDIR + #endif + + #ifndef IPPROTO_SCTP +--- misc/arpd.c ++++ misc/arpd.c 2008/05/13 08:17:25 @@ -40,7 +40,7 @@ int resolve_hosts; @@ -39,8 +39,8 @@ int ifnum; int *ifvec; ---- netem/Makefile 2007-07-10 18:34:14.000000000 -0700 -+++ netem/Makefile 2007-09-02 08:29:41.000000000 -0700 +--- netem/Makefile ++++ netem/Makefile 2008/05/13 08:18:35 @@ -4,6 +4,8 @@ HOSTCC ?= $(CC) LDLIBS += -lm @@ -62,23 +62,23 @@ done clean: ---- tc/Makefile 2007-07-10 18:34:14.000000000 -0700 -+++ tc/Makefile 2007-09-02 08:29:41.000000000 -0700 -@@ -69,10 +69,10 @@ +--- tc/Makefile ++++ tc/Makefile 2008/05/13 08:19:22 +@@ -72,10 +72,10 @@ $(AR) rcs $@ $(TCLIB) install: all - mkdir -p $(DESTDIR)/usr/lib/tc + mkdir -p $(DESTDIR)/$(LIBDIR)/tc - install -m 0755 -s tc $(DESTDIR)$(SBINDIR) + install -m 0755 tc $(DESTDIR)$(SBINDIR) for i in $(TCSO); \ -- do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \ +- do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \ + do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \ done clean: ---- tc/tc_util.c 2007-07-10 18:34:14.000000000 -0700 -+++ tc/tc_util.c 2007-09-02 08:33:48.000000000 -0700 +--- tc/tc_util.c ++++ tc/tc_util.c 2008/05/13 08:20:15 @@ -30,7 +30,7 @@ lib_dir = getenv("TC_LIB_DIR"); diff --git a/iproute2-2.6.23-pdfdoc.diff b/iproute2-2.6.25-pdfdoc.diff similarity index 100% rename from iproute2-2.6.23-pdfdoc.diff rename to iproute2-2.6.25-pdfdoc.diff diff --git a/iproute2-2.6.23-resolve-address.diff b/iproute2-2.6.25-resolve-address.diff similarity index 100% rename from iproute2-2.6.23-resolve-address.diff rename to iproute2-2.6.25-resolve-address.diff diff --git a/iproute2-2.6.23-tc-flex-fixes.diff b/iproute2-2.6.25-tc-flex-fixes.diff similarity index 100% rename from iproute2-2.6.23-tc-flex-fixes.diff rename to iproute2-2.6.25-tc-flex-fixes.diff diff --git a/iproute2-2.6.25.tar.bz2 b/iproute2-2.6.25.tar.bz2 new file mode 100644 index 0000000..e1eefda --- /dev/null +++ b/iproute2-2.6.25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc0e0f66c0928b5b4d4ae6bc833f3b21d0d4f5dbdaaf0711e42497bf50294512 +size 359144 diff --git a/iproute2.changes b/iproute2.changes index 3c97d95..08eb770 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jul 14 14:33:38 CEST 2008 - ms@suse.de + +- update to version 2.6.25 + * Fix off by one in nested attribute management. + * netem potential dist table overflow + * rto_min value display overflow + * Overhead calculation is now done in the kernel. + * libnetlink: don't spin forever on receive error + * Protocol field on tc_filter is required by the kernel, provide it + * Add missing prefix bit length for addrlabel + * Do not strip binaries with `install` + * In police, fix uninitialized "overhead" variable. + * lots of documentation fixes + ------------------------------------------------------------------- Fri Jul 11 11:03:43 CEST 2008 - ms@suse.de diff --git a/iproute2.spec b/iproute2.spec index cc968fa..dddfd94 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -1,5 +1,5 @@ # -# spec file for package iproute2 (Version 2.6.23) +# spec file for package iproute2 (Version 2.6.25) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,21 +17,18 @@ License: GPL v2 or later Group: Productivity/Networking/Routing Provides: iproute AutoReqProv: on -Version: 2.6.23 -Release: 83 +Version: 2.6.25 +Release: 2 Summary: Advanced Routing Url: http://developer.osdl.org/dev/iproute2/ Source0: %name-%version.tar.bz2 -Patch0: %name-2.6.23-libdir-1.diff -Patch1: %name-2.6.23-HZ.diff -Patch2: %name-2.6.23-pdfdoc.diff -Patch3: %name-2.6.23-tc-flex-fixes.diff -Patch4: %name-2.6.23-resolve-address.diff -Patch5: %name-2.6.23-fragtimeout.diff -Patch6: %name-2.6.23-flushcheckuid.diff -Patch7: %name-2.6.23-strip.diff -Patch8: %name-2.6.23-qdisc.diff -Patch9: %name-2.6.23-iplink.diff +Patch0: %name-2.6.25-libdir-1.diff +Patch1: %name-2.6.25-HZ.diff +Patch2: %name-2.6.25-pdfdoc.diff +Patch3: %name-2.6.25-tc-flex-fixes.diff +Patch4: %name-2.6.25-resolve-address.diff +Patch5: %name-2.6.25-fragtimeout.diff +Patch6: %name-2.6.25-flushcheckuid.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package -n libnlink @@ -67,9 +64,6 @@ Authors: %patch4 %patch5 %patch6 -%patch7 -%patch8 -%patch9 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -119,6 +113,18 @@ rm -rf $RPM_BUILD_ROOT %_libdir/lib* %changelog +* Mon Jul 14 2008 ms@suse.de +- update to version 2.6.25 + * Fix off by one in nested attribute management. + * netem potential dist table overflow + * rto_min value display overflow + * Overhead calculation is now done in the kernel. + * libnetlink: don't spin forever on receive error + * Protocol field on tc_filter is required by the kernel, provide it + * Add missing prefix bit length for addrlabel + * Do not strip binaries with `install` + * In police, fix uninitialized "overhead" variable. + * lots of documentation fixes * Fri Jul 11 2008 ms@suse.de - fixed RTM_NEWLINK check for older kernels (bnc #407954) * Mon Jun 30 2008 ms@suse.de