Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2012-11-22 16:14:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-21 14:39:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iproute2.new/iproute2.changes 2012-11-22 16:14:21.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Oct 9 13:27:11 UTC 2012 - [email protected] + +- Update to new upstream release 3.6.0 +* ss: report SK_MEMINFO_BACKLOG +* tc: add ipset ematch +* iplink: add support for num[tr]xqueues +* iproute2: Add FDB print and update cmds for self and master +* iproute: Add ability to save, restore and show the interfaces' + addresses +* iproute2: VTI support for ip link command +- Rename iproute2-libdir-1.diff to iproute2-dirs.diff, as it does + more than just changing LIBDIR. +- Add revert-pdf-creation.diff, as the new PDF creation commands + do not want to work with openSUSE 12.2 and before. + +------------------------------------------------------------------- Old: ---- iproute2-3.5.1.tar.sign iproute2-3.5.1.tar.xz iproute2-libdir-1.diff New: ---- iproute2-3.6.0.tar.sign iproute2-3.6.0.tar.xz iproute2-dirs.diff revert-pdf-creation.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ --- /var/tmp/diff_new_pack.qqgMr4/_old 2012-11-22 16:14:22.000000000 +0100 +++ /var/tmp/diff_new_pack.qqgMr4/_new 2012-11-22 16:14:22.000000000 +0100 @@ -17,7 +17,7 @@ Name: iproute2 -Version: 3.5.1 +Version: 3.6.0 Release: 0 Summary: Linux network configuration utilities License: GPL-2.0 @@ -29,10 +29,9 @@ #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 Source: %name-%version.tar.xz Source2: %name-%version.tar.sign -# 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 +Patch1: iproute2-dirs.diff +Patch2: iproute2-HZ.diff +Patch3: revert-pdf-creation.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -105,44 +104,54 @@ tar -xf "%{S:0}" --use=xz; %setup -DTq %endif -%patch -P 0 -P 1 -p1 +%patch -P 1 -P 2 -p1 +%if 0%{?sles_version} == 11 || (0%{?suse_version} && 0%{?suse_version} <= 1220) +%patch -P 3 -p1 +%endif find . -name *.orig -delete %build # build with -fPIC. For details see # https://bugzilla.novell.com/show_bug.cgi?id=388021 -xtlibdir="$(pkg-config xtables --variable=xtlibdir)"; -make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\\\"$xtlibdir\\\"" +xt_libdir="$(pkg-config xtables --variable=xtlibdir)"; +xt_cflags="$(pkg-config xtables --cflags)"; +make %{?_smp_mflags} LIBDIR="%_libdir" CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\\\"$xt_libdir\\\" $xt_cflags" cd doc make pdf %install -install -d %buildroot/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}} -install -d %buildroot/{/usr/include,%_libdir,/usr/share} -make install DESTDIR=%buildroot LIBDIR=%_libdir \ - MODDESTDIR="%buildroot/%_libdir/tc" +b="%buildroot"; +install -d "$b"/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}} +install -d "$b"/{/usr/include,%_libdir,/usr/share} +make install DESTDIR="$b" LIBDIR="%_libdir" \ + MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/%name"; # We have m_xt -rm -f "%buildroot/%_libdir/tc/m_ipt.so" -install lib/libnetlink.a %buildroot/%_libdir -chmod -x %buildroot/%_libdir/libnetlink.a -install include/libnetlink.h %buildroot%_includedir -chmod -x %buildroot%_includedir/libnetlink.h +rm -f "$b/%_libdir/tc/m_ipt.so"; +install -pm0644 "lib/libnetlink.a" "$b/%_libdir/"; +chmod -x "$b/%_libdir/libnetlink.a"; +install -pm0644 "include/libnetlink.h" "$b/%_includedir/"; +chmod -x "$b/%_includedir/libnetlink.h"; #UsrMerge -ln -s %_sbindir/ip %buildroot/sbin -mkdir -p %buildroot/bin -ln -sf %_sbindir/ip %buildroot/bin/ip +ln -s "%_sbindir/ip" "$b/sbin"; +mkdir -p "$b/bin"; +ln -sf "%_sbindir/ip" "$b/bin/ip"; #EndUsrMerge -rm %buildroot%_sbindir/ifcfg +rm "$b/%_sbindir/ifcfg"; + +mkdir -p "$b/%_docdir/%name"; +cp -an README* COPYING doc/*.pdf ip/{ifcfg,routef,routel} \ + "$b/%_docdir/%name/"; %files %defattr(-,root,root) -%doc README* COPYING +%dir %_docdir/%name +%_docdir/%name/README* +%_docdir/%name/COPYING %_sbindir/* #UsrMerge /sbin/* /bin/ip #EndUsrMerge -#%_mandir/man7/* %_mandir/man8/* %dir %_sysconfdir/iproute2 %config(noreplace) %_sysconfdir/iproute2/* @@ -152,9 +161,9 @@ %files doc %defattr(-,root,root) -%doc doc/api-ip6-flowlabels.pdf doc/arpd.pdf doc/ip-cref.pdf -%doc doc/ip-tunnels.pdf doc/nstat.pdf doc/rtstat.pdf doc/ss.pdf -%doc examples/ ip/ifcfg ip/routef ip/routel +%_docdir/iproute2 +%exclude %_docdir/iproute2/README* +%exclude %_docdir/iproute2/COPYING %files -n libnetlink-devel %defattr(-,root,root) ++++++ iproute2-dirs.diff ++++++ --- Makefile | 4 ++-- include/iptables.h | 2 +- netem/Makefile | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) Index: iproute2-3.6.0/Makefile =================================================================== --- iproute2-3.6.0.orig/Makefile +++ iproute2-3.6.0/Makefile @@ -1,7 +1,7 @@ ROOTDIR=$(DESTDIR) PREFIX=/usr LIBDIR=$(PREFIX)/lib -SBINDIR=/sbin +SBINDIR=/usr/sbin CONFDIR=/etc/iproute2 DATADIR=$(PREFIX)/share DOCDIR=$(DATADIR)/doc/iproute2 @@ -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 bridge misc netem genl man Index: iproute2-3.6.0/include/iptables.h =================================================================== --- iproute2-3.6.0.orig/include/iptables.h +++ iproute2-3.6.0/include/iptables.h @@ -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 Index: iproute2-3.6.0/netem/Makefile =================================================================== --- iproute2-3.6.0.orig/netem/Makefile +++ iproute2-3.6.0/netem/Makefile @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm +LIBDIR = /usr/lib + all: $(DISTGEN) $(DISTDATA) $(DISTGEN): @@ -20,9 +22,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ [email protected] -lm install: all - mkdir -p $(DESTDIR)$(LIBDIR)/tc + mkdir -p $(DESTDIR)/usr/share/tc for i in $(DISTDATA); \ - do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ + do install -m 644 $$i $(DESTDIR)/usr/share/tc; \ done clean: ++++++ revert-pdf-creation.diff ++++++ Revert 0ecf26fc7d2f24570b4c04a668c437b8656a40a7, since it makes PDF creation fail on SUSE <= 12.2. (cannot find linuxdoc-sgml.sty; seems like /usr/lib/sgml-tool is not in the search path with texlive 2011/suse122.) diff --git a/doc/Makefile b/doc/Makefile index b92957e..1df6081 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt LATEX=latex DVIPS=dvips -SGML2DVI=sgml2latex +SGML2DVI=sgml2latex --output=dvi SGML2HTML=sgml2html -s 0 LPR=lpr -Zsduplex SHELL=bash @@ -31,11 +31,8 @@ pdf: $(PDFFILES) print: $(PSFILES) $(LPR) $(PSFILES) -%.tex: %.sgml - $(SGML2DVI) --output=tex $< - %.dvi: %.sgml - $(SGML2DVI) --output=dvi $< + $(SGML2DVI) $< %.dvi: %.tex @set -e; pass=2; echo "Running LaTeX $<"; \ @@ -47,17 +44,10 @@ print: $(PSFILES) echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ done -%.pdf: %.tex - @set -e; pass=2; echo "Running pdfLaTeX $<"; \ - while [ `pdflatex $< </dev/null 2>&1 | \ - grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \ - if [ $$pass -gt 3 ]; then \ - echo "Seems, something is wrong. Try by hands." ; exit 1 ; \ - fi; \ - echo "Re-running pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ - done -#%.pdf: %.ps -# ps2pdf $< +#%.pdf: %.tex +# pdflatex $< +%.pdf: %.ps + ps2pdf $< %.ps: %.dvi $(DVIPS) $< -o $@ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
