From 92108d4299e46cb57f822c1dc9e76515243b247d Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:57:58 +0100
Subject: [PATCH] update to 20210202 [release 20210202-1mamba;Tue Apr 27 2021]

---
 iputils.spec | 79 +++++++++++++++++++++-------------------------------
 1 file changed, 32 insertions(+), 47 deletions(-)

diff --git a/iputils.spec b/iputils.spec
index b620b23..d971a64 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,88 +1,73 @@
 Name:          iputils
-Epoch:         1
-Version:       s20151218
+Epoch:         2
+Version:       20210202
 Release:       1mamba
 Summary:       Network monitoring tools including ping
 Group:         Network/Monitoring
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           ftp://ftp.inr.ac.ru/ip-routing/
-Source:        http://www.skbuff.net/iputils/iputils-%{version}.tar.bz2
+URL:           https://github.com/iputils/iputils
+Source:        https://github.com/iputils/iputils.git/%{version}/iputils-%{version}.tar.bz2
+#Source:        http://www.skbuff.net/iputils/iputils-%{version}.tar.bz2
 Patch0:        %{name}-notftpd.patch
 Patch1:        %{name}-s20071127-rdisc_open_max.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: libcap-devel
+BuildRequires: libidn2-devel
 ## AUTOBUILDREQ-END
 BuildRequires: OpenSP
 BuildRequires: libsysfs-devel
 BuildRequires: perl-SGMLSpm
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 The iputils package contains ping, a basic networking tool.
 The ping command sends a series of ICMP protocol ECHO_REQUEST packets to a specified network host and can tell you if that machine is alive and receiving network traffic.
 
+%debug_package
+
 %prep
 %setup -q
 #%patch0 -p1
 #%patch1 -p1
 
 %build
-%ifarch x86_64
-export CFLAGS="$RPM_OPT_FLAGS -fpic -Werror"
-%else
-export CFLAGS="$RPM_OPT_FLAGS -fpie -Werror"
-export LDFLAGS="-pie"
-%endif
-%make CC=%{_host}-gcc arping clockdiff ping ping6 rdisc tracepath tracepath6 \
-%if "%{_host}" != "%{_build}"
-.LIBPATTERNS=%{_prefix}/%{_host}/lib/lib%.so
-%endif
+%meson
 
-make man
+%meson_build
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-mkdir -p %{buildroot}/{bin,sbin,%{_bindir},%{_sbindir},%{_mandir}/man8}
-install -m 755 ping %{buildroot}/bin
-install -m 755 ping6 %{buildroot}/bin
-install -m 755 tracepath %{buildroot}/bin
-install -m 755 tracepath6 %{buildroot}/bin
-install -m 755 arping %{buildroot}/sbin
-install -m 755 clockdiff %{buildroot}%{_sbindir}
-install -m 755 rdisc %{buildroot}%{_sbindir}
+%meson_install
 
-ln -sf /bin/ping6 %{buildroot}%{_sbindir}
-ln -sf /bin/tracepath %{buildroot}%{_sbindir}
-ln -sf /bin/tracepath6 %{buildroot}%{_sbindir}
-ln -sf /sbin/arping %{buildroot}%{_sbindir}/arping
+ln -sf ../sbin/ping6 %{buildroot}%{_bindir}
+ln -sf ../sbin/tracepath6 %{buildroot}%{_bindir}
 
-install -m 644 doc/arping.8 %{buildroot}%{_mandir}/man8
-install -m 644 doc/clockdiff.8 %{buildroot}%{_mandir}/man8
-#install -m 644 doc/pg3.8 %{buildroot}%{_mandir}/man8
-install -m 644 doc/ping.8 %{buildroot}%{_mandir}/man8
-install -m 644 doc/rdisc.8 %{buildroot}%{_mandir}/man8
-install -m 644 doc/tracepath.8 %{buildroot}%{_mandir}/man8
-
-ln -s ping.8.gz %{buildroot}%{_mandir}/man8/ping6.8.gz
-ln -s tracepath.8.gz %{buildroot}%{_mandir}/man8/tracepath6.8.gz
+%find_lang %{name}
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
-%attr(4755,root,root) /bin/ping
-%attr(4755,root,root) /bin/ping6
-/bin/tracepath
-/bin/tracepath6
-/sbin/arping
-%{_sbindir}/*
+%{_bindir}/arping
+%{_bindir}/clockdiff
+%attr(4755,root,root) %{_bindir}/ping
+%{_bindir}/ping6
+%{_bindir}/tracepath
+%{_bindir}/tracepath6
+%{_sbindir}/ninfod
+%{_sbindir}/rdisc
+%{_unitdir}/ninfod.service
+%{_unitdir}/rdisc.service
 %{_mandir}/man8/*
 
 %changelog
+* Tue Apr 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 20210202-1mamba
+- update to 20210202
+
 * Mon Jan 04 2016 Automatic Build System <autodist@mambasoft.it> s20151218-1mamba
 - automatic update by autodist
 
@@ -126,12 +111,12 @@ ln -s tracepath.8.gz %{buildroot}%{_mandir}/man8/tracepath6.8.gz
 * Thu Jul 10 2003 Silvan Calarco <silvan.calarco@qinet.it> ss020927-4qilnx
 - ping is now suid root so normal users can ping
 
-* Mon May 09 2003 Silvan Calarco <silvan.calarco@qinet.it> ss020927-3qilnx
+* Fri May 09 2003 Silvan Calarco <silvan.calarco@qinet.it> ss020927-3qilnx
 - removed tftp server
 
-* Mon Apr 22 2003 Silvan Calarco <silvan.calarco@qinet.it>
+* Tue Apr 22 2003 Silvan Calarco <silvan.calarco@qinet.it>
 - removed prefix variable definition
 - added make parameter KERNEL_INCLUDE
 
-* Mon Apr 08 2003 Alessandro Ramazzina <alessandro.ramazzina@qinet.it>
+* Tue Apr 08 2003 Alessandro Ramazzina <alessandro.ramazzina@qinet.it>
 - creation of iputils package