Page MenuHomeSolus
Files F11053274

D8462.id20983.diff
No OneTemporary
Actions

D8462.id20983.diff
View Options

Index: Makefile
===================================================================
--- /dev/null
+++ Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
Index: abi_used_libs
===================================================================
--- /dev/null
+++ abi_used_libs
@@ -0,0 +1,6 @@
+libc.so.6
+libcap.so.2
+libcrypto.so.1.0.0
+libidn2.so.0
+libpthread.so.0
+libresolv.so.2
Index: files/0001-Rename-ping-to-iputils-ping.patch
===================================================================
--- /dev/null
+++ files/0001-Rename-ping-to-iputils-ping.patch
@@ -0,0 +1,171 @@
+From cc322e5a3d04834d0fbfa9421e42dd1bb58d862f Mon Sep 17 00:00:00 2001
+From: Silke Hofstra <silke@slxh.eu>
+Date: Sun, 8 Mar 2020 18:26:28 +0100
+Subject: [PATCH] Rename ping to iputils-ping
+
+---
+ doc/arping.xml | 2 +-
+ doc/clockdiff.xml | 2 +-
+ doc/ninfod.xml | 2 +-
+ doc/ping.xml | 8 ++++----
+ 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(-)
+
+diff --git a/doc/arping.xml b/doc/arping.xml
+index 711718f..8c4364b 100644
+--- a/doc/arping.xml
++++ b/doc/arping.xml
+@@ -228,7 +228,7 @@ xml:id="man.arping">
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+- <refentrytitle>ping</refentrytitle>
++ <refentrytitle>iputils-ping</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+diff --git a/doc/clockdiff.xml b/doc/clockdiff.xml
+index 24d1943..07ddf3b 100644
+--- a/doc/clockdiff.xml
++++ b/doc/clockdiff.xml
+@@ -124,7 +124,7 @@ xml:id="man.clockdiff">
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+- <refentrytitle>ping</refentrytitle>
++ <refentrytitle>iputils-ping</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+diff --git a/doc/ninfod.xml b/doc/ninfod.xml
+index 081d470..93b13d7 100644
+--- a/doc/ninfod.xml
++++ b/doc/ninfod.xml
+@@ -117,7 +117,7 @@ xml:id="man.ninfod">
+ </info>
+ <para>
+ <citerefentry>
+- <refentrytitle>ping</refentrytitle>
++ <refentrytitle>iputils-ping</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>.</para>
+ </refsection>
+diff --git a/doc/ping.xml b/doc/ping.xml
+index b5cea9c..7ce62f1 100644
+--- a/doc/ping.xml
++++ b/doc/ping.xml
+@@ -1,14 +1,14 @@
+ <refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+-xml:id="man.ping">
++xml:id="man.iputils-ping">
+
+ <refentryinfo>
+- <title>ping</title>
++ <title>iputils-ping</title>
+ <productname>iputils</productname>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>
+- <application>ping</application>
++ <application>iputils-ping</application>
+ </refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class='manual'>iputils</refmiscinfo>
+@@ -22,7 +22,7 @@ xml:id="man.ping">
+
+ <refsynopsisdiv>
+ <cmdsynopsis sepchar=" ">
+- <command>ping</command>
++ <command>iputils-ping</command>
+ <arg choice="opt" rep="norepeat">
+ <option>-aAbBdDfhLnOqrRUvV46</option>
+ </arg>
+diff --git a/doc/rdisc.xml b/doc/rdisc.xml
+index ab1c673..d93b1f1 100644
+--- a/doc/rdisc.xml
++++ b/doc/rdisc.xml
+@@ -231,7 +231,7 @@ xml:id="man.rdisc">
+ <manvolnum>7</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+- <refentrytitle>ping</refentrytitle>
++ <refentrytitle>iputils-ping</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>.</para>
+ </refsection>
+diff --git a/doc/tracepath.xml b/doc/tracepath.xml
+index d1bdcd8..a227fb9 100644
+--- a/doc/tracepath.xml
++++ b/doc/tracepath.xml
+@@ -199,7 +199,7 @@ root@mops:~ # tracepath -6 3ffe:2400:0:109::2
+ <manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+- <refentrytitle>ping</refentrytitle>
++ <refentrytitle>iputils-ping</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>.</para>
+ </refsect1>
+diff --git a/doc/traceroute6.xml b/doc/traceroute6.xml
+index 5a72784..f239167 100644
+--- a/doc/traceroute6.xml
++++ b/doc/traceroute6.xml
+@@ -78,7 +78,7 @@ xml:id="man.traceroute6">
+ <manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citerefentry>
+- <refentrytitle>ping</refentrytitle>
++ <refentrytitle>iputils-ping</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>.</para>
+ </refsect1>
+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)
+
+ 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)
+ {
+ fprintf(stderr,
+ "\nUsage\n"
+- " ping [options] <destination>\n"
++ " iputils-ping [options] <destination>\n"
+ "\nOptions:\n"
+ " <destination> dns name or ip address\n"
+ " -a use audible ping\n"
+@@ -141,7 +141,7 @@ void usage(void)
+ " -6 use IPv6\n"
+ " -F <flowlabel> define flow label, default is random\n"
+ " -N <nodeinfo opt> use icmp6 node info query, try <help> as argument\n"
+- "\nFor more details see ping(8).\n"
++ "\nFor more details see iputils-ping(8).\n"
+ );
+ exit(2);
+ }
+--
+2.25.1
+
Index: files/series
===================================================================
--- /dev/null
+++ files/series
@@ -0,0 +1 @@
+0001-Rename-ping-to-iputils-ping.patch
Index: package.yml
===================================================================
--- /dev/null
+++ package.yml
@@ -0,0 +1,31 @@
+name : iputils
+version : 20190709
+release : 1
+source :
+ - https://github.com/iputils/iputils/archive/s20190709.tar.gz : a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a
+license :
+ - GPL-2.0-or-later
+ - BSD-3-Clause
+ - Rdisc
+component : network.utils
+summary : A set of small useful utilities for Linux networking.
+description: |
+ The iputils package is set of small useful utilities for Linux networking.
+builddeps :
+ - pkgconfig(libgcrypt)
+ - pkgconfig(libidn2)
+ - docbook-xml
+ - libcap2-devel
+ - libxslt
+setup : |
+ %apply_patches
+ %meson_configure \
+ -DBUILD_TRACEROUTE6=true \
+ -DBUILD_RARPD=true
+build : |
+ %ninja_build
+install : |
+ %ninja_install
+
+ # Rename ping manpage
+ mv $installdir/usr/share/man/man8/{,iputils-}ping.8
Index: pspec_x86_64.xml
===================================================================
--- /dev/null
+++ pspec_x86_64.xml
@@ -0,0 +1,57 @@
+<PISI>
+ <Source>
+ <Name>iputils</Name>
+ <Packager>
+ <Name>Silke Hofstra</Name>
+ <Email>silke@slxh.eu</Email>
+ </Packager>
+ <License>GPL-2.0-or-later</License>
+ <License>BSD-3-Clause</License>
+ <License>Rdisc</License>
+ <PartOf>network.utils</PartOf>
+ <Summary xml:lang="en">A set of small useful utilities for Linux networking.</Summary>
+ <Description xml:lang="en">The iputils package is set of small useful utilities for Linux networking.
+</Description>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+ </Source>
+ <Package>
+ <Name>iputils</Name>
+ <Summary xml:lang="en">A set of small useful utilities for Linux networking.</Summary>
+ <Description xml:lang="en">The iputils package is set of small useful utilities for Linux networking.
+</Description>
+ <PartOf>network.utils</PartOf>
+ <Files>
+ <Path fileType="executable">/usr/bin/arping</Path>
+ <Path fileType="executable">/usr/bin/clockdiff</Path>
+ <Path fileType="executable">/usr/bin/iputils-ping</Path>
+ <Path fileType="executable">/usr/bin/tftpd</Path>
+ <Path fileType="executable">/usr/bin/tracepath</Path>
+ <Path fileType="executable">/usr/bin/traceroute6</Path>
+ <Path fileType="library">/usr/lib/systemd/system/ninfod.service</Path>
+ <Path fileType="library">/usr/lib/systemd/system/rarpd@.service</Path>
+ <Path fileType="library">/usr/lib/systemd/system/rdisc.service</Path>
+ <Path fileType="executable">/usr/sbin/ninfod</Path>
+ <Path fileType="executable">/usr/sbin/rarpd</Path>
+ <Path fileType="executable">/usr/sbin/rdisc</Path>
+ <Path fileType="localedata">/usr/share/locale/ja/LC_MESSAGES/iputils.mo</Path>
+ <Path fileType="man">/usr/share/man/man8/arping.8</Path>
+ <Path fileType="man">/usr/share/man/man8/clockdiff.8</Path>
+ <Path fileType="man">/usr/share/man/man8/iputils-ping.8</Path>
+ <Path fileType="man">/usr/share/man/man8/ninfod.8</Path>
+ <Path fileType="man">/usr/share/man/man8/rarpd.8</Path>
+ <Path fileType="man">/usr/share/man/man8/rdisc.8</Path>
+ <Path fileType="man">/usr/share/man/man8/tftpd.8</Path>
+ <Path fileType="man">/usr/share/man/man8/tracepath.8</Path>
+ <Path fileType="man">/usr/share/man/man8/traceroute6.8</Path>
+ </Files>
+ </Package>
+ <History>
+ <Update release="1">
+ <Date>2020-04-26</Date>
+ <Version>20190709</Version>
+ <Comment>Packaging update</Comment>
+ <Name>Silke Hofstra</Name>
+ <Email>silke@slxh.eu</Email>
+ </Update>
+ </History>
+</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 10:56 PM (2 h, 55 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5844303
Default Alt Text
D8462.id20983.diff (10 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.