[iputils/f20] Update to iputils-s20140519

[jsynacek]

commit 3ce67e25af522ab0f36514dc5a2a5e9cf1e2af23
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Tue May 20 10:55:50 2014 +0200

    Update to iputils-s20140519
    
    Related: #1096415

 .gitignore                             |    1 +
 iputils-20020927-rh.patch              |   48 --------------------------------
 iputils-20121221-eperm-flood.patch     |   26 -----------------
 iputils-20121221-floodlocale.patch     |   12 --------
 iputils-20121221-sigalrm-unblock.patch |   32 ---------------------
 iputils-rh.patch                       |   37 ++++++++++++++++++++++++
 iputils-tracepath-doc.patch            |   19 ++++++++++++
 iputils.spec                           |   27 +++++++++--------
 sources                                |    2 +-
 9 files changed, 72 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fbb667..c85ec98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ ifenslave.tar.gz
 /iputils-s20121205.tar.bz2
 /iputils-s20121207.tar.bz2
 /iputils-s20121221.tar.bz2
+/iputils-s20140519.tar.gz
diff --git a/iputils-rh.patch b/iputils-rh.patch
new file mode 100644
index 0000000..7c0b0d1
--- /dev/null
+++ b/iputils-rh.patch
@@ -0,0 +1,37 @@
+--- iputils-s20140519-dist/Makefile	2014-05-19 23:35:28.000000000 +0200
++++ iputils-s20140519-new/Makefile	2014-05-20 10:51:07.388527442 +0200
+@@ -26,7 +26,7 @@ USE_CAP=yes
+ # sysfs support (with libsysfs - deprecated) [no|yes|static]
+ USE_SYSFS=no
+ # IDN support (experimental) [no|yes|static]
+-USE_IDN=no
++USE_IDN=yes
+ 
+ # Do not use getifaddrs [no|yes|static]
+ WITHOUT_IFADDRS=no
+@@ -34,7 +34,7 @@ WITHOUT_IFADDRS=no
+ ARPING_DEFAULT_DEVICE=
+ 
+ # GNU TLS library for ping6 [yes|no|static]
+-USE_GNUTLS=yes
++USE_GNUTLS=no
+ # Crypto library for ping6 [shared|static|no]
+ USE_CRYPTO=shared
+ # Resolv library for ping6 [yes|static]
+@@ -49,7 +49,7 @@ ENABLE_RDISC_SERVER=no
+ # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
+ # CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
+ CFLAGS?=-O3 -g
+-CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
++CFLAGS+=$(RPM_OPT_FLAGS) -fno-strict-aliasing -Wstrict-prototypes -Wall -Werror
+ CPPFLAGS+=-D_GNU_SOURCE
+ LDLIB=
+ 
+@@ -188,6 +188,7 @@ tftpd.o tftpsubs.o: tftp.h
+ 
+ # -------------------------------------
+ # ninfod
++ninfod: CFLAGS:=$(filter-out -Werror,$(CFLAGS))
+ ninfod:
+ 	@set -e; \
+ 		if [ ! -f ninfod/Makefile ]; then \
diff --git a/iputils-tracepath-doc.patch b/iputils-tracepath-doc.patch
new file mode 100644
index 0000000..abfbabd
--- /dev/null
+++ b/iputils-tracepath-doc.patch
@@ -0,0 +1,19 @@
+commit 51aad205e5e8289b52241cd41b15e0f116c4442a
+Author: Jan Synacek <jsynacek at redhat.com>
+Date:   Tue May 20 11:17:00 2014 +0200
+
+    tracepath,doc: fix corrupted tag
+
+diff --git a/doc/tracepath.sgml b/doc/tracepath.sgml
+index 8048c80..756572f 100644
+--- a/doc/tracepath.sgml
++++ b/doc/tracepath.sgml
+@@ -69,7 +69,7 @@ Sets the initial packet length to <replaceable/pktlen/ instead of
+  </varlistentry>
+ 
+  <varlistentry>
+-  <term><option/-m</term>
++  <term><option>-m</option></term>
+   <listitem><para>
+ Set maximum hops (or maximum TTLs) to <replaceable/max_hops/
+ instead of 30.
diff --git a/iputils.spec b/iputils.spec
index 9caf2a1..a1e75f0 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -2,26 +2,25 @@
 
 Summary: Network monitoring tools including ping
 Name: iputils
-Version: 20121221
-Release: 6%{?dist}
+Version: 20140519
+Release: 1%{?dist}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 License: BSD and GPLv2+
-URL: http://www.skbuff.net/iputils
+URL: https://github.com/iputils/iputils
 Group: System Environment/Daemons
 
-Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
+Source0: https://github.com/iputils/iputils/archive/s%{version}.tar.gz#/%{name}-s%{version}.tar.gz
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
 Source4: rdisc.service
 Source5: rdisc.sysconfig
 Source6: ninfod.service
 
-Patch0: iputils-20020927-rh.patch
+Patch0: iputils-rh.patch
 Patch1: iputils-ifenslave.patch
-Patch2: iputils-20121221-floodlocale.patch
-Patch3: iputils-20121221-eperm-flood.patch
-Patch4: iputils-20121221-sigalrm-unblock.patch
+# pending upstream inclusion
+Patch2: iputils-tracepath-doc.patch
 
 BuildRequires: docbook-utils perl-SGMLSpm
 BuildRequires: glibc-kernheaders >= 2.4-8.19
@@ -69,11 +68,9 @@ Queries.
 %prep
 %setup -q -a 1 -n %{name}-s%{version}
 
-%patch0 -p1 -b .rh
-%patch1 -p1 -b .addr
-%patch2 -p1 -b .floc
-%patch3 -p1 -b .eperm
-%patch4 -p1 -b .sigalrm
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %ifarch s390 s390x
@@ -181,6 +178,10 @@ mv -f RELNOTES.tmp RELNOTES
 %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
 
 %changelog
+* Tue May 20 2014 Jan Synáček <jsynacek at redhat.com> - 20140519-1
+- Update to iputils-s20140519
+- Related: #1096415
+
 * Fri Apr 11 2014 Jan Synáček <jsynacek at redhat.com> - 20121221-6
 - Fix arping hang if SIGALRM is blocked (#1085971)
 
diff --git a/sources b/sources
index 3401ac1..49c14fc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6072aef64205720dd1893b375e184171  iputils-s20121221.tar.bz2
+72943b0b6406c514f19de38218426afa  iputils-s20140519.tar.gz
 6702c58e970e6a73fc8d9b7c9b63af35  ifenslave.tar.gz