Update to s20190324 (#1692136)

0001-build-sys-make-rdisc.service-a-regular-unit.patch

@@ -0,0 +1,27 @@
+From 76e526ca9b5f395745778ecc0d2dc4ce7461c7ac Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Wed, 27 Mar 2019 12:58:51 +0100
+Subject: [PATCH 1/2] build-sys: make rdisc.service a regular unit
+
+There is no need to output it as a template unit, as there is no
+template specific syntax in the unit file.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 97c4a12..8bb5756 100644
+--- a/meson.build
++++ b/meson.build
+@@ -288,7 +288,7 @@ if build_rinfod == true
+ 		subs.set('sbindir', join_paths(get_option('prefix'), get_option('sbindir')))
+ 		unit_file = configure_file(
+ 			input: 'systemd/rdisc.service.in',
+-			output: 'rdisc@.service',
++			output: 'rdisc.service',
+ 			configuration: subs
+ 		)
+ 		install_data(unit_file, install_dir: systemdunitdir)
+-- 
+2.20.1
+

0002-doc-Use-namespace-correctly.patch

@@ -0,0 +1,161 @@
+From c503834519d21973323980850431101f90e663ef Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Mon, 25 Mar 2019 15:23:59 +0100
+Subject: [PATCH] doc: Use namespace correctly
+
+The files declared xmlns:db but did not use the db namespace at all.
+They did not define the default namespace at all, which coincidentally
+worked with Docbook 4 stylesheets, making them think the files were
+written in Docbook 4.
+
+I fixed the namespaces of the documents and switched to the correct
+Docbook 5 stylesheets.
+
+Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
+---
+ doc/arping.xml      | 2 +-
+ doc/clockdiff.xml   | 2 +-
+ doc/custom-html.xsl | 2 +-
+ doc/custom-man.xsl  | 2 +-
+ doc/meson.build     | 2 +-
+ doc/ninfod.xml      | 2 +-
+ doc/ping.xml        | 2 +-
+ doc/rarpd.xml       | 2 +-
+ doc/rdisc.xml       | 2 +-
+ doc/tftpd.xml       | 2 +-
+ doc/tracepath.xml   | 2 +-
+ doc/traceroute6.xml | 2 +-
+ 12 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/doc/arping.xml b/doc/arping.xml
+index ed00af4..711718f 100644
+--- a/doc/arping.xml
++++ b/doc/arping.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.arping">
+ 
+   <refentryinfo>
+diff --git a/doc/clockdiff.xml b/doc/clockdiff.xml
+index dea05c8..24d1943 100644
+--- a/doc/clockdiff.xml
++++ b/doc/clockdiff.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.clockdiff">
+ 
+   <refentryinfo>
+diff --git a/doc/custom-html.xsl b/doc/custom-html.xsl
+index c391535..a952c5f 100644
+--- a/doc/custom-html.xsl
++++ b/doc/custom-html.xsl
+@@ -2,7 +2,7 @@
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
+ <!--
+   - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
+   - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
+diff --git a/doc/custom-man.xsl b/doc/custom-man.xsl
+index 058f495..ba9697d 100644
+--- a/doc/custom-man.xsl
++++ b/doc/custom-man.xsl
+@@ -5,7 +5,7 @@
+                 extension-element-prefixes="exsl"
+                 version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
+ 
+ <xsl:template name="top.comment" />
+ 
+diff --git a/doc/meson.build b/doc/meson.build
+index 50dcb4e..5052857 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -49,7 +49,7 @@ xsltproc_args = [
+ 
+ if xsltproc.found()
+ 	testrun = run_command([xsltproc, '--nonet',
+-		'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'])
++		'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'])
+ 	xsltproc_works = testrun.returncode() == 0
+ else
+ 	warning('No docbook stylesheet found for generating man pages')
+diff --git a/doc/ninfod.xml b/doc/ninfod.xml
+index 1177a21..081d470 100644
+--- a/doc/ninfod.xml
++++ b/doc/ninfod.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ninfod">
+ 
+   <refentryinfo>
+diff --git a/doc/ping.xml b/doc/ping.xml
+index 691887a..b5cea9c 100644
+--- a/doc/ping.xml
++++ b/doc/ping.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ping">
+ 
+   <refentryinfo>
+diff --git a/doc/rarpd.xml b/doc/rarpd.xml
+index 0785d56..65d6367 100644
+--- a/doc/rarpd.xml
++++ b/doc/rarpd.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rarpd">
+ 
+   <refentryinfo>
+diff --git a/doc/rdisc.xml b/doc/rdisc.xml
+index 8aa8898..ab1c673 100644
+--- a/doc/rdisc.xml
++++ b/doc/rdisc.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rdisc">
+ 
+   <refentryinfo>
+diff --git a/doc/tftpd.xml b/doc/tftpd.xml
+index 8f51c3d..4a1b948 100644
+--- a/doc/tftpd.xml
++++ b/doc/tftpd.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tftpd">
+ 
+   <refentryinfo>
+diff --git a/doc/tracepath.xml b/doc/tracepath.xml
+index d0a9a12..d1bdcd8 100644
+--- a/doc/tracepath.xml
++++ b/doc/tracepath.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tracepath">
+ 
+   <refentryinfo>
+diff --git a/doc/traceroute6.xml b/doc/traceroute6.xml
+index c52d296..5a72784 100644
+--- a/doc/traceroute6.xml
++++ b/doc/traceroute6.xml
+@@ -1,4 +1,4 @@
+-<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.traceroute6">
+ 
+   <refentryinfo>
+-- 
+2.20.1
+

iputils-rh.patch

