Accepting request 135113 from security:netfilter

- Make it build even without pdflatex, use latex+dvips, beside this
  iproute2-pdflatex.diff was documented, see my last entry from
  Jul 30 14:33:58 UTC 2012. (forwarded request 134779 from <bound method Request.get_creator of <osc.core.Request instance at 0x2d5d098>>)

OBS-URL: https://build.opensuse.org/request/show/135113
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=58

iproute2-3.4.0.tar.sign

@@ -1,17 +0,0 @@
------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

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

iproute2-3.5.1.tar.sign

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABCAAGBQJQKRpzAAoJEICnf2CVzeR+mowP/3KoA933duQUH0FYkz7vPRmI
+808S/DxCDGwfD8y7+u7syFmFdlZmMXIIa2hDsXlr7pgCRFpGDj+migYcNrnV35Ug
+WeAJw4DJ2/MShQNbsromQFW4ZETh3c8xXDp9osmEPTg8BEsSruSXdK0b5eqUlhxj
+Cn2RMbwPKjo/QIDoBEBsLarw7CdYMZ8zIoTVLn6uz8sbDMrEAq5bydYrhP1eDp0G
+P5PkOE7ell+H15/l5C53JVLO4rMj2JXgJd9Mbckdbn7Sww9ObszCuIa14V3zzpPN
+DXaYAjsUodkqihMuqKCebE0iJ3e/xHtVmlTc2sHjzExCIpK+0LvueQC/e+icfGWC
+Hn3IGA4SsZFsSgQ2f4QX8+zDUy+1dZWN7ItIob/Uu0kuuUF4diEJbn9pIKhaxg1d
+QjOLVlUbamq3SNUTygEBYw6DIeNac+6uIxfZ+4hRoSrtt5ik5pszWsKpLwxNGUXe
+0Ky4nbb+PNapRlAQyLyGZTsKel5inGd8KLMjKJCvAf570zcm1arjcWVfErJD8Pi9
+sc3UsnmTdkugAGQxh071CSWpUWoNBLmJSjtsOMMj9v3d8RMJyreilAHtLDV2C1hf
+xEiod0pd1frAZafWj7pMMWdtKfgZj6t8exZzizHexPmmazaYxE4ZM+swE0Gw/UIB
+vU77GQfuNryGbPwtraJm
+=Yfl+
+-----END PGP SIGNATURE-----

iproute2-3.5.1.tar.xz

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

iproute2-libdir-1.diff

@@ -4,10 +4,10 @@
  netem/Makefile     |    6 ++++--
  3 files changed, 8 insertions(+), 6 deletions(-)
 
-Index: iproute2-3.4.0/Makefile
+Index: iproute2-3.5.1/Makefile
 ===================================================================
---- iproute2-3.4.0.orig/Makefile
+--- iproute2-3.5.1.orig/Makefile
-+++ iproute2-3.4.0/Makefile
++++ iproute2-3.5.1/Makefile
 @@ -1,10 +1,10 @@
  ROOTDIR=$(DESTDIR)
  PREFIX=/usr
@@ -29,11 +29,11 @@ Index: iproute2-3.4.0/Makefile
 +CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
  YACCFLAGS = -d -t -v
  
- SUBDIRS=lib ip tc misc netem genl man
+ SUBDIRS=lib ip tc bridge misc netem genl man
-Index: iproute2-3.4.0/include/iptables.h
+Index: iproute2-3.5.1/include/iptables.h
 ===================================================================
---- iproute2-3.4.0.orig/include/iptables.h
+--- iproute2-3.5.1.orig/include/iptables.h
-+++ iproute2-3.4.0/include/iptables.h
++++ iproute2-3.5.1/include/iptables.h
 @@ -5,7 +5,7 @@
  #include "libiptc/libiptc.h"
  
@@ -43,10 +43,10 @@ Index: iproute2-3.4.0/include/iptables.h
  #endif
  
  #ifndef IPPROTO_SCTP
-Index: iproute2-3.4.0/netem/Makefile
+Index: iproute2-3.5.1/netem/Makefile
 ===================================================================
---- iproute2-3.4.0.orig/netem/Makefile
+--- iproute2-3.5.1.orig/netem/Makefile
-+++ iproute2-3.4.0/netem/Makefile
++++ iproute2-3.5.1/netem/Makefile
 @@ -5,6 +5,8 @@ HOSTCC ?= $(CC)
  CCOPTS  = $(CBUILD_CFLAGS)
  LDLIBS += -lm 

