iproute-3.4.0

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=49

iproute2-3.3.0.tar.sign

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIcBAABCAAGBQJPZ9NQAAoJEICnf2CVzeR+G1EQAJbGfzKYAJoUy3bPbVNoiU6j
-BjLMJXj2pNFAlno/PU6h0rwl/Ldmy0Yei+qVBMQ6sQVtwYT5C8Z8Af37QE3nh50b
-L5AecZdTohOFO3ipCuyLQNkYBjZVT612LbsL+UwPiz49lyxqhZb4SpaAXrASRsln
-9bz10fj9fYnJa49zboD3oaCLtqwv6DGOrqNMtMmoHj4Ej4zoW22w7LqdYuWZoPup
-gKuGPB0B7HLD8f+s2j6foOlA50Rp9Alh5f48hfddazA4iqB43UTuevV9tuohJRca
-atTDjiVs784mEqvIS7AugTtmvi6/sWKR87LR8ta0UjdTbAzHPoArW17mtTX6JUIk
-1IejXXctKAuQ/ZxRKNSITUCircaq3JBma/N5FEBSmNmmavHw7/pZaQijjsKRDOkM
-FdlJ3dr65YVpApklRoCOo7PXRDIPLYFpj67wn0sBdAekcO3ENkVgf28YBGKWL2cv
-9FFJFeEF87X1SAzbtCTf05s5W9dVfXRDK7aFpNtUhwkaXGhDe6E/ACwq2BGwbtip
-uL2jJlBcjMKMme2LZHMn3X7mOJF/9DmAeNk1lSxhAKdcWh8euBcppdyUxP4zsSgq
-etQnNc39JcH/J6SpGC5p+86Qm7zHKJL+1v7K8RCfNOK0aHR6czMxF2GnIWyWQQf3
-EmYMoSKrPHm4sXuUSPjz
-=GdB9
------END PGP SIGNATURE-----

iproute2-3.3.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e16d9ec1bd0bb2a3bb8be5ba0f0d9c53d39c0515a3ad58a58a89efe1748fb2a6
-size 377960

iproute2-3.4.0.tar.sign

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABCAAGBQJPurGmAAoJEICnf2CVzeR+3gYQAIW59h4GYUZg8uiMaZ/qi+AB
+CJGn2/SRFymKqyZ5QKOZq6ohNaxGibDBFrf4oUOEinn2OjKBFFiBalZFaGHEijxw
+AnS3fLnwEAwnz88lcjSSWeRvYMasop8/HwUbiWUr2g5VaBiqX1QsBQ/nSDCAVhnx
+eAJ8i/RXU46d3sMCDk+E2N77uMXQ6b+7yAUzBKUIY95jtGvTeLFomVhlSiw/js/8
+6mkJAeHK7b1Juq99LVF2R0mOwdf1eJtDl48bXSJvrnnPYpsbA5QuZP03K/eGBI+o
+j82G+mcbzFAJMitl9Tsm1Gj33RcsvxaOid1hJgvy70kwPRu9ECmt452y07kp57K0
+OaJyee2GsFWnr1m4VX6Oo4sj+6pXfeWFJ7A6IvqkOhvUdVAOd32VCggTkePWqbbT
+lsBZbwn8cl5VKZYfCVPm+L5/r6gL3fPPiImMPI0JvsVbB4Dl9fJS4Io3ZFyaKgjc
+Ql8xJOymWTFEATRO/r2sxehpRR9P6GGNrTNR1xwFOcexe7nc8RgFWxmiFilRn0Xg
+MPyrSFylB5MYPGu/+HLLz3SsPlMP/VtOPIIevbWWmwkT3WQrta23U7RQD9Tx84Me
+bdjlcDx5bGULE3WuydMCteLt14rvJyGd/GR6PJyMKVr5vzywQcROTJklWwA8E66f
+Oqnwm8kv9wL2RfDzWPab
+=0aQq
+-----END PGP SIGNATURE-----

iproute2-3.4.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38e846e412b2fa235a447b50c20ad1e9770d1b3ed4d3ab18ca0b18c6e8b79ba4
+size 382092

iproute2-HZ.diff

@@ -1,6 +1,12 @@
---- lib/utils.c
+---
-+++ lib/utils.c	2007/07/12 09:05:56
+ lib/utils.c |    8 ++++++--
-@@ -33,6 +33,10 @@
+ 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

@@ -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
+--- iproute2-3.4.0.orig/Makefile
-+++ 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
+ DATADIR=$(PREFIX)/share
--MANDIR=/share/man
+-DOCDIR=$(DATADIR)/doc/iproute2
-+DOCDIR=/usr/share/doc/packages/iproute2
++DOCDIR=$(DATADIR)/doc/packages/iproute2
-+MANDIR=/usr/share/man
+ MANDIR=$(DATADIR)/man
  ARPDDIR=/var/lib/arpd
  
- # Path to db_185.h include
+@@ -35,7 +35,7 @@ HOSTCC = gcc
-@@ -30,7 +30,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
+ DEFINES += -D_GNU_SOURCE
- CC = gcc
+ CCOPTS = -O2
- HOSTCC = gcc
+ WFLAGS = -Wall -Wstrict-prototypes
- CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
+-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
--CFLAGS = $(CCOPTS) -I../include $(DEFINES)
++CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
-+CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES)
  YACCFLAGS = -d -t -v
  
- SUBDIRS=lib ip tc misc netem genl
+ SUBDIRS=lib ip tc misc netem genl man
-Index: include/iptables.h
+Index: iproute2-3.4.0/include/iptables.h
 ===================================================================
---- include/iptables.h.orig
+--- iproute2-3.4.0.orig/include/iptables.h
-+++ include/iptables.h
++++ iproute2-3.4.0/include/iptables.h
 @@ -5,7 +5,7 @@
  #include "libiptc/libiptc.h"
  
@@ -44,10 +43,10 @@ Index: include/iptables.h
  #endif
  
  #ifndef IPPROTO_SCTP
-Index: netem/Makefile
+Index: iproute2-3.4.0/netem/Makefile
 ===================================================================
---- netem/Makefile.orig
+--- iproute2-3.4.0.orig/netem/Makefile
-+++ netem/Makefile
++++ iproute2-3.4.0/netem/Makefile
 @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
  CCOPTS  = $(CBUILD_CFLAGS)
  LDLIBS += -lm 

iproute2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu May 24 19:38:03 UTC 2012 - jengelh@inai.de
+
+- 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 - bili@suse.com
 

iproute2.spec

@@ -17,10 +17,8 @@
 
 
 Name:           iproute2
-Provides:       iproute = %version
+Version:        3.4.0
-Version:        3.3.0
 Release:        0
-Provides:       iproute = %version
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
 Group:          Productivity/Networking/Routing
@@ -61,6 +59,7 @@ BuildRequires:  tetex-latex
 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 @@ as well as examples and other outdated files.
 tar -xf "%{S:0}" --use=xz;
 %setup -DTq
 %endif
-%patch0
+%patch -P 0 -P 1 -p1
-%patch1
+find . -name *.orig -delete
-find . -name *.orig -print0 | xargs -r0 rm -v
 
 %build
 # build with -fPIC. For details see
@@ -134,7 +132,7 @@ rm %buildroot%_sbindir/ifcfg
 /sbin/*
 /bin/ip
 #EndUsrMerge
-%_mandir/man7/*
+#%_mandir/man7/*
 %_mandir/man8/*
 %dir %_sysconfdir/iproute2
 %config(noreplace) %_sysconfdir/iproute2/*