From f909895e5068edb2b0c7863bdfd328e86073925c392c9e21617c497aaff270ef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 10 Jul 2011 17:14:43 +0000 Subject: [PATCH] Resolve conflicts OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=33 --- iproute2-2.6.38.tar.bz2 | 3 --- iproute2-2.6.39.tar.xz | 3 +++ iproute2-libdir-1.diff | 2 +- iproute2-memleak.diff | 11 ----------- iproute2-pdfdoc.diff | 33 --------------------------------- iproute2.changes | 18 ++++++++++++++++++ iproute2.spec | 37 +++++++++++++------------------------ 7 files changed, 35 insertions(+), 72 deletions(-) delete mode 100644 iproute2-2.6.38.tar.bz2 create mode 100644 iproute2-2.6.39.tar.xz delete mode 100644 iproute2-memleak.diff delete mode 100644 iproute2-pdfdoc.diff diff --git a/iproute2-2.6.38.tar.bz2 b/iproute2-2.6.38.tar.bz2 deleted file mode 100644 index dd98056..0000000 --- a/iproute2-2.6.38.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4 -size 390166 diff --git a/iproute2-2.6.39.tar.xz b/iproute2-2.6.39.tar.xz new file mode 100644 index 0000000..af45dad --- /dev/null +++ b/iproute2-2.6.39.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83469db5a2f1e9ed629f84a1023931915f47bc42df4be66159ebdd22a1889847 +size 356388 diff --git a/iproute2-libdir-1.diff b/iproute2-libdir-1.diff index 6f57de1..919294f 100644 --- a/iproute2-libdir-1.diff +++ b/iproute2-libdir-1.diff @@ -30,7 +30,7 @@ Index: Makefile +CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES) YACCFLAGS = -d -t -v - LDLIBS += -L../lib -lnetlink -lutil + SUBDIRS=lib ip tc misc netem genl Index: include/iptables.h =================================================================== --- include/iptables.h.orig diff --git a/iproute2-memleak.diff b/iproute2-memleak.diff deleted file mode 100644 index 87fd52f..0000000 --- a/iproute2-memleak.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ip/ipmaddr.c 2009-09-16 11:21:21.000000000 +0200 -+++ ip/ipmaddr.c 2009-09-16 11:23:14.000000000 +0200 -@@ -136,7 +136,7 @@ - m.addr.bytelen = 4; - - while (fgets(buf, sizeof(buf), fp)) { -- struct ma_info *ma = malloc(sizeof(m)); -+ struct ma_info *ma; - - if (buf[0] != '\t') { - sscanf(buf, "%d%s", &m.index, m.name); diff --git a/iproute2-pdfdoc.diff b/iproute2-pdfdoc.diff deleted file mode 100644 index 9fd9e76..0000000 --- a/iproute2-pdfdoc.diff +++ /dev/null @@ -1,33 +0,0 @@ -Index: doc/Makefile -=================================================================== ---- doc/Makefile.orig -+++ doc/Makefile -@@ -15,6 +15,7 @@ - - HTMLFILES=$(subst .sgml,.html,$(shell echo *.sgml)) - DVIFILES=$(subst .ps,.dvi,$(PSFILES)) -+PDFFILES=$(subst .ps,.pdf,$(PSFILES)) - - - all: pstwocol -@@ -25,6 +26,8 @@ - - dvi: $(DVIFILES) - -+pdf: $(PDFFILES) -+ - print: $(PSFILES) - $(LPR) $(PSFILES) - -@@ -41,6 +44,11 @@ - echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ - done - -+#%.pdf: %.tex -+# pdflatex $< -+%.pdf: %.ps -+ ps2pdf $< -+ - %.ps: %.dvi - $(DVIPS) $< -o $@ - diff --git a/iproute2.changes b/iproute2.changes index c9600ca..0dac83e 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jul 8 17:43:01 UTC 2011 - jengelh@medozas.de + +- Update to new upstream release 2.6.39 +* support device group semantics +* support listing devices by group +* parse flag XFRM_POLICY_ICMP +* CHOKe scheduler +* macvlan/macvtap: support 'passthru' mode +* tc: SFB flow scheduler +* tc add mqprio qdisc support +* xfrm security context support +* allow to specify truncation bits on auth algo +* fix unit conversion of rtt/rttvar/rto_min +* support IFLA_TXQLEN in ip link command +- Remove iproute2-pdfdoc.diff: merged upstream +- Remove iproute2-memleak.diff: merged upstream + ------------------------------------------------------------------- Tue May 31 21:35:16 UTC 2011 - jengelh@medozas.de diff --git a/iproute2.spec b/iproute2.spec index a0b896a..53b4dab 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -22,20 +22,19 @@ Name: iproute2 License: GPLv2+ Group: Productivity/Networking/Routing Provides: iproute -Version: 2.6.38 -Release: 5 -%define rversion 2.6.38 -Summary: Advanced Routing -Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 -Source0: %name-%rversion.tar.bz2 +Version: 2.6.39 +Release: 1 +Summary: Linux network configuration utilities +URL: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 +Source0: %name-%version.tar.xz Patch0: %name-libdir-1.diff Patch1: %name-HZ.diff -Patch2: %name-pdfdoc.diff -Patch3: %name-memleak.diff -Patch4: iproute2-xt.diff -Patch5: iproute2-libxtables6.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel +Patch4: iproute2-xt.diff +Patch5: iproute2-libxtables6.diff +BuildRoot: %_tmppath/%name-%version-build +BuildRequires: bison, db-devel, flex, ghostscript-fonts-std, ghostscript-x11 +BuildRequires: libpng-devel, libtiff-devel, sgmltool, texlive-latex +BuildRequires: xorg-x11-devel, xz %define with_xt 1 %if 0%{?with_xt} BuildRequires: iptables-devel @@ -74,11 +73,9 @@ This package contains the PDF documentation from iproute2, as well as examples and other outdated files. %prep -%setup -q -n %name-%rversion +%setup -q %patch0 %patch1 -%patch2 -%patch3 %patch -P 4 -P 5 -p1 find . -name *.orig -print0 | xargs -r0 rm -v @@ -104,9 +101,6 @@ mkdir -p %buildroot/bin ln -sf /sbin/ip %buildroot/bin/ip rm %buildroot%_sbindir/ifcfg -%clean -rm -rf %buildroot - %files %defattr(-,root,root) %doc README* RELNOTES @@ -115,12 +109,7 @@ rm -rf %buildroot /bin/ip %_mandir/man8/* %dir %_sysconfdir/iproute2 -%config(noreplace) %_sysconfdir/iproute2/rt_dsfield -%config(noreplace) %_sysconfdir/iproute2/rt_protos -%config(noreplace) %_sysconfdir/iproute2/rt_scopes -%config(noreplace) %_sysconfdir/iproute2/rt_realms -%config(noreplace) %_sysconfdir/iproute2/rt_tables -%config(noreplace) %_sysconfdir/iproute2/ematch_map +%config(noreplace) %_sysconfdir/iproute2/* %_libdir/tc %dir %_datadir/tc %attr(644,root,root)%_datadir/tc/*