From dcbc58754f70b12d0c7b86b047f1d14685a8db099876db1e46932e8fb1ab1134 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Feb 2012 22:01:20 +0000 Subject: [PATCH] iproute 3.2.0 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=41 --- iproute2-3.1.0.tar.xz | 3 -- iproute2-3.2.0.tar.xz | 3 ++ iproute2-implicit-definition-of-memcpy.diff | 22 ---------- iproute2-xt-detect.diff | 42 ------------------ iproute2-xt.diff | 26 ----------- iproute2.changes | 7 +++ iproute2.spec | 48 +++++++++++---------- 7 files changed, 36 insertions(+), 115 deletions(-) delete mode 100644 iproute2-3.1.0.tar.xz create mode 100644 iproute2-3.2.0.tar.xz delete mode 100644 iproute2-implicit-definition-of-memcpy.diff delete mode 100644 iproute2-xt-detect.diff delete mode 100644 iproute2-xt.diff diff --git a/iproute2-3.1.0.tar.xz b/iproute2-3.1.0.tar.xz deleted file mode 100644 index 41bc418..0000000 --- a/iproute2-3.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2afce6ac888396cbb03a2a3394196f6f6bcb8d578f0ffff09e297ef8f6a272f3 -size 376428 diff --git a/iproute2-3.2.0.tar.xz b/iproute2-3.2.0.tar.xz new file mode 100644 index 0000000..69ca016 --- /dev/null +++ b/iproute2-3.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59bc1c67a18653f989792a31eda5607a87689b9e6041f2d47ea8b5fe4842cb4d +size 373804 diff --git a/iproute2-implicit-definition-of-memcpy.diff b/iproute2-implicit-definition-of-memcpy.diff deleted file mode 100644 index 056150b..0000000 --- a/iproute2-implicit-definition-of-memcpy.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Jan Engelhardt -Date: 2011-12-31 23:16:27.428349795 +0100 - -gcc -DLIBDIR=\"/usr/lib64\" -D_GNU_SOURCE -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\"/usr/lib64/xtables\" -I../include -DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib64\" -fPIC -c -o ipx_pton.o ipx_pton.c -In file included from ../include/utils.h:8:0, - from ipx_ntop.c:5: -../include/libnetlink.h: In function 'rta_getattr_u64': -../include/libnetlink.h:84:2: warning: implicit declaration of function 'memcpy' -../include/libnetlink.h:84:2: warning: incompatible implicit declaration of built-in function 'memcpy' - -diff --git a/include/libnetlink.h b/include/libnetlink.h -index b237579..b0656ce 100644 ---- a/include/libnetlink.h -+++ b/include/libnetlink.h -@@ -1,6 +1,7 @@ - #ifndef __LIBNETLINK_H__ - #define __LIBNETLINK_H__ 1 - -+#include - #include - #include - #include diff --git a/iproute2-xt-detect.diff b/iproute2-xt-detect.diff deleted file mode 100644 index d4f1ecb..0000000 --- a/iproute2-xt-detect.diff +++ /dev/null @@ -1,42 +0,0 @@ -From: Jan Engelhardt -Date: 2011-09-24 23:37:34.405739159 +0200 -Upstream: not sent yet - -Any tests involving iptables _MUST_ utilize pkg-config to find the -proper locations of the installation. - ---- - configure | 2 +- - tc/Makefile | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -Index: iproute2-2.6.39/configure -=================================================================== ---- iproute2-2.6.39.orig/configure -+++ iproute2-2.6.39/configure -@@ -49,7 +49,7 @@ int main(int argc, char **argv) - - EOF - --if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 -+if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 - then - echo "TC_CONFIG_XT:=y" >>Config - echo "using xtables" -Index: iproute2-2.6.39/tc/Makefile -=================================================================== ---- iproute2-2.6.39.orig/tc/Makefile -+++ iproute2-2.6.39/tc/Makefile -@@ -124,10 +124,10 @@ q_atm.so: q_atm.c - $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm - - m_xt.so: m_xt.c -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c -lxtables -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$(pkg-config xtables --cflags --libs) - - m_xt_old.so: m_xt_old.c -- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c -lxtables -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$(pkg-config xtables --cflags --libs) - - %.yacc.c: %.y - $(YACC) $(YACCFLAGS) -o $@ $< diff --git a/iproute2-xt.diff b/iproute2-xt.diff deleted file mode 100644 index cb73a78..0000000 --- a/iproute2-xt.diff +++ /dev/null @@ -1,26 +0,0 @@ -From: Jan Engelhardt -Date: 2011-06-01 00:52:07+0200 -Upsteam: has not been sent yet - -Requesting the xt action never succeeded because it registered -using the wrong name. - ---- - tc/m_xt.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: iproute2-2.6.37/tc/m_xt.c -=================================================================== ---- iproute2-2.6.37.orig/tc/m_xt.c -+++ iproute2-2.6.37/tc/m_xt.c -@@ -343,8 +343,8 @@ print_ipt(struct action_util *au,FILE * - return 0; - } - --struct action_util ipt_action_util = { -- .id = "ipt", -+struct action_util xt_action_util = { -+ .id = "xt", - .parse_aopt = parse_ipt, - .print_aopt = print_ipt, - }; diff --git a/iproute2.changes b/iproute2.changes index f6dd0e0..2292509 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jan 14 03:04:36 UTC 2012 - jengelh@medozas.de + +- Update to new upstream release 3.2.0 +* L2TPv3 support +* netem additions for loss models, improved RED options + ------------------------------------------------------------------- Sat Dec 31 20:57:22 UTC 2011 - jengelh@medozas.de diff --git a/iproute2.spec b/iproute2.spec index 59025f9..5f91321 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -1,7 +1,7 @@ # # spec file for package iproute2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,43 +15,48 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: iproute2 -Group: Productivity/Networking/Routing Provides: iproute = %version -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Linux network configuration utilities +License: GPL-2.0 +Group: Productivity/Networking/Routing Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 # Using GPL-2.0 instead of GPL-2.0+ because of tc_skbedit.h and tc/q_multiq.c -License: GPL-2.0 +#DL-URL: http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.2.0.tar.bz2 #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 Source0: %name-%version.tar.xz # PATCH-FIX-UPSTREAM iproute2-libdir-1.diff status=unknown Patch0: iproute2-libdir-1.diff # PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea Patch1: iproute2-HZ.diff -# iproute2-xt.diff status=sent,waiting -Patch4: iproute2-xt.diff -# iproute2-xt-detect.diff status=sent,waiting -Patch6: iproute2-xt-detect.diff -# iproute2-implicit-definition-of-memcpy.diff status=sent,waiting -Patch7: iproute2-implicit-definition-of-memcpy.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: bison db-devel flex -BuildRequires: libpng-devel libtiff-devel pkgconfig >= 0.23 -BuildRequires: xorg-x11-devel xz +BuildRequires: bison +BuildRequires: db-devel +BuildRequires: flex +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: pkgconfig >= 0.21 +BuildRequires: xorg-x11-devel +BuildRequires: xz %if 0%{?suse_version} -BuildRequires: ghostscript-x11 sgmltool texlive-latex +BuildRequires: ghostscript-x11 +BuildRequires: sgmltool +BuildRequires: texlive-latex %endif %if 0%{?fedora} || 0%{?rhel} -BuildRequires: ghostscript linuxdoc-tools sgml-common tetex-dvips tetex-latex +BuildRequires: ghostscript +BuildRequires: linuxdoc-tools +BuildRequires: sgml-common +BuildRequires: tetex-dvips +BuildRequires: tetex-latex %endif %define with_xt 1 %if 0%{?with_xt} -BuildRequires: pkgconfig(libnl-1) pkgconfig(xtables) >= 1.4.11 +BuildRequires: pkgconfig(libnl-1) +BuildRequires: pkgconfig(xtables) >= 1.4.11 %endif %description @@ -62,20 +67,20 @@ distribution has used this package for network setup since SuSE Linux %package -n libnetlink-devel Summary: A Higher Level Interface to the Netlink Service +License: GPL-2.0+ Group: Development/Libraries/C and C++ Provides: libnetlink = %version-%release -License: GPL-2.0+ %description -n libnetlink-devel libnetlink provides a higher level interface to rtnetlink(7). %package doc Summary: Documentation to iproute2 +License: GPL-2.0+ Group: Documentation %if 0%{?suse_version} >= 1130 BuildArch: noarch %endif -License: GPL-2.0+ %description doc This package contains the PDF documentation from iproute2, @@ -90,7 +95,6 @@ tar -xf "%{S:0}" --use=xz; %endif %patch0 %patch1 -%patch -P 4 -P 6 -P 7 -p1 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -117,7 +121,7 @@ rm %buildroot%_sbindir/ifcfg %files %defattr(-,root,root) -%doc README* RELNOTES +%doc README* %_sbindir/* /sbin/* /bin/ip