iproute2-pdflatex.diff

@@ -1,47 +0,0 @@
---- doc/Makefile
-+++ doc/Makefile	2012-07-30 14:32:31.934018848 +0000
-@@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6
- 
- LATEX=latex
- DVIPS=dvips
--SGML2DVI=sgml2latex --output=dvi
-+SGML2DVI=sgml2latex
- SGML2HTML=sgml2html -s 0
- LPR=lpr -Zsduplex
- SHELL=bash
-@@ -32,7 +32,7 @@ print: $(PSFILES)
- 	$(LPR) $(PSFILES)
- 
- %.dvi: %.sgml
--	$(SGML2DVI) $<
-+	$(SGML2DVI) --output=dvi $<
- 
- %.dvi: %.tex
- 	@set -e; pass=2; echo "Running LaTeX $<"; \
-@@ -44,10 +44,22 @@ print: $(PSFILES)
- 		echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
- 	done
- 
--#%.pdf: %.tex
--#	pdflatex $<
--%.pdf: %.ps
--	ps2pdf $<
-+%.tex: %.sgml
-+	$(SGML2DVI) --output=tex $<
-+
-+%.pdf: %.tex
-+	@set -e; pass=2; echo "Running pdfLaTeX $<"; \
-+	TEXINPUTS="/usr/lib/sgml-tools:$$(kpsewhich '-var-value=TEXINPUTS')"; \
-+	while [ `TEXINPUTS="$$TEXINPUTS" 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 LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \
-+	done
-+
-+#%.pdf: %.ps
-+#	ps2pdf $<
- 
- %.ps: %.dvi
- 	$(DVIPS) $< -o $@

iproute2.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Sep 18 06:36:19 UTC 2012 - werner@suse.de
+
+- Make it build even without pdflatex, use latex+dvips, beside this
+  iproute2-pdflatex.diff was documented, see my last entry from
+  Jul 30 14:33:58 UTC 2012.
+
+-------------------------------------------------------------------
+Mon Sep 17 18:58:38 UTC 2012 - idonmez@suse.com
+
+- Add BuildRequires on texlive-dvips for openSUSE > 12.2 to fix
+  Factory builds.
+
+-------------------------------------------------------------------
+Sat Sep  8 09:26:32 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 3.5.1
+* ss: Report MSS from internal TCP information
+* ip: allow IPv6 addresses for l2tp local and remote parameters
+* tc: Support for tc_codel - Controlled Delay AQM
+* tc: Support for fq_codel - Fair Queue Codel AQM
+* tc-netem: Add support for ECN packet marking
+- Remove undocumented iproute2-pdflatex.diff which breaks the
+  build since using the iproute2-3.5.1 tarball
+
 -------------------------------------------------------------------
 Mon Jul 30 14:33:58 UTC 2012 - werner@suse.de
 

iproute2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           iproute2
-Version:        3.4.0
+Version:        3.5.1
 Release:        0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
@@ -33,9 +33,6 @@ Source2:        %name-%version.tar.sign
 Patch0:         iproute2-libdir-1.diff
 # PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea
 Patch1:         iproute2-HZ.diff
-%if 0%{?suse_version}
-Patch42:        iproute2-pdflatex.diff
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  db-devel
@@ -48,13 +45,15 @@ BuildRequires:  xz
 %if 0%{?suse_version}
 BuildRequires:  ghostscript-x11
 BuildRequires:  sgmltool
+%endif
+BuildRequires:  texlive
 BuildRequires:  texlive-latex
 %if 0%{?suse_version} > 1220
 BuildRequires:  texlive-amsfonts
 BuildRequires:  texlive-cm-super
+BuildRequires:  texlive-dvips
 BuildRequires:  texlive-ec
 %endif
-%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  ghostscript
 BuildRequires:  linuxdoc-tools
@@ -107,9 +106,6 @@ tar -xf "%{S:0}" --use=xz;
 %setup -DTq
 %endif
 %patch -P 0 -P 1 -p1
-%if 0%{?suse_version}
-%patch42 -p0
-%endif
 find . -name *.orig -delete
 
 %build