mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
net-misc/iputils: Sync with Gentoo
It's from Gentoo commit c525e93401eb002d03c3ee6111f8cde0bb67480b. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
9f81e341d1
commit
a9d2f505a8
@ -1,6 +1,2 @@
|
||||
DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9
|
||||
DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f
|
||||
DIST iputils-20240117.tar.xz 445684 BLAKE2B 635943e12010aef8c1291b407bfbe284e0179391fca76197b77037ae1ffc219fa1d8e36abcea5fb7fff10d55ab40eed7c081e5d92b29f0916a4b4dd806945491 SHA512 c45822c5641f194dc07cba919c13a4b7a79d050bb53957a894ebb6ccc1f71bac1f26489e13d18ef1ce235982f5fa1824e677f95037a0f5cce6bcb94be4c2e2de
|
||||
DIST iputils-20240905.tar.xz 459008 BLAKE2B 62ee614292fbf487d93d711ecbc11719d10f4dcb995bfd0d613459b49792ae4c8f0032a401fbf583206665ac4c592e90c30da5c75811340cc881c06a20a05318 SHA512 6731e4fb8b8f89469de746c911fca6f1c7e924a21ca14ec25c40707707be3fe5a696272ba2d293207bc8c20f72a070d8e0a640fab9e5ea240a29a1f027807c1b
|
||||
DIST iputils-20250605.tar.xz 471904 BLAKE2B 16a87130f215d9e1bf27a8559a70ed24065d411d18eef0bbfaf36118ac8b097abd8b965b4842efa00d2cab6a03e93c9f49eec020f308f7cb6d8995651b8b5380 SHA512 1f3df2a4ea0a3f95bb9657d9ee36ed929fa841c9442dfd04e5d7f55ef533b0cac3182c2172b627c7ad7f366afdc1d232f2618d701bd1c601feadbfc754059cae
|
||||
DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
|
||||
DIST iputils-20250605.tar.xz.asc 833 BLAKE2B 8a430477c320a617248a73f46ece8db3418f724095b9a76b3d5347a14438b4f691fc656680fc3e9dbcaa0ab11e66ca31030fd19d20158474a0ed5222c3bf657b SHA512 d130018ffb881a28a1d058d478736e241f9a2ac2419be29f7f8f35622a0530b747d5d895e10e61d23eb5d62b3687f72ba13187f0bf42687c3ed0970631063a4e
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
https://github.com/iputils/iputils/pull/556
|
||||
|
||||
From 1e2a59a879859eb01ca8b34523f54b6acbb886cb Mon Sep 17 00:00:00 2001
|
||||
From: Eli Schwartz <eschwartz@gentoo.org>
|
||||
Date: Wed, 18 Sep 2024 00:32:53 -0400
|
||||
Subject: [PATCH] meson: fix installation of prebuilt manpages in dist tarball
|
||||
|
||||
page contains the name of the program we are building/installing a
|
||||
manual for. In the custom targets for building the manpages, we append
|
||||
.xml and .8 in turn -- we don't replace a ".xml" in the page name.
|
||||
|
||||
As there is nothing to replace, we end up checking if e.g. "./arping"
|
||||
exists, and trying to install it as a manual if so -- rather than
|
||||
arping.8 as intended. Sync the logic so that this works.
|
||||
|
||||
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
|
||||
--- a/doc/meson.build
|
||||
+++ b/doc/meson.build
|
||||
@@ -28,8 +28,8 @@ if meson.version().version_compare('>=0.58.0')
|
||||
out_html_pages = []
|
||||
generated_docs_exist = true
|
||||
foreach page : manpages
|
||||
- man_page_name = page.replace('.xml', '.8')
|
||||
- html_page_name = page.replace('.xml', '.html')
|
||||
+ man_page_name = page + '.8'
|
||||
+ html_page_name = page + '.html'
|
||||
out_man_pages += man_page_name
|
||||
out_html_pages += html_page_name
|
||||
if not fs.exists(man_page_name) or not fs.exists(html_page_name)
|
||||
|
||||
@ -1,186 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
# For released versions, we precompile the man/html pages and store
|
||||
# them in a tarball on our mirrors. This avoids ugly issues while
|
||||
# building stages, and reduces dependencies.
|
||||
# To regenerate man/html pages emerge iputils-99999999[doc] with
|
||||
# EGIT_COMMIT set to release tag, all USE flags enabled and
|
||||
# tar ${S}/doc folder.
|
||||
|
||||
EAPI="7"
|
||||
|
||||
PLOCALES="de fr ja pt_BR tr uk zh_CN"
|
||||
|
||||
inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
|
||||
|
||||
if [[ ${PV} == "99999999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
|
||||
|
||||
LICENSE="BSD GPL-2+ rdisc"
|
||||
SLOT="0"
|
||||
IUSE="+arping caps clockdiff doc idn nls rarpd rdisc static test tracepath"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
LIB_DEPEND="
|
||||
caps? ( sys-libs/libcap[static-libs(+)] )
|
||||
idn? ( net-dns/libidn2:=[static-libs(+)] )
|
||||
nls? ( virtual/libintl[static-libs(+)] )
|
||||
"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
static? ( ${LIB_DEPEND} )
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
if [[ ${PV} == 99999999 ]] ; then
|
||||
BDEPEND+="
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/docbook-xsl-ns-stylesheets
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
"
|
||||
fi
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
plocale_get_locales > po/LINGUAS || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
|
||||
local emesonargs=(
|
||||
-DUSE_CAP=$(usex caps true false)
|
||||
-DUSE_IDN=$(usex idn true false)
|
||||
-DBUILD_ARPING=$(usex arping true false)
|
||||
-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
|
||||
-DBUILD_PING=true
|
||||
-DBUILD_RARPD=$(usex rarpd true false)
|
||||
-DBUILD_RDISC=$(usex rdisc true false)
|
||||
-DENABLE_RDISC_SERVER=$(usex rdisc true false)
|
||||
-DBUILD_TRACEPATH=$(usex tracepath true false)
|
||||
-DBUILD_NINFOD=false
|
||||
-DNINFOD_MESSAGES=false
|
||||
-DNO_SETCAP_OR_SUID=true
|
||||
-Dsystemdunitdir=$(systemd_get_systemunitdir)
|
||||
-DUSE_GETTEXT=$(usex nls true false)
|
||||
$(meson_use !test SKIP_TESTS)
|
||||
)
|
||||
|
||||
if [[ ${PV} == 99999999 ]] ; then
|
||||
emesonargs+=(
|
||||
-DBUILD_HTML_MANS=$(usex doc true false)
|
||||
-DBUILD_MANS=true
|
||||
)
|
||||
else
|
||||
emesonargs+=(
|
||||
-DBUILD_HTML_MANS=false
|
||||
-DBUILD_MANS=false
|
||||
)
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ ${EUID} != 0 ]] ; then
|
||||
einfo "Tests require root privileges. Skipping ..."
|
||||
return
|
||||
fi
|
||||
|
||||
meson_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
dodir /bin
|
||||
local my_bin
|
||||
for my_bin in $(usex arping arping '') ping ; do
|
||||
mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
|
||||
done
|
||||
dosym ping /bin/ping4
|
||||
dosym ping /bin/ping6
|
||||
|
||||
if use tracepath ; then
|
||||
dosym tracepath /usr/bin/tracepath4
|
||||
dosym tracepath /usr/bin/tracepath6
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath6.8
|
||||
fi
|
||||
|
||||
if [[ ${PV} != 99999999 ]] ; then
|
||||
local -a man_pages
|
||||
local -a html_man_pages
|
||||
|
||||
while IFS= read -r -u 3 -d $'\0' my_bin
|
||||
do
|
||||
my_bin=$(basename "${my_bin}")
|
||||
[[ -z "${my_bin}" ]] && continue
|
||||
|
||||
if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
|
||||
man_pages+=( ${my_bin}.8 )
|
||||
fi
|
||||
|
||||
if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
|
||||
html_man_pages+=( ${my_bin}.html )
|
||||
fi
|
||||
done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
|
||||
|
||||
pushd doc &>/dev/null || die
|
||||
doman "${man_pages[@]}"
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc "${html_man_pages[@]}"
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
else
|
||||
if use doc ; then
|
||||
mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
|
||||
if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
|
||||
HAD_TFTPD_VERSION=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
|
||||
ewarn "This upstream version (>= 20211215) drops two tools:"
|
||||
ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
|
||||
ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
|
||||
ewarn "Please install one of the listed alternatives if needed!"
|
||||
fi
|
||||
|
||||
fcaps cap_net_raw \
|
||||
bin/ping \
|
||||
$(usex arping 'bin/arping' '') \
|
||||
$(usex clockdiff 'usr/bin/clockdiff' '')
|
||||
}
|
||||
@ -1,131 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PLOCALES="de fr ja pt_BR tr uk zh_CN"
|
||||
|
||||
inherit fcaps meson plocale systemd toolchain-funcs
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
|
||||
|
||||
# We install ping unconditionally so BSD is listed by itself
|
||||
# See LICENSE on each release, it summaries per-component
|
||||
LICENSE="
|
||||
BSD
|
||||
arping? ( GPL-2+ )
|
||||
clockdiff? ( BSD )
|
||||
tracepath? ( GPL-2+ )
|
||||
"
|
||||
SLOT="0"
|
||||
IUSE="+arping caps clockdiff doc idn nls test tracepath"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
caps? ( sys-libs/libcap )
|
||||
idn? ( net-dns/libidn2:= )
|
||||
nls? ( virtual/libintl )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/docbook-xsl-ns-stylesheets
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
plocale_get_locales > po/LINGUAS || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-DUSE_CAP=$(usex caps true false)
|
||||
-DUSE_IDN=$(usex idn true false)
|
||||
-DBUILD_ARPING=$(usex arping true false)
|
||||
-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
|
||||
-DBUILD_PING=true
|
||||
-DBUILD_TRACEPATH=$(usex tracepath true false)
|
||||
-DNO_SETCAP_OR_SUID=true
|
||||
-Dsystemdunitdir=$(systemd_get_systemunitdir)
|
||||
-DUSE_GETTEXT=$(usex nls true false)
|
||||
$(meson_use !test SKIP_TESTS)
|
||||
-DBUILD_HTML_MANS=$(usex doc true false)
|
||||
-DBUILD_MANS=true
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ ${EUID} != 0 ]] ; then
|
||||
einfo "Tests require root privileges. Skipping ..."
|
||||
return
|
||||
fi
|
||||
|
||||
meson_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
FILECAPS=( cap_net_raw usr/bin/ping )
|
||||
use arping && FILECAPS+=( usr/bin/arping )
|
||||
use clockdiff && FILECAPS+=( usr/bin/clockdiff )
|
||||
|
||||
dosym ping /usr/bin/ping4
|
||||
dosym ping /usr/bin/ping6
|
||||
|
||||
if use tracepath ; then
|
||||
dosym tracepath /usr/bin/tracepath4
|
||||
dosym tracepath /usr/bin/tracepath6
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath4.8
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath6.8
|
||||
fi
|
||||
|
||||
if use doc ; then
|
||||
mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
|
||||
if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
|
||||
HAD_TFTPD_VERSION=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fcaps_pkg_postinst
|
||||
|
||||
if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
|
||||
ewarn "This upstream version (>= 20211215) drops two tools:"
|
||||
ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
|
||||
ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
|
||||
ewarn "Please install one of the listed alternatives if needed!"
|
||||
fi
|
||||
}
|
||||
@ -1,131 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PLOCALES="de fr ja pt_BR tr uk zh_CN"
|
||||
|
||||
inherit fcaps meson plocale systemd toolchain-funcs
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
|
||||
|
||||
# We install ping unconditionally so BSD is listed by itself
|
||||
# See LICENSE on each release, it summaries per-component
|
||||
LICENSE="
|
||||
BSD
|
||||
arping? ( GPL-2+ )
|
||||
clockdiff? ( BSD )
|
||||
tracepath? ( GPL-2+ )
|
||||
"
|
||||
SLOT="0"
|
||||
IUSE="+arping caps clockdiff doc idn nls test tracepath"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
caps? ( sys-libs/libcap )
|
||||
idn? ( net-dns/libidn2:= )
|
||||
nls? ( virtual/libintl )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/docbook-xsl-ns-stylesheets
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
plocale_get_locales > po/LINGUAS || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-DUSE_CAP=$(usex caps true false)
|
||||
-DUSE_IDN=$(usex idn true false)
|
||||
-DBUILD_ARPING=$(usex arping true false)
|
||||
-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
|
||||
-DBUILD_PING=true
|
||||
-DBUILD_TRACEPATH=$(usex tracepath true false)
|
||||
-DNO_SETCAP_OR_SUID=true
|
||||
-Dsystemdunitdir=$(systemd_get_systemunitdir)
|
||||
-DUSE_GETTEXT=$(usex nls true false)
|
||||
$(meson_use !test SKIP_TESTS)
|
||||
-DBUILD_HTML_MANS=$(usex doc true false)
|
||||
-DBUILD_MANS=true
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ ${EUID} != 0 ]] ; then
|
||||
einfo "Tests require root privileges. Skipping ..."
|
||||
return
|
||||
fi
|
||||
|
||||
meson_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
FILECAPS=( cap_net_raw usr/bin/ping )
|
||||
use arping && FILECAPS+=( usr/bin/arping )
|
||||
use clockdiff && FILECAPS+=( usr/bin/clockdiff )
|
||||
|
||||
dosym ping /usr/bin/ping4
|
||||
dosym ping /usr/bin/ping6
|
||||
|
||||
if use tracepath ; then
|
||||
dosym tracepath /usr/bin/tracepath4
|
||||
dosym tracepath /usr/bin/tracepath6
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath4.8
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath6.8
|
||||
fi
|
||||
|
||||
if use doc ; then
|
||||
mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
|
||||
if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
|
||||
HAD_TFTPD_VERSION=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fcaps_pkg_postinst
|
||||
|
||||
if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
|
||||
ewarn "This upstream version (>= 20211215) drops two tools:"
|
||||
ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
|
||||
ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
|
||||
ewarn "Please install one of the listed alternatives if needed!"
|
||||
fi
|
||||
}
|
||||
@ -1,145 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PLOCALES="de fr ja pt_BR tr uk zh_CN"
|
||||
|
||||
inherit fcaps meson plocale systemd toolchain-funcs
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
|
||||
|
||||
# We install ping unconditionally so BSD is listed by itself
|
||||
# See LICENSE on each release, it summaries per-component
|
||||
LICENSE="
|
||||
BSD
|
||||
arping? ( GPL-2+ )
|
||||
clockdiff? ( BSD )
|
||||
tracepath? ( GPL-2+ )
|
||||
"
|
||||
SLOT="0"
|
||||
IUSE="+arping caps clockdiff doc idn nls test tracepath"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
caps? ( sys-libs/libcap )
|
||||
idn? ( net-dns/libidn2:= )
|
||||
nls? ( virtual/libintl )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
BDEPEND+="
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/docbook-xsl-ns-stylesheets
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-20240905-man-pages.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
plocale_get_locales > po/LINGUAS || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-DUSE_CAP=$(usex caps true false)
|
||||
-DUSE_IDN=$(usex idn true false)
|
||||
-DBUILD_ARPING=$(usex arping true false)
|
||||
-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
|
||||
-DBUILD_PING=true
|
||||
-DBUILD_TRACEPATH=$(usex tracepath true false)
|
||||
-DNO_SETCAP_OR_SUID=true
|
||||
-Dsystemdunitdir=$(systemd_get_systemunitdir)
|
||||
-DUSE_GETTEXT=$(usex nls true false)
|
||||
$(meson_use !test SKIP_TESTS)
|
||||
)
|
||||
|
||||
if use doc || [[ ${PV} == 9999 ]] ; then
|
||||
emesonargs+=(
|
||||
-DBUILD_HTML_MANS=true
|
||||
-DBUILD_MANS=true
|
||||
)
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ ${EUID} != 0 ]] ; then
|
||||
einfo "Tests require root privileges. Skipping ..."
|
||||
return
|
||||
fi
|
||||
|
||||
meson_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
FILECAPS=( cap_net_raw usr/bin/ping )
|
||||
use arping && FILECAPS+=( usr/bin/arping )
|
||||
use clockdiff && FILECAPS+=( usr/bin/clockdiff )
|
||||
|
||||
dosym ping /usr/bin/ping4
|
||||
dosym ping /usr/bin/ping6
|
||||
|
||||
if use tracepath ; then
|
||||
dosym tracepath /usr/bin/tracepath4
|
||||
dosym tracepath /usr/bin/tracepath6
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath4.8
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath6.8
|
||||
fi
|
||||
|
||||
if use doc ; then
|
||||
mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
|
||||
if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
|
||||
HAD_TFTPD_VERSION=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fcaps_pkg_postinst
|
||||
|
||||
if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
|
||||
ewarn "This upstream version (>= 20211215) drops two tools:"
|
||||
ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
|
||||
ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
|
||||
ewarn "Please install one of the listed alternatives if needed!"
|
||||
fi
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -11,8 +11,17 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/pevik.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="
|
||||
https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz
|
||||
verify-sig? ( https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz.asc )
|
||||
"
|
||||
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-pevik )"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
@ -27,7 +36,8 @@ LICENSE="
|
||||
tracepath? ( GPL-2+ )
|
||||
"
|
||||
SLOT="0"
|
||||
IUSE="+arping caps clockdiff doc idn nls test tracepath"
|
||||
IUSE="+arping +caps clockdiff doc idn nls +suid test tracepath"
|
||||
REQUIRED_USE="filecaps? ( caps )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
@ -39,7 +49,7 @@ DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
BDEPEND+="
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
@ -107,9 +117,18 @@ src_test() {
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
FILECAPS=( cap_net_raw usr/bin/ping )
|
||||
use arping && FILECAPS+=( usr/bin/arping )
|
||||
use clockdiff && FILECAPS+=( usr/bin/clockdiff )
|
||||
# See build-aux/setcap-setuid.sh
|
||||
# For suidctl compat: enable suid in src_install and remove it if fcaps is successful
|
||||
use suid && fperms u+s /usr/bin/ping
|
||||
FILECAPS=( -M u-s cap_net_admin,cap_net_raw+p usr/bin/ping )
|
||||
if use arping; then
|
||||
use suid && fperms u+s /usr/bin/arping
|
||||
FILECAPS+=( -- -M u-s cap_net_raw+p usr/bin/arping )
|
||||
fi
|
||||
if use clockdiff; then
|
||||
use suid && fperms u+s /usr/bin/clockdiff
|
||||
FILECAPS+=( -- -M u-s cap_net_raw,cap_sys_nice+ep usr/bin/clockdiff )
|
||||
fi
|
||||
|
||||
dosym ping /usr/bin/ping4
|
||||
dosym ping /usr/bin/ping6
|
||||
@ -1,141 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PLOCALES="de fr ja pt_BR tr uk zh_CN"
|
||||
|
||||
inherit fcaps meson plocale systemd toolchain-funcs
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
|
||||
|
||||
# We install ping unconditionally so BSD is listed by itself
|
||||
# See LICENSE on each release, it summaries per-component
|
||||
LICENSE="
|
||||
BSD
|
||||
arping? ( GPL-2+ )
|
||||
clockdiff? ( BSD )
|
||||
tracepath? ( GPL-2+ )
|
||||
"
|
||||
SLOT="0"
|
||||
IUSE="+arping caps clockdiff doc idn nls test tracepath"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
caps? ( sys-libs/libcap )
|
||||
idn? ( net-dns/libidn2:= )
|
||||
nls? ( virtual/libintl )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
if [[ ${PV} == 9999 ]] ; then
|
||||
BDEPEND+="
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
app-text/docbook-xsl-ns-stylesheets
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
"
|
||||
fi
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
plocale_get_locales > po/LINGUAS || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-DUSE_CAP=$(usex caps true false)
|
||||
-DUSE_IDN=$(usex idn true false)
|
||||
-DBUILD_ARPING=$(usex arping true false)
|
||||
-DBUILD_CLOCKDIFF=$(usex clockdiff true false)
|
||||
-DBUILD_PING=true
|
||||
-DBUILD_TRACEPATH=$(usex tracepath true false)
|
||||
-DNO_SETCAP_OR_SUID=true
|
||||
-Dsystemdunitdir=$(systemd_get_systemunitdir)
|
||||
-DUSE_GETTEXT=$(usex nls true false)
|
||||
$(meson_use !test SKIP_TESTS)
|
||||
)
|
||||
|
||||
if use doc || [[ ${PV} == 9999 ]] ; then
|
||||
emesonargs+=(
|
||||
-DBUILD_HTML_MANS=true
|
||||
-DBUILD_MANS=true
|
||||
)
|
||||
fi
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if [[ ${EUID} != 0 ]] ; then
|
||||
einfo "Tests require root privileges. Skipping ..."
|
||||
return
|
||||
fi
|
||||
|
||||
meson_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
FILECAPS=( cap_net_raw usr/bin/ping )
|
||||
use arping && FILECAPS+=( usr/bin/arping )
|
||||
use clockdiff && FILECAPS+=( usr/bin/clockdiff )
|
||||
|
||||
dosym ping /usr/bin/ping4
|
||||
dosym ping /usr/bin/ping6
|
||||
|
||||
if use tracepath ; then
|
||||
dosym tracepath /usr/bin/tracepath4
|
||||
dosym tracepath /usr/bin/tracepath6
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath4.8
|
||||
dosym tracepath.8 /usr/share/man/man8/tracepath6.8
|
||||
fi
|
||||
|
||||
if use doc ; then
|
||||
mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local version_with_tftpd="<${CATEGORY}/${PN}-20211215"
|
||||
if has_version "${version_with_tftpd}[traceroute6]" || has_version "${version_with_tftpd}[tftpd]" ; then
|
||||
HAD_TFTPD_VERSION=1
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fcaps_pkg_postinst
|
||||
|
||||
if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
|
||||
ewarn "This upstream version (>= 20211215) drops two tools:"
|
||||
ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
|
||||
ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
|
||||
ewarn "Please install one of the listed alternatives if needed!"
|
||||
fi
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -11,8 +11,17 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/iputils/iputils.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz"
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/pevik.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="
|
||||
https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz
|
||||
verify-sig? ( https://github.com/iputils/iputils/releases/download/${PV}/${P}.tar.xz.asc )
|
||||
"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-pevik )"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
@ -27,7 +36,8 @@ LICENSE="
|
||||
tracepath? ( GPL-2+ )
|
||||
"
|
||||
SLOT="0"
|
||||
IUSE="+arping caps clockdiff doc idn nls test tracepath"
|
||||
IUSE="+arping +caps clockdiff doc idn nls +suid test tracepath"
|
||||
REQUIRED_USE="filecaps? ( caps )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
@ -39,7 +49,7 @@ DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
BDEPEND+="
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
@ -103,9 +113,18 @@ src_test() {
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
FILECAPS=( cap_net_raw usr/bin/ping )
|
||||
use arping && FILECAPS+=( usr/bin/arping )
|
||||
use clockdiff && FILECAPS+=( usr/bin/clockdiff )
|
||||
# See build-aux/setcap-setuid.sh
|
||||
# For suidctl compat: enable suid in src_install and remove it if fcaps is successful
|
||||
use suid && fperms u+s /usr/bin/ping
|
||||
FILECAPS=( -M u-s cap_net_admin,cap_net_raw+p usr/bin/ping )
|
||||
if use arping; then
|
||||
use suid && fperms u+s /usr/bin/arping
|
||||
FILECAPS+=( -- -M u-s cap_net_raw+p usr/bin/arping )
|
||||
fi
|
||||
if use clockdiff; then
|
||||
use suid && fperms u+s /usr/bin/clockdiff
|
||||
FILECAPS+=( -- -M u-s cap_net_raw,cap_sys_nice+ep usr/bin/clockdiff )
|
||||
fi
|
||||
|
||||
dosym ping /usr/bin/ping4
|
||||
dosym ping /usr/bin/ping6
|
||||
|
||||
@ -8,8 +8,6 @@
|
||||
<use>
|
||||
<flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
|
||||
<flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
|
||||
<flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
|
||||
<flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
|
||||
<flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user