- updated to 20121106

- updated bindnow patch

diff --git a/iputils-bindnow.patch b/iputils-bindnow.patch
index 58447faa146a8fde402f20ccccac5a7903b8e95e..a6046bebdb1ca8e02cca377cd27d77ed21d96413 100644 (file)
--- a/iputils-bindnow.patch
+++ b/iputils-bindnow.patch
@@ -4,25 +4,35 @@ information leakage.
 
 http://bugs.gentoo.org/77526
 
---- iputils-s20121011/Makefile.orig    2012-11-01 17:12:14.226219387 +0100
-+++ iputils-s20121011/Makefile 2012-11-01 17:15:12.589545237 +0100
-@@ -42,15 +42,15 @@
- clockdiff: clockdiff.o
-       $(LINK.o) -o $@ $^ $(LIB_CAP)
- traceroute6: traceroute6.o
--      $(LINK.o) -o $@ $^ $(LIB_CAP)
-+      $(LINK.o) -o $@ $^ $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
- tftpd: tftpd.o tftpsubs.o
-       $(LINK.o) -o $@ $^ $(LIB_CAP)
+--- iputils-s20121106/Makefile.orig    2012-11-11 19:29:39.752768719 +0100
++++ iputils-s20121106/Makefile 2012-11-11 19:32:42.666094377 +0100
+@@ -55,7 +55,7 @@
+ 
+ # arping
  arping: arping.o
--      $(LINK.o) -o $@ $^ $(LIB_SYSFS) $(LIB_CAP)
-+      $(LINK.o) -o $@ $^ $(LIB_SYSFS) $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
+-      $(LINK.o) $^ $(LIB_SYSFS) $(LIB_CAP) $(LDLIBS) -o $@
++      $(LINK.o) $^ $(LIB_SYSFS) $(LIB_CAP) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+ 
+ # clockdiff
+ clockdiff: clockdiff.o
+@@ -63,9 +63,9 @@
+ 
+ # ping / ping6
  ping: ping.o ping_common.o
--      $(LINK.o) -o $@ $^ $(LIB_CAP)
-+      $(LINK.o) -o $@ $^ $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
+-      $(LINK.o) $^ $(LIB_CAP) $(LDLIBS) -o $@
++      $(LINK.o) $^ $(LIB_CAP) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
  ping6: ping6.o ping_common.o
--      $(LINK.o) -o $@ $^ -lresolv -lcrypto $(LIB_CAP)
-+      $(LINK.o) -o $@ $^ -lresolv -lcrypto $(LIB_CAP) -Wl,-z,now -Wl,-z,relro
- 
+-      $(LINK.o) $^ -lresolv -lcrypto $(LIB_CAP) $(LDLIBS) -o $@
++      $(LINK.o) $^ -lresolv -lcrypto $(LIB_CAP) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
  ping.o ping6.o ping_common.o: ping_common.h
- tftpd.o tftpsubs.o: tftp.h
+ 
+ # rarpd
+@@ -80,7 +80,7 @@
+ 
+ # traceroute6
+ traceroute6: traceroute6.o
+-      $(LINK.o) $^ $(LIB_CAP) $(LDLIBS) -o $@
++      $(LINK.o) $^ $(LIB_CAP) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+ 
+ # tftpd
+ tftpd: tftpd.o tftpsubs.o

diff --git a/iputils.spec b/iputils.spec
index a26f1e9b15c5afd0bc2f0dfa6dafe5f3ee465b84..76f38126efd48822c7c8fa13e502955308a1e225 100644 (file)
--- 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:       s20121011
+Version:       s20121106
 Release:       1
 Epoch:         2
 License:       BSD
 Group:         Networking/Admin
 Source0:       http://www.skbuff.net/iputils/%{name}-%{version}.tar.bz2
-# Source0-md5: 67056dae90c1ec02e753e0e17d3774ac
+# Source0-md5: 85b0f57f2ceb937aacd1c0cdb58de016
 Patch0:                %{name}-pmake.patch
 Patch1:                %{name}-pf.patch
 Patch2:                %{name}-bindnow.patch