[packages/iputils] - up to s20121114

[arekm]

commit f480b1dbec50f6c77094d82b9b7f8c694aeeaf5e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Nov 15 18:38:07 2012 +0100

    - up to s20121114

 iputils-bindnow.patch | 19 ++++++++++---------
 iputils.spec          |  8 ++++----
 2 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/iputils.spec b/iputils.spec
index 76f3812..0d343fb 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:	s20121106
+Version:	s20121114
 Release:	1
 Epoch:		2
 License:	BSD
 Group:		Networking/Admin
 Source0:	http://www.skbuff.net/iputils/%{name}-%{version}.tar.bz2
-# Source0-md5:	85b0f57f2ceb937aacd1c0cdb58de016
+# Source0-md5:	3966df066d598183f459011139e8987f
 Patch0:		%{name}-pmake.patch
 Patch1:		%{name}-pf.patch
 Patch2:		%{name}-bindnow.patch
@@ -124,11 +124,11 @@ echo ".so tracepath.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tracepath6.8
 
 # no tftpd
 %{__rm} $RPM_BUILD_ROOT%{_sbindir}/tftpd
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tftpd*
+%{?with_doc:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tftpd*}
 
 # we don't build pg kernel module
 %{__rm} $RPM_BUILD_ROOT%{_sbindir}/ipg
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/pg3*
+%{?with_doc:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/pg3*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/iputils-bindnow.patch b/iputils-bindnow.patch
index a6046be..c542c5e 100644
--- a/iputils-bindnow.patch
+++ b/iputils-bindnow.patch
@@ -10,8 +10,8 @@ http://bugs.gentoo.org/77526
  
  # arping
  arping: arping.o
--	$(LINK.o) $^ $(LIB_SYSFS) $(LIB_CAP) $(LDLIBS) -o $@
-+	$(LINK.o) $^ $(LIB_SYSFS) $(LIB_CAP) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+-	$(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
  
  # clockdiff
  clockdiff: clockdiff.o
@@ -19,20 +19,21 @@ http://bugs.gentoo.org/77526
  
  # ping / ping6
  ping: ping.o ping_common.o
--	$(LINK.o) $^ $(LIB_CAP) $(LDLIBS) -o $@
-+	$(LINK.o) $^ $(LIB_CAP) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
+-	$(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) $(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
+-	$(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
  
  # 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
+-	$(LINK.o) $^ $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@
++	$(LINK.o) $^ $(LIB_CAP) $(LIB_IDN) $(LDLIBS) -o $@ -Wl,-z,now -Wl,-z,relro
  
  # tftpd
  tftpd: tftpd.o tftpsubs.o
================================================================

---- gitweb:

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