Several aspects are to be noted here: - docbook arrogantly assumes it always can fetch resources directly from the internet (doing so with a plain HTTP URL, as if this wasn't bad enough), and since we dont - and will never - provide build environments with network access, this causes manpages for iputils not to be built.
- Also, iputils switched to meson. Much fun. :-/
- Third, setting capabilities is currently not support, hence temporarily disabled by yours truly, to get this package _somewhere_. If desired or necessary by other scripts, we can also re-add symlinks again later, to meet convenience demands.
Signed-off-by: Peter Müller peter.mueller@ipfire.org --- iputils/iputils.nm | 41 +++++---------------- iputils/patches/iputils-ipfire.patch | 37 ------------------- iputils/patches/iputils-tracepath-doc.patch | 19 ---------- 3 files changed, 10 insertions(+), 87 deletions(-) delete mode 100644 iputils/patches/iputils-ipfire.patch delete mode 100644 iputils/patches/iputils-tracepath-doc.patch
diff --git a/iputils/iputils.nm b/iputils/iputils.nm index 402a15269..ef385384a 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -4,11 +4,11 @@ ###############################################################################
name = iputils -version = s20140519 +version = 20221126 release = 1
groups = Networking/Tools -url = http://www.skbuff.net/iputils +url = https://www.skbuff.net/iputils license = BSD summary = Network monitoring tools including ping.
@@ -19,47 +19,26 @@ description the target machine is alive and receiving network traffic. end
-source_dl = https://github.com/iputils/iputils/archive/%%7Bversion%7D.tar.gz#/ +source_dl = https://github.com/iputils/iputils/archive/refs/tags/%%7Bversion%7D.tar.gz#/
build requires - docbook-utils + /usr/bin/xsltproc libcap-devel libidn-devel - openssl-devel + meson end
- # Generate manpages with docbook. build_cmds - make -C doc man + %{meson} + %{meson_build} end
install - mkdir -pv %{BUILDROOT}{%{bindir},%{sbindir}} - mkdir -pv %{BUILDROOT}%{mandir}/man8 + %{meson_install}
- install -cp clockdiff %{BUILDROOT}%{sbindir} - install -cp arping %{BUILDROOT}%{sbindir} - install -cp ping %{BUILDROOT}%{bindir} - install -cp ping6 %{BUILDROOT}%{bindir} - install -cp tracepath %{BUILDROOT}%{bindir} - install -cp tracepath6 %{BUILDROOT}%{bindir} - - install -cp doc/clockdiff.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/arping.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/ping.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/rdisc.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/tracepath.8 %{BUILDROOT}%{mandir}/man8/ - - ln -svf ../bin/ping6 %{BUILDROOT}%{sbindir} - ln -svf ../bin/tracepath %{BUILDROOT}%{sbindir} - ln -svf ../bin/tracepath6 %{BUILDROOT}%{sbindir} - - ln -s ping.8 %{BUILDROOT}%{mandir}/man8/ping6.8 - ln -s tracepath.8 %{BUILDROOT}%{mandir}/man8/tracepath6.8 - - setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping - setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping6 + #setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping + #setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping6 end end
diff --git a/iputils/patches/iputils-ipfire.patch b/iputils/patches/iputils-ipfire.patch deleted file mode 100644 index 7c0b0d123..000000000 --- a/iputils/patches/iputils-ipfire.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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/patches/iputils-tracepath-doc.patch b/iputils/patches/iputils-tracepath-doc.patch deleted file mode 100644 index abfbabd39..000000000 --- a/iputils/patches/iputils-tracepath-doc.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 51aad205e5e8289b52241cd41b15e0f116c4442a -Author: Jan Synacek jsynacek@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.
-
Peter Müller