Hello community, here is the log from the commit of package iproute2.1143 for openSUSE:12.2:Update checked in at 2012-12-06 16:17:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/iproute2.1143 (Old) and /work/SRC/openSUSE:12.2:Update/.iproute2.1143.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iproute2.1143", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-11-30 12:21:47.308011256 +0100 +++ /work/SRC/openSUSE:12.2:Update/.iproute2.1143.new/iproute2.changes 2012-12-06 16:17:19.000000000 +0100 @@ -0,0 +1,772 @@ +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Sat Mar 31 06:56:13 UTC 2012 - [email protected] + +- Distribute COPYING file for rpm(bnc#745225). + +------------------------------------------------------------------- +Fri Mar 30 01:20:08 UTC 2012 - [email protected] + +- Update to new upstream release 3.3.0 +* This release updates qdisc parameters in sfq and red, adds Netem + extensions for shaping and for loss models, adds lots of manual + page corrections, adds the QFQ scheduler and the LLDP-to-ethernet + type table (along with support for processless network namespaces + and L2TPv3 plus L2TP tunneling), improves RED options, and adds + assorted bugfixes. + +------------------------------------------------------------------- +Thu Mar 8 16:45:03 UTC 2012 - [email protected] + +- Place ip binary in /usr tree (UsrMerge project) +- Fix permissions to eliminate rpmlint errors + +------------------------------------------------------------------- +Sat Jan 14 03:04:36 UTC 2012 - [email protected] + +- 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 - [email protected] + +- Update to new upstream release 3.1.0 +* ip: Add processless network namespace support +* tc: Add QFQ scheduler +* ss: display closed UDP sockets on `ss -ul` +* ss: report ecnseen +* Add L2TP support + +------------------------------------------------------------------- +Fri Oct 21 20:25:56 UTC 2011 - [email protected] + +- Clarify license for iproute2.spec (bnc#720282) + +------------------------------------------------------------------- +Sat Sep 24 21:50:54 UTC 2011 - [email protected] + +- Add patch iproute2-xt-detect.diff to address shipped Makefiles' + failure to use pkg-config to locate libxtables, and thus + reenable m_xt + +------------------------------------------------------------------- +Fri Jul 8 17:43:01 UTC 2011 - [email protected] + +- 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 - [email protected] + +- Correct installation path of tc modules +- Restore symbol lookup in m_xt.so (bnc#679172) +- Add patches to make m_xt build with libxtables6 +- Restore m_xt's module lookup (bnc#660554) +- Run spec-beautifier + +------------------------------------------------------------------- +Mon May 30 11:50:56 UTC 2011 - [email protected] + +- Disable building m_xt.so which has not been updated for + iptables 1.4.11 + +------------------------------------------------------------------- +Wed Mar 23 18:57:20 UTC 2011 - [email protected] + +Remove unneeded patches: +* iproute2-warnings.diff bnc#34714 + Warnings no longer exist +* iproute2-iptunnel-fclose.diff + Process is dying no need to close file pointers +* iproute2-ss-pclose.diff + Process is dying no need to close file pointers +* iproute2-flushcheckuid.diff + Fixed upstream +* iproute2-skbedit-memset.diff + Fixed upstream 46a6573259f46f86eb0048a2c805b24ff4183fa6 + +------------------------------------------------------------------- +Tue Mar 22 08:57:44 CET 2011 - [email protected] + +- 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 - [email protected] + +- Adopted ip route rtt,rttvar,rto_min metrics time unit to + milliseconds as required by recent kernels (bnc#659746). + +------------------------------------------------------------------- +Tue Jan 11 00:45:02 UTC 2011 - [email protected] + +- Update to iproute2-2.6.37 +* Support for iptables >= 1.4.9 +* Support for GRE in XFRM +* tc f_flow now knows rxhash +* Support for macvtap "mode" parameter +* tc ACT_CSUM support +* added `ip route save` and `ip route restore` commands +- Spec file updates +* Remove pointless AutoReqProv:on (that's the default) +* Enable tc's m_xt + +------------------------------------------------------------------- +Fri Dec 3 10:29:55 CET 2010 - [email protected] + +- removed the fragtimeout patch because it breaks the rto_min + setup. The fragtimeout patch also requires a kernel side + modification which we don't ship since SLES9 (bnc #656667) + +------------------------------------------------------------------- +Mon Nov 15 22:12:32 UTC 2010 - [email protected] + +- Split documentation into its own subpackage, reducing the size + of the main package by ~500K + +------------------------------------------------------------------- +Wed Nov 3 21:22:47 UTC 2010 - [email protected] + +- Update to iproute2-2.6.35+git9 for obtaining + Linux 2.6.36-introduced features (no iproute2-2.6.36 tag yet) +* Added RTA_MARK support (e.g. `ip route get ::1 mark 2`) +* 64-bit interface statistics + +------------------------------------------------------------------- +Tue Nov 2 13:02:44 UTC 2010 - [email protected] + +- Update to iproute2-2.6.35 +* Added support for multicast iprules +* Speed up `ss -p` +* Update ARP header type table + +------------------------------------------------------------------- +Tue Nov 2 12:28:40 UTC 2010 - [email protected] + +- Update to iproute2-2.6.34 +* Fix build issues with flex 2.5 +* Detect 6rd tunnel scope +* Added `ip tuntap` support (this practically obsoletes the + "tunctl" package) +* Added support for XFRM/SA by fwmark +* Added initrwnd +- 2 patches integrated, thus dropped + +------------------------------------------------------------------- +Tue Nov 2 12:02:02 UTC 2010 - [email protected] + +- Update to iproute2-2.6.33 +* Added 6rd support +* Added macvlan options for bridge mode +* Added support to mark packets in skbedit +* Added oif classification support in iprule + +------------------------------------------------------------------- +Tue Nov 2 11:43:33 UTC 2010 - [email protected] + +- Update to iproute2-2.6.31 +* Dropped equalize support +* Fixed segfault when using garbage lladdr +* Added new m_xt module for iptables-1.4.5 +* Added support for CAN +* Allow ISATAP with stateless autoconfiguration +* Added support for cgroup +* Added support for monitoring neigh table activities +- 3 patches integrated, thus dropped + ++++ 575 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.iproute2.1143.new/iproute2.changes New: ---- iproute2-3.4.0.tar.sign iproute2-3.4.0.tar.xz iproute2-HZ.diff iproute2-libdir-1.diff iproute2.changes iproute2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iproute2.spec ++++++ # # spec file for package iproute2 # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: iproute2 Version: 3.4.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 #DL-URL: http://kernel.org/pub/linux/utils/net/iproute2/ #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 BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 BuildRequires: sgmltool BuildRequires: texlive-latex %endif %if 0%{?fedora} || 0%{?rhel} 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) 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 and advanced routing options of the Linux kernel. The SUSE Linux distribution has used this package for network setup since SuSE Linux 8.0. %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 %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 %description doc This package contains the PDF documentation from iproute2, as well as examples and other outdated files. %prep %if 0%{?__xz:1} %setup -q %else tar -xf "%{S:0}" --use=xz; %setup -DTq %endif %patch -P 0 -P 1 -p1 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\\\"" 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" # 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 #UsrMerge ln -s %_sbindir/ip %buildroot/sbin mkdir -p %buildroot/bin ln -sf %_sbindir/ip %buildroot/bin/ip #EndUsrMerge rm %buildroot%_sbindir/ifcfg %files %defattr(-,root,root) %doc README* COPYING %_sbindir/* #UsrMerge /sbin/* /bin/ip #EndUsrMerge #%_mandir/man7/* %_mandir/man8/* %dir %_sysconfdir/iproute2 %config(noreplace) %_sysconfdir/iproute2/* %_libdir/tc %dir %_datadir/tc %attr(644,root,root)%_datadir/tc/* %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 %files -n libnetlink-devel %defattr(-,root,root) %_includedir/* %_mandir/man3/libnetlink* %_libdir/lib* %changelog ++++++ iproute2-HZ.diff ++++++ --- 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" +#ifndef HZ +#define HZ sysconf(_SC_CLK_TCK) +#endif + int get_integer(int *val, const char *arg, int base) { long res; @@ -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) { - const __u32 *a1 = a->data; - const __u32 *a2 = b->data; + const __u32 *a1 = (__u32*)a->data; + const __u32 *a2 = (__u32*)b->data; int words = bits >> 0x05; bits &= 0x1f; ++++++ iproute2-libdir-1.diff ++++++ --- Makefile | 6 +++--- include/iptables.h | 2 +- netem/Makefile | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) Index: iproute2-3.4.0/Makefile =================================================================== --- iproute2-3.4.0.orig/Makefile +++ iproute2-3.4.0/Makefile @@ -1,10 +1,10 @@ ROOTDIR=$(DESTDIR) PREFIX=/usr LIBDIR=$(PREFIX)/lib -SBINDIR=/sbin +SBINDIR=/usr/sbin CONFDIR=/etc/iproute2 DATADIR=$(PREFIX)/share -DOCDIR=$(DATADIR)/doc/iproute2 +DOCDIR=$(DATADIR)/doc/packages/iproute2 MANDIR=$(DATADIR)/man ARPDDIR=/var/lib/arpd @@ -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 man Index: iproute2-3.4.0/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" #ifndef IPT_LIB_DIR -#define IPT_LIB_DIR "/usr/local/lib/iptables" +#define IPT_LIB_DIR LIBDIR #endif #ifndef IPPROTO_SCTP Index: iproute2-3.4.0/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 +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: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
