[packages/iputils] - updated to s20121126 - updated bindnow patch

[qboosh]

commit abccb0641561bb97b315dded344b10261a314185
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Nov 26 21:21:27 2012 +0100

    - updated to s20121126
    - updated bindnow patch

 iputils-bindnow.patch | 52 +++++++++++++++++++++++++++------------------------
 iputils.spec          |  6 +++---
 2 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/iputils.spec b/iputils.spec
index f65a146..a043ef4 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -7,13 +7,13 @@ 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:	s20121114
-Release:	2
+Version:	s20121126
+Release:	1
 Epoch:		2
 License:	BSD
 Group:		Networking/Admin
 Source0:	http://www.skbuff.net/iputils/%{name}-%{version}.tar.bz2
-# Source0-md5:	3966df066d598183f459011139e8987f
+# Source0-md5:	520f0ce93fbe0cfada6ed65cd06c227c
 Patch0:		%{name}-pmake.patch
 Patch1:		%{name}-pf.patch
 Patch2:		%{name}-bindnow.patch
diff --git a/iputils-bindnow.patch b/iputils-bindnow.patch
index fbe5e60..1ce0c0b 100644
--- a/iputils-bindnow.patch
+++ b/iputils-bindnow.patch
@@ -4,35 +4,39 @@ information leakage.
 
 http://bugs.gentoo.org/77526
 
---- iputils-s20121114/Makefile.orig	2012-11-15 17:01:22.376586746 +0100
-+++ iputils-s20121114/Makefile	2012-11-15 17:02:39.039918482 +0100
-@@ -62,7 +62,7 @@
+--- 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 @@
+ %.o: %.c
+ 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
+ $(TARGETS): %: %.o
+-	$(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
++	$(LINK.o) $^ $(LDOPTS_$@) $(LIB_$@) $(LDLIBS) -o $@
  
+ # -------------------------------------
  # arping
- arping: arping.o
--	$(LINK.o) $^ $(LIB_SYSFS) $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@
-+	$(LINK.o) $^ $(LIB_SYSFS) $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+ DEF_arping = $(DEF_SYSFS) $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) -DDEFAULT_DEVICE=\"$(ARPING_DEFAULT_DEVICE)\"
+ LIB_arping = $(LIB_SYSFS) $(LIB_CAP) $(LIB_IDN)
++LDOPTS_arping = -Wl,-z,now -Wl,-z,relro
  
  # clockdiff
- clockdiff: clockdiff.o
-@@ -80,9 +80,9 @@
- 
- # ping / ping6
- ping: ping.o ping_common.o
--	$(LINK.o) $^ $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@
-+	$(LINK.o) $^ $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
- ping6: ping6.o ping_common.o
--	$(LINK.o) $^ -lresolv -lcrypto $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@
-+	$(LINK.o) $^ -lresolv -lcrypto $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
- ping6.o: ping_common.h in6_flowlabel.h
- ping.o ping_common.o: ping_common.h
- 
-@@ -100,7 +100,7 @@
+ DEF_clockdiff = $(DEF_CAP)
+@@ -110,8 +111,10 @@
+ DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
+ DEF_ping  = $(DEF_CAP) $(DEF_IDN)
+ 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
++LDOPTS_ping6 = -Wl,-z,now -Wl,-z,relro
  
+ ping: ping_common.o
+ ping6: ping_common.o
+@@ -137,6 +140,7 @@
  # traceroute6
- traceroute6: traceroute6.o
--	$(LINK.o) $^ $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@
-+	$(LINK.o) $^ $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+ DEF_traceroute6 = $(DEF_CAP) $(DEF_IDN)
+ LIB_traceroute6 = $(LIB_CAP) $(LIB_IDN)
++LDOPTS_traceroute6 = -Wl,-z,now -Wl,-z,relro
  
  # tftpd
- tftpd: tftpd.o tftpsubs.o
+ DEF_tftpd =
================================================================

---- gitweb:

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