@@ -1,20 +0,0 @@
---- iputils-s20160308/Makefile	2016-03-08 13:58:56.000000000 +0100
-+++ iputils-s20160308-new/Makefile	2016-03-09 10:09:02.295409179 +0100
-@@ -36,7 +36,7 @@ WITHOUT_IFADDRS=no
- ARPING_DEFAULT_DEVICE=
- 
- # nettle library for ipv6 ping [yes|no|static]
--USE_NETTLE=yes
-+USE_NETTLE=no
- # libgcrypt library for ipv6 ping [no|yes|static]
- USE_GCRYPT=no
- # Crypto library for ping6 [shared|static|no]
-@@ -53,7 +53,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
- CPPFLAGS+=-D_GNU_SOURCE
- LDLIB=
- 

iputils.spec

@@ -2,8 +2,8 @@
 
 Summary: Network monitoring tools including ping
 Name: iputils
-Version: 20180629
+Version: 20190324
-Release: 4%{?dist}
+Release: 1%{?dist}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 License: BSD and GPLv2+
@@ -17,16 +17,20 @@ Source3: ninfod.service
 Source4: bsd.txt
 Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
-Patch0: iputils-rh.patch
+# https://github.com/iputils/iputils/pull/173
-Patch1: iputils-ifenslave.patch
+Patch001: 0001-build-sys-make-rdisc.service-a-regular-unit.patch
+# https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef
+Patch002: 0002-doc-Use-namespace-correctly.patch
+Patch100: iputils-ifenslave.patch
 
-BuildRequires:  gcc
+BuildRequires: gcc
-BuildRequires: docbook-utils perl-SGMLSpm
+BuildRequires: meson
+BuildRequires: gettext
 BuildRequires: glibc-kernheaders >= 2.4-8.19
 BuildRequires: libidn2-devel
 BuildRequires: openssl-devel
 BuildRequires: libcap-devel
-BuildRequires: libxslt docbook-style-xsl
+BuildRequires: libxslt docbook5-style-xsl
 BuildRequires: systemd
 %{?systemd_ordering}
 Provides: /bin/ping
@@ -53,8 +57,9 @@ Queries.
 %setup -q -a 1 -n %{name}-s%{version}
 cp %{SOURCE4} %{SOURCE5} .
 
-%patch0 -p1
+%patch001 -p1
-%patch1 -p1
+%patch002 -p1
+%patch100 -p1
 
 %build
 %ifarch s390 s390x
@@ -64,43 +69,22 @@ cp %{SOURCE4} %{SOURCE5} .
 %endif
 export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 
-make %{?_smp_mflags} arping clockdiff ping rdisc tracepath ninfod
+%meson -DBUILD_TFTPD=false
+%meson_build
 gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
-make -C doc man
 
 %install
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+%meson_install
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
-
-install -c clockdiff		${RPM_BUILD_ROOT}%{_sbindir}/
-install -cp arping		${RPM_BUILD_ROOT}%{_sbindir}/
-install -cp ping		${RPM_BUILD_ROOT}%{_bindir}/
-install -cp ifenslave		${RPM_BUILD_ROOT}%{_sbindir}/
-install -cp rdisc		${RPM_BUILD_ROOT}%{_sbindir}/
-install -cp tracepath		${RPM_BUILD_ROOT}%{_bindir}/
-install -cp ninfod/ninfod	${RPM_BUILD_ROOT}%{_sbindir}/
 
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 ln -sf ../bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping
 ln -sf ../bin/ping ${RPM_BUILD_ROOT}%{_sbindir}/ping6
 ln -sf ../bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath
 ln -sf ../bin/tracepath ${RPM_BUILD_ROOT}%{_sbindir}/tracepath6
-
+ln -sf ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
+ln -sf tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
-install -cp doc/clockdiff.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp ifenslave ${RPM_BUILD_ROOT}%{_sbindir}/
-install -cp doc/arping.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
+install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -cp doc/ping.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -cp doc/rdisc.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -cp doc/tracepath.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -cp doc/ninfod.8	${RPM_BUILD_ROOT}%{_mandir}/man8/
-install -cp ifenslave.8		${RPM_BUILD_ROOT}%{_mandir}/man8/
-ln -s ping.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/ping6.8.gz
-ln -s tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
-
-install -dp ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 644 %SOURCE2 ${RPM_BUILD_ROOT}/%{_unitdir}
-install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_unitdir}
 
 %post
 %systemd_post rdisc.service
@@ -125,8 +109,8 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_unitdir}
 %{!?_licensedir:%global license %%doc}
 %license bsd.txt gpl-2.0.txt
 %{_unitdir}/rdisc.service
-%attr(0755,root,root) %caps(cap_net_raw=p) %{_sbindir}/clockdiff
+%attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/clockdiff
-%attr(0755,root,root) %caps(cap_net_raw=p) %{_sbindir}/arping
+%attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/arping
 %attr(0755,root,root) %caps(cap_net_raw=p cap_net_admin=p) %{_bindir}/ping
 %{_sbindir}/ifenslave
 %{_sbindir}/rdisc
@@ -143,6 +127,7 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_unitdir}
 %attr(644,root,root) %{_mandir}/man8/tracepath.8.gz
 %{_mandir}/man8/tracepath6.8.gz
 %attr(644,root,root) %{_mandir}/man8/ifenslave.8.gz
+%{_datadir}/locale/ja/LC_MESSAGES/iputils.mo
 
 %files ninfod
 %attr(0755,root,root) %caps(cap_net_raw=ep) %{_sbindir}/ninfod
@@ -150,6 +135,9 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_unitdir}
 %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
 
 %changelog
+* Thu Mar 28 2019 Jan Synáček <jsynacek@redhat.com> - 20190324-1
+- Update to s20190324 (#1692136)
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180629-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild