diff --git a/iproute2-2.6.37-rtt-metrics-units.diff b/iproute2-2.6.37-rtt-metrics-units.diff deleted file mode 100644 index 2285c4f..0000000 --- a/iproute2-2.6.37-rtt-metrics-units.diff +++ /dev/null @@ -1,197 +0,0 @@ -From ff2e5a2ada6196ce4ed89a76b5e86f047c9a63f4 Mon Sep 17 00:00:00 2001 -From: Marius Tomaschewski -Date: Wed, 12 Jan 2011 16:41:45 +0100 -Subject: [PATCH] ip route rtt metrics time unit is milliseconds - -Adopted ip route rtt,rttvar,rto_min metrics time unit to milliseconds -instead of jiffies as required by recent kernels (>=2.6.27). - -Added an get_rtt_metrics_units function providing the unit and the -get_time_in_units as successor of get_jiffies function, allowing to -specify the unit. The get_rtt_metrics_units can be extended to detect -and handle also older kernels. - -This fixes also the inconsistent use of get_user_hz in print_route -and get_hz in get_jiffies function that return different units. ---- - include/utils.h | 1 + - ip/iproute.c | 38 ++++++++++++++++++++++++++------------ - lib/utils.c | 24 +++++++++++++----------- - 3 files changed, 40 insertions(+), 23 deletions(-) - -diff --git a/include/utils.h b/include/utils.h -index 3da6998..3d98c01 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -80,6 +80,7 @@ extern int mask2bits(__u32 netmask); - extern int get_integer(int *val, const char *arg, int base); - extern int get_unsigned(unsigned *val, const char *arg, int base); - extern int get_jiffies(unsigned *val, const char *arg, int base, int *raw); -+extern int get_time_in_units(unsigned *val, const char *arg, int base, int *raw, unsigned unit); - #define get_byte get_u8 - #define get_ushort get_u16 - #define get_short get_s16 -diff --git a/ip/iproute.c b/ip/iproute.c -index 0d69290..830b0a3 100644 ---- a/ip/iproute.c -+++ b/ip/iproute.c -@@ -33,6 +33,21 @@ - #define RTAX_RTTVAR RTAX_HOPS - #endif - -+#define TIME_UNIT_MS 1000 -+ -+static unsigned get_rtt_metrics_units(void) -+{ -+ /* -+ * recent kernels (>=2.6.27) are using milliseconds base. -+ * Note: To support older kernels, return the proper HZ... -+ * -+ * final unit for rto_min: unit -+ * rttvar: unit * 4 -+ * rtt: unit * 8 -+ */ -+ return TIME_UNIT_MS; -+} -+ - enum list_action { - IPROUTE_LIST, - IPROUTE_FLUSH, -@@ -522,12 +537,11 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) - mxlock = *(unsigned*)RTA_DATA(mxrta[RTAX_LOCK]); - - for (i=2; i<= RTAX_MAX; i++) { -- unsigned val; -+ unsigned long long val; /* val *= 1000 below */ -+ unsigned unit = get_rtt_metrics_units(); - - if (mxrta[i] == NULL) - continue; -- if (!hz) -- hz = get_user_hz(); - - if (i < sizeof(mx_names)/sizeof(char*) && mx_names[i]) - fprintf(fp, " %s", mx_names[i]); -@@ -543,24 +557,24 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) - val = 0; - /* fall through */ - default: -- fprintf(fp, " %u", val); -+ fprintf(fp, " %llu", val); - break; - - case RTAX_RTT: - case RTAX_RTTVAR: - case RTAX_RTO_MIN: -- val *= 1000; -+ val *= TIME_UNIT_MS; - if (i == RTAX_RTT) - val /= 8; - else if (i == RTAX_RTTVAR) - val /= 4; - -- if (val >= hz) -+ if (val >= unit) - fprintf(fp, " %llums", -- (unsigned long long) val / hz); -+ val / unit); - else -- fprintf(fp, " %.2fms", -- (double)val / hz); -+ fprintf(fp, " %.8fms", -+ (double)val / unit); - } - } - } -@@ -840,7 +854,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv) - mxlock |= (1<= 1 */ - -- *jiffies = t; -- if (*jiffies < t) -- *jiffies += 1; -+ *val = t; -+ if (*val < t) -+ *val += 1; - - return 0; - --- -1.7.1 - diff --git a/iproute2-2.6.37.tar.bz2 b/iproute2-2.6.37.tar.bz2 deleted file mode 100644 index cbb24c4..0000000 --- a/iproute2-2.6.37.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71754f8ad68facdb97d0cb9d7a298dc7f1ba069370bce902b661e06959f264e3 -size 388866 diff --git a/iproute2-2.6.38.tar.bz2 b/iproute2-2.6.38.tar.bz2 new file mode 100644 index 0000000..dd98056 --- /dev/null +++ b/iproute2-2.6.38.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4 +size 390166 diff --git a/iproute2-2.6.29-1-HZ.diff b/iproute2-HZ.diff similarity index 100% rename from iproute2-2.6.29-1-HZ.diff rename to iproute2-HZ.diff diff --git a/iproute2-2.6.29-1-flushcheckuid.diff b/iproute2-flushcheckuid.diff similarity index 100% rename from iproute2-2.6.29-1-flushcheckuid.diff rename to iproute2-flushcheckuid.diff diff --git a/iproute2-2.6.29-1-iptunnel-fclose.diff b/iproute2-iptunnel-fclose.diff similarity index 100% rename from iproute2-2.6.29-1-iptunnel-fclose.diff rename to iproute2-iptunnel-fclose.diff diff --git a/iproute2-2.6.29-1-libdir-1.diff b/iproute2-libdir-1.diff similarity index 100% rename from iproute2-2.6.29-1-libdir-1.diff rename to iproute2-libdir-1.diff diff --git a/iproute2-2.6.29-1-memleak.diff b/iproute2-memleak.diff similarity index 100% rename from iproute2-2.6.29-1-memleak.diff rename to iproute2-memleak.diff diff --git a/iproute2-2.6.29-1-pdfdoc.diff b/iproute2-pdfdoc.diff similarity index 100% rename from iproute2-2.6.29-1-pdfdoc.diff rename to iproute2-pdfdoc.diff diff --git a/iproute2-2.6.29-1-skbedit-memset.diff b/iproute2-skbedit-memset.diff similarity index 100% rename from iproute2-2.6.29-1-skbedit-memset.diff rename to iproute2-skbedit-memset.diff diff --git a/iproute2-2.6.29-1-ss-pclose.diff b/iproute2-ss-pclose.diff similarity index 100% rename from iproute2-2.6.29-1-ss-pclose.diff rename to iproute2-ss-pclose.diff diff --git a/iproute2-2.6.29-1-warnings.diff b/iproute2-warnings.diff similarity index 100% rename from iproute2-2.6.29-1-warnings.diff rename to iproute2-warnings.diff diff --git a/iproute2.changes b/iproute2.changes index 4adf647..c2cc5de 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 22 08:57:44 CET 2011 - ms@suse.de + +- Update to 2.6.38, fix for options process with ipt (bnc #679172) +- tidy up the package, spec file names, patch names, etc + ------------------------------------------------------------------- Wed Jan 12 16:02:26 UTC 2011 - mt@suse.de diff --git a/iproute2.spec b/iproute2.spec index bf5a18e..8ccec83 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -1,7 +1,7 @@ # # spec file for package iproute2 (Version 2.6.37) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,26 +20,25 @@ Name: iproute2 BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel -BuildRequires: iptables-devel +BuildRequires: iptables-devel License: GPLv2+ Group: Productivity/Networking/Routing Provides: iproute -Version: 2.6.37 +Version: 2.6.38 Release: 1 -%define rversion 2.6.37 +%define rversion 2.6.38 Summary: Advanced Routing -Url: http://developer.osdl.org/dev/iproute2/ +Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 Source0: %name-%rversion.tar.bz2 -Patch0: %name-2.6.29-1-libdir-1.diff -Patch1: %name-2.6.29-1-HZ.diff -Patch2: %name-2.6.29-1-pdfdoc.diff -Patch5: %name-2.6.29-1-flushcheckuid.diff -Patch7: %name-2.6.29-1-warnings.diff -Patch8: %name-2.6.29-1-skbedit-memset.diff -Patch9: %name-2.6.29-1-iptunnel-fclose.diff -Patch10: %name-2.6.29-1-ss-pclose.diff -Patch13: %name-2.6.29-1-memleak.diff -Patch14: %name-2.6.37-rtt-metrics-units.diff +Patch0: %name-libdir-1.diff +Patch1: %name-HZ.diff +Patch2: %name-pdfdoc.diff +Patch3: %name-flushcheckuid.diff +Patch4: %name-warnings.diff +Patch5: %name-skbedit-memset.diff +Patch6: %name-iptunnel-fclose.diff +Patch7: %name-ss-pclose.diff +Patch8: %name-memleak.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,13 +78,12 @@ as well as examples and other outdated files. %patch0 %patch1 %patch2 +%patch3 +%patch4 %patch5 +%patch6 %patch7 %patch8 -%patch9 -%patch10 -%patch13 -%patch14 -p1 find . -name *.orig -print0 | xargs -r0 rm -v %build