Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2012-06-01 07:20:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iproute2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2.changes 2012-04-17 21:58:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iproute2.new/iproute2.changes 2012-06-01 07:20:26.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 24 19:38:03 UTC 2012 - [email protected] + +- Update to new upstream release 3.4.0 +* for kernel 3.4 +* ss: use new INET_DIAG_SKMEMINFO option to get more memory + information for tcp socket +* ip: add ability to set link state + +------------------------------------------------------------------- Old: ---- iproute2-3.3.0.tar.sign iproute2-3.3.0.tar.xz New: ---- iproute2-3.4.0.tar.sign iproute2-3.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.vErXyx/_old 2012-06-01 07:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.vErXyx/_new 2012-06-01 07:20:28.000000000 +0200 @@ -17,10 +17,8 @@ Name: iproute2 -Provides: iproute = %version -Version: 3.3.0 +Version: 3.4.0 Release: 0 -Provides: iproute = %version Summary: Linux network configuration utilities License: GPL-2.0 Group: Productivity/Networking/Routing @@ -61,6 +59,7 @@ BuildRequires: pkgconfig(libnl-1) BuildRequires: pkgconfig(xtables) >= 1.4.11 %endif +Provides: iproute = %version-%release %description This package provides the tools ip, tc, and rtmon needed to use the new @@ -96,9 +95,8 @@ tar -xf "%{S:0}" --use=xz; %setup -DTq %endif -%patch0 -%patch1 -find . -name *.orig -print0 | xargs -r0 rm -v +%patch -P 0 -P 1 -p1 +find . -name *.orig -delete %build # build with -fPIC. For details see @@ -134,7 +132,7 @@ /sbin/* /bin/ip #EndUsrMerge -%_mandir/man7/* +#%_mandir/man7/* %_mandir/man8/* %dir %_sysconfdir/iproute2 %config(noreplace) %_sysconfdir/iproute2/* ++++++ iproute2-HZ.diff ++++++ --- /var/tmp/diff_new_pack.vErXyx/_old 2012-06-01 07:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.vErXyx/_new 2012-06-01 07:20:28.000000000 +0200 @@ -1,6 +1,12 @@ ---- lib/utils.c -+++ lib/utils.c 2007/07/12 09:05:56 -@@ -33,6 +33,10 @@ +--- + lib/utils.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: iproute2-3.4.0/lib/utils.c +=================================================================== +--- iproute2-3.4.0.orig/lib/utils.c ++++ iproute2-3.4.0/lib/utils.c +@@ -30,6 +30,10 @@ #include "utils.h" @@ -11,7 +17,7 @@ int get_integer(int *val, const char *arg, int base) { long res; -@@ -330,8 +334,8 @@ +@@ -453,8 +457,8 @@ int matches(const char *cmd, const char int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) { ++++++ iproute2-libdir-1.diff ++++++ --- /var/tmp/diff_new_pack.vErXyx/_old 2012-06-01 07:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.vErXyx/_new 2012-06-01 07:20:28.000000000 +0200 @@ -1,40 +1,39 @@ --- - Makefile | 8 ++++---- + Makefile | 6 +++--- include/iptables.h | 2 +- netem/Makefile | 6 ++++-- - 3 files changed, 9 insertions(+), 7 deletions(-) + 3 files changed, 8 insertions(+), 6 deletions(-) -Index: Makefile +Index: iproute2-3.4.0/Makefile =================================================================== ---- Makefile.orig -+++ Makefile +--- iproute2-3.4.0.orig/Makefile ++++ iproute2-3.4.0/Makefile @@ -1,10 +1,10 @@ - DESTDIR=/usr/ ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ + PREFIX=/usr + LIBDIR=$(PREFIX)/lib -SBINDIR=/sbin +SBINDIR=/usr/sbin CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/packages/iproute2 -+MANDIR=/usr/share/man + DATADIR=$(PREFIX)/share +-DOCDIR=$(DATADIR)/doc/iproute2 ++DOCDIR=$(DATADIR)/doc/packages/iproute2 + MANDIR=$(DATADIR)/man ARPDDIR=/var/lib/arpd - # Path to db_185.h include -@@ -30,7 +30,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o - CC = gcc - HOSTCC = gcc - CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall --CFLAGS = $(CCOPTS) -I../include $(DEFINES) -+CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES) +@@ -35,7 +35,7 @@ HOSTCC = gcc + DEFINES += -D_GNU_SOURCE + CCOPTS = -O2 + WFLAGS = -Wall -Wstrict-prototypes +-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) ++CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) YACCFLAGS = -d -t -v - SUBDIRS=lib ip tc misc netem genl -Index: include/iptables.h + SUBDIRS=lib ip tc misc netem genl man +Index: iproute2-3.4.0/include/iptables.h =================================================================== ---- include/iptables.h.orig -+++ include/iptables.h +--- iproute2-3.4.0.orig/include/iptables.h ++++ iproute2-3.4.0/include/iptables.h @@ -5,7 +5,7 @@ #include "libiptc/libiptc.h" @@ -44,10 +43,10 @@ #endif #ifndef IPPROTO_SCTP -Index: netem/Makefile +Index: iproute2-3.4.0/netem/Makefile =================================================================== ---- netem/Makefile.orig -+++ netem/Makefile +--- iproute2-3.4.0.orig/netem/Makefile ++++ iproute2-3.4.0/netem/Makefile @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
