[packages/iputils] - updated to s20121221 - updated bindnow patch - removed obsolete doc patch

[qboosh]

commit 54c52782d55a2e24fe85652a66db5494f9d21f76
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jan 8 17:37:03 2013 +0100

    - updated to s20121221
    - updated bindnow patch
    - removed obsolete doc patch

 iputils-bindnow.patch | 22 +++++++++++-----------
 iputils-doc.patch     | 20 --------------------
 iputils.spec          |  6 ++----
 3 files changed, 13 insertions(+), 35 deletions(-)
---
diff --git a/iputils.spec b/iputils.spec
index a043ef4..fa8ee98 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -7,19 +7,18 @@ Summary(pl.UTF-8):	Użytki przeznaczone dla pracy z siecią IPv4/IPv6
 Summary(ru.UTF-8):	Набор базовых сетевых утилит (ping, tracepath etc.)
 Summary(uk.UTF-8):	Набір базових мережевих утиліт (ping, tracepath etc.)
 Name:		iputils
-Version:	s20121126
+Version:	s20121221
 Release:	1
 Epoch:		2
 License:	BSD
 Group:		Networking/Admin
 Source0:	http://www.skbuff.net/iputils/%{name}-%{version}.tar.bz2
-# Source0-md5:	520f0ce93fbe0cfada6ed65cd06c227c
+# Source0-md5:	6072aef64205720dd1893b375e184171
 Patch0:		%{name}-pmake.patch
 Patch1:		%{name}-pf.patch
 Patch2:		%{name}-bindnow.patch
 # http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/iputils/iputils-s20101006-owl-pingsock.diff?rev=1.1;content-type=text%2Fplain
 Patch3:		%{name}-pingsock.patch
-Patch4:		%{name}-doc.patch
 URL:		http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils
 %if %{with doc}
 BuildRequires:	docbook-dtd31-sgml
@@ -96,7 +95,6 @@ pakiety ARP z użyciem podanego adresu źródłowego.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__make} all \
diff --git a/iputils-bindnow.patch b/iputils-bindnow.patch
index 1ce0c0b..aa3f669 100644
--- a/iputils-bindnow.patch
+++ b/iputils-bindnow.patch
@@ -4,9 +4,9 @@ information leakage.
 
 http://bugs.gentoo.org/77526
 
---- iputils-s20121126/Makefile.orig	2012-11-26 21:16:04.336458918 +0100
-+++ iputils-s20121126/Makefile	2012-11-26 21:18:36.459789081 +0100
-@@ -95,12 +95,13 @@
+--- iputils-s20121221/Makefile.orig	2012-12-21 15:01:07.000000000 +0100
++++ iputils-s20121221/Makefile	2013-01-08 17:31:42.110829497 +0100
+@@ -130,12 +130,13 @@
  %.o: %.c
  	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
  $(TARGETS): %: %.o
@@ -15,24 +15,24 @@ http://bugs.gentoo.org/77526
  
  # -------------------------------------
  # arping
- DEF_arping = $(DEF_SYSFS) $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) -DDEFAULT_DEVICE=\"$(ARPING_DEFAULT_DEVICE)\"
+ DEF_arping = $(DEF_SYSFS) $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
  LIB_arping = $(LIB_SYSFS) $(LIB_CAP) $(LIB_IDN)
 +LDOPTS_arping = -Wl,-z,now -Wl,-z,relro
  
- # clockdiff
- DEF_clockdiff = $(DEF_CAP)
-@@ -110,8 +111,10 @@
+ ifneq ($(ARPING_DEFAULT_DEVICE),)
+ DEF_arping += -DDEFAULT_DEVICE=\"$(ARPING_DEFAULT_DEVICE)\"
+@@ -149,8 +150,10 @@
  DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
- DEF_ping  = $(DEF_CAP) $(DEF_IDN)
+ DEF_ping  = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
  LIB_ping  = $(LIB_CAP) $(LIB_IDN)
 +LDOPTS_ping = -Wl,-z,now -Wl,-z,relro
- DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_ENABLE_PING6_RTHDR)
- LIB_ping6 = $(LIB_CAP) $(LIB_IDN) -lresolv -lcrypto
+ DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
+ LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
 +LDOPTS_ping6 = -Wl,-z,now -Wl,-z,relro
  
  ping: ping_common.o
  ping6: ping_common.o
-@@ -137,6 +140,7 @@
+@@ -176,6 +179,7 @@
  # traceroute6
  DEF_traceroute6 = $(DEF_CAP) $(DEF_IDN)
  LIB_traceroute6 = $(LIB_CAP) $(LIB_IDN)
diff --git a/iputils-doc.patch b/iputils-doc.patch
deleted file mode 100644
index f3c70e6..0000000
--- a/iputils-doc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- iputils-s20121114/doc/ping.sgml.orig	2012-11-14 14:10:12.000000000 +0100
-+++ iputils-s20121114/doc/ping.sgml	2012-11-15 19:41:09.023053608 +0100
-@@ -130,6 +130,7 @@
-   <listitem><para>
- Show help.
-   </para></listitem>
-+ </varlistentry>
-  <varlistentry>
-   <term><option>-i <replaceable/interval/</option></term>
-   <listitem><para>
---- iputils-s20121114/doc/tracepath.sgml.orig	2012-11-14 14:10:12.000000000 +0100
-+++ iputils-s20121114/doc/tracepath.sgml	2012-11-15 19:42:04.633052399 +0100
-@@ -72,6 +72,7 @@
-   <listitem><para>
- Sets the initial destination port to use.
-   </para></listitem>
-+ </varlistentry>
- </variablelist>
- </refsect1>
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iputils.git/commitdiff/54c52782d55a2e24fe85652a66db5494f9d21f76