diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,6 +1,5 @@ libc.so.6 libcap.so.2 -libcrypto.so.1.1 libidn2.so.0 libpthread.so.0 libresolv.so.2 diff --git a/files/0001-Rename-ping-to-iputils-ping.patch b/files/0001-Rename-ping-to-iputils-ping.patch --- a/files/0001-Rename-ping-to-iputils-ping.patch +++ b/files/0001-Rename-ping-to-iputils-ping.patch @@ -1,4 +1,4 @@ -From cc322e5a3d04834d0fbfa9421e42dd1bb58d862f Mon Sep 17 00:00:00 2001 +From 87aba6936b8b143c711b8f0e2834dfb6d308a6ad Mon Sep 17 00:00:00 2001 From: Silke Hofstra Date: Sun, 8 Mar 2020 18:26:28 +0100 Subject: [PATCH] Rename ping to iputils-ping @@ -11,9 +11,9 @@ doc/rdisc.xml | 2 +- doc/tracepath.xml | 2 +- doc/traceroute6.xml | 2 +- - meson.build | 4 ++-- - ping_common.c | 4 ++-- - 9 files changed, 14 insertions(+), 14 deletions(-) + ping/meson.build | 2 +- + ping/ping_common.c | 4 ++-- + 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/arping.xml b/doc/arping.xml index 711718f..8c4364b 100644 @@ -29,10 +29,10 @@ , diff --git a/doc/clockdiff.xml b/doc/clockdiff.xml -index 24d1943..07ddf3b 100644 +index 9643bea..59ad0e3 100644 --- a/doc/clockdiff.xml +++ b/doc/clockdiff.xml -@@ -124,7 +124,7 @@ xml:id="man.clockdiff"> +@@ -164,7 +164,7 @@ xml:id="man.clockdiff"> SEE ALSO @@ -55,7 +55,7 @@ . diff --git a/doc/ping.xml b/doc/ping.xml -index b5cea9c..7ce62f1 100644 +index e1626ef..89f83ac 100644 --- a/doc/ping.xml +++ b/doc/ping.xml @@ -1,14 +1,14 @@ @@ -86,7 +86,7 @@ diff --git a/doc/rdisc.xml b/doc/rdisc.xml -index ab1c673..d93b1f1 100644 +index 05a518c..1e1a3b4 100644 --- a/doc/rdisc.xml +++ b/doc/rdisc.xml @@ -231,7 +231,7 @@ xml:id="man.rdisc"> @@ -99,7 +99,7 @@ . diff --git a/doc/tracepath.xml b/doc/tracepath.xml -index d1bdcd8..a227fb9 100644 +index 6dbb637..96ec3a6 100644 --- a/doc/tracepath.xml +++ b/doc/tracepath.xml @@ -199,7 +199,7 @@ root@mops:~ # tracepath -6 3ffe:2400:0:109::2 @@ -124,31 +124,23 @@ 8 . -diff --git a/meson.build b/meson.build -index 50df973..880daec 100644 ---- a/meson.build -+++ b/meson.build -@@ -245,13 +245,13 @@ libcommon = static_library( - install : false) +diff --git a/ping/meson.build b/ping/meson.build +index f4cab4c..0393d4e 100644 +--- a/ping/meson.build ++++ b/ping/meson.build +@@ -1,6 +1,6 @@ + inc = include_directories('..') - if build_ping == true -- executable('ping', ['ping.c', 'ping_common.c', 'ping6_common.c', git_version_h], -+ executable('iputils-ping', ['ping.c', 'ping_common.c', 'ping6_common.c', git_version_h], - dependencies : [m_dep, cap_dep, idn_dep, intl_dep, crypto_dep, resolv_dep], - link_with : [libcommon], - install: true) - meson.add_install_script('build-aux/setcap-setuid.sh', - join_paths(get_option('prefix'), get_option('bindir')), -- 'ping', -+ 'iputils-ping', - perm_type, - setcap_path - ) -diff --git a/ping_common.c b/ping_common.c -index 9fbaf9d..bb45f4f 100644 ---- a/ping_common.c -+++ b/ping_common.c -@@ -102,7 +102,7 @@ void usage(void) +-executable('ping', [ ++executable('iputils-ping', [ + 'ping.c', + 'ping_common.c', + 'ping6_common.c', +diff --git a/ping/ping_common.c b/ping/ping_common.c +index fac5ee5..814f193 100644 +--- a/ping/ping_common.c ++++ b/ping/ping_common.c +@@ -44,7 +44,7 @@ void usage(void) { fprintf(stderr, "\nUsage\n" @@ -157,7 +149,7 @@ "\nOptions:\n" " dns name or ip address\n" " -a use audible ping\n" -@@ -141,7 +141,7 @@ void usage(void) +@@ -83,7 +83,7 @@ void usage(void) " -6 use IPv6\n" " -F define flow label, default is random\n" " -N use icmp6 node info query, try as argument\n" @@ -167,5 +159,5 @@ exit(2); } -- -2.25.1 +2.27.0 diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : iputils -version : 20190709 -release : 2 +version : '20200821' +release : 3 source : - - https://github.com/iputils/iputils/archive/s20190709.tar.gz : a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a + - https://github.com/iputils/iputils/archive/s20200821.tar.gz : f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b license : - GPL-2.0-or-later - BSD-3-Clause diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ iputils - Joshua Strobl - joshua@streambits.io + Silke Hofstra + silke@slxh.eu GPL-2.0-or-later BSD-3-Clause @@ -24,7 +24,6 @@ /usr/bin/arping /usr/bin/clockdiff /usr/bin/iputils-ping - /usr/bin/tftpd /usr/bin/tracepath /usr/bin/traceroute6 /usr/lib/systemd/system/ninfod.service @@ -33,25 +32,30 @@ /usr/sbin/ninfod /usr/sbin/rarpd /usr/sbin/rdisc + /usr/share/locale/de/LC_MESSAGES/iputils.mo + /usr/share/locale/fr/LC_MESSAGES/iputils.mo /usr/share/locale/ja/LC_MESSAGES/iputils.mo + /usr/share/locale/pt_BR/LC_MESSAGES/iputils.mo + /usr/share/locale/tr/LC_MESSAGES/iputils.mo + /usr/share/locale/uk/LC_MESSAGES/iputils.mo + /usr/share/locale/zh_CN/LC_MESSAGES/iputils.mo /usr/share/man/man8/arping.8 /usr/share/man/man8/clockdiff.8 /usr/share/man/man8/iputils-ping.8 /usr/share/man/man8/ninfod.8 /usr/share/man/man8/rarpd.8 /usr/share/man/man8/rdisc.8 - /usr/share/man/man8/tftpd.8 /usr/share/man/man8/tracepath.8 /usr/share/man/man8/traceroute6.8 - - 2020-06-15 - 20190709 + + 2020-08-22 + 20200821 Packaging update - Joshua Strobl - joshua@streambits.io + Silke Hofstra + silke@slxh.eu \ No newline at end of file