From 9aa9bd41039ab63e7f4265bbbf97c1030c4cc7f0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sun, 27 Nov 2022 15:55:30 -0800
Subject: [PATCH] Update to 20221126. Fixes rhbz#2148690

---
 .gitignore   |  1 +
 iputils.spec | 47 ++++++-----------------------------------------
 sources      |  2 +-
 3 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index c452117..d94cebc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ ifenslave.tar.gz
 /iputils-20210202.tar.gz
 /iputils-20210722.tar.gz
 /iputils-20211215.tar.gz
+/iputils-20221126.tar.gz
diff --git a/iputils.spec b/iputils.spec
index 0fb4d93..5e7c634 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -2,8 +2,8 @@
 
 Summary: Network monitoring tools including ping
 Name: iputils
-Version: 20211215
-Release: 4%{?dist}
+Version: 20221126
+Release: 1%{?dist}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 License: BSD and GPLv2+
@@ -11,8 +11,6 @@ URL: https://github.com/iputils/iputils
 
 Source0: https://github.com/iputils/iputils/archive/%{version}/%{name}-%{version}.tar.gz
 Source1: ifenslave.tar.gz
-Source2: rdisc.service
-Source3: ninfod.service
 # Taken from ping.c on 2014-07-12
 Source4: bsd.txt
 Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
@@ -34,7 +32,6 @@ BuildRequires: iproute
 Provides: /bin/ping
 Provides: /bin/ping6
 Provides: /sbin/arping
-Provides: /sbin/rdisc
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -42,15 +39,6 @@ including ping. The ping command sends a series of ICMP protocol
 ECHO_REQUEST packets to a specified network host to discover whether
 the target machine is alive and receiving network traffic.
 
-%package ninfod
-Summary: Node Information Query Daemon
-Requires: %{name} = %{version}-%{release}
-Provides: %{_sbindir}/ninfod
-
-%description ninfod
-Node Information Query (RFC4620) daemon. Responds to IPv6 Node Information
-Queries.
-
 %prep
 %setup -q -a 1 -n %{name}-%{version}
 cp %{SOURCE4} %{SOURCE5} .
@@ -67,7 +55,7 @@ gcc $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave
 %meson_install
 %find_lang %{name}
 
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 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
@@ -78,33 +66,13 @@ ln -sf tracepath.8.gz ${RPM_BUILD_ROOT}%{_mandir}/man8/tracepath6.8.gz
 install -cp ifenslave ${RPM_BUILD_ROOT}%{_sbindir}/
 install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
-%post
-%systemd_post rdisc.service
-
-%preun
-%systemd_preun rdisc.service
-
-%postun
-%systemd_postun_with_restart rdisc.service
-
-%post ninfod
-%systemd_post ninfod.service
-
-%preun ninfod
-%systemd_preun ninfod.service
-
-%postun ninfod
-%systemd_postun_with_restart ninfod.service
-
 %files -f %{name}.lang
 %doc README.bonding
 %license bsd.txt gpl-2.0.txt
-%{_unitdir}/rdisc.service
 %attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/clockdiff
 %attr(0755,root,root) %caps(cap_net_raw=p) %{_bindir}/arping
 %attr(0755,root,root) %{_bindir}/ping
 %{_sbindir}/ifenslave
-%{_sbindir}/rdisc
 %{_bindir}/tracepath
 %{_sbindir}/ping
 %{_sbindir}/ping6
@@ -115,17 +83,14 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 %attr(644,root,root) %{_mandir}/man8/arping.8.gz
 %attr(644,root,root) %{_mandir}/man8/ping.8.gz
 %{_mandir}/man8/ping6.8.gz
-%attr(644,root,root) %{_mandir}/man8/rdisc.8.gz
 %attr(644,root,root) %{_mandir}/man8/tracepath.8.gz
 %{_mandir}/man8/tracepath6.8.gz
 %attr(644,root,root) %{_mandir}/man8/ifenslave.8.gz
 
-%files ninfod
-%attr(0755,root,root) %caps(cap_net_raw=ep) %{_sbindir}/ninfod
-%{_unitdir}/ninfod.service
-%attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
-
 %changelog
+* Sun Nov 27 2022 Kevin Fenzi <kevin@scrye.com> - 20221126-1
+- Update to 20221126. Fixes rhbz#2148690
+
 * Fri Nov 25 2022 Jan Macku <jamacku@redhat.com> - 20211215-4
 - Build iputils and ifenslave with correct flags provided by Fedora
 
diff --git a/sources b/sources
index d0f1036..33d605c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ifenslave.tar.gz) = 117e4552486f07190e606174dea7666ed6ea0e2bd90d4f389d41f1a5bee31fcec785f18c5e9c281a5c7b71307377eca37f9e461e187e1149820cab5c9e07676a
-SHA512 (iputils-20211215.tar.gz) = 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
+SHA512 (iputils-20221126.tar.gz) = 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f