mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-03 11:32:02 +02:00
net-misc/iputils: Sync with Gentoo
It's from Gentoo commit bbb5dc5b8e9e595a4559337a271840ffb1bf67ac. Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
parent
2c6a00e0e6
commit
d779c18342
@ -0,0 +1,24 @@
|
|||||||
|
https://github.com/iputils/iputils/pull/601
|
||||||
|
From: Brahmajit Das <listout@listout.xyz>
|
||||||
|
Date: Sun, 22 Jun 2025 07:30:38 +0530
|
||||||
|
Subject: [PATCH] meson.build: strict check for error function
|
||||||
|
|
||||||
|
Along with checking for presense of error.h we should also check if we
|
||||||
|
can use the error function and it's getting properly linked.
|
||||||
|
|
||||||
|
Dowstream-bug: https://bugs.gentoo.org/947680
|
||||||
|
Signed-off-by: Brahmajit Das <listout@listout.xyz>
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -143,7 +143,7 @@ endif
|
||||||
|
foreach h : [
|
||||||
|
'error.h',
|
||||||
|
]
|
||||||
|
- if cc.has_header(h)
|
||||||
|
+ if cc.has_header(h) and cc.has_function('error')
|
||||||
|
conf.set('HAVE_' + h.to_upper().underscorify(), 1,
|
||||||
|
description : 'Define if ' + h + ' can be included.')
|
||||||
|
endif
|
||||||
|
--
|
||||||
|
2.50.0
|
||||||
|
|
145
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20250605-r1.ebuild
vendored
Normal file
145
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20250605-r1.ebuild
vendored
Normal file
@ -0,0 +1,145 @@
|
|||||||
|
# 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 ~amd64-linux ~x86-linux"
|
||||||
|
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}/meson-build-strict-check-for-error-function.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-2024 Gentoo Authors
|
# Copyright 1999-2025 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=8
|
EAPI=8
|
||||||
@ -55,6 +55,10 @@ if [[ ${PV} == 9999 ]] ; then
|
|||||||
"
|
"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}/meson-build-strict-check-for-error-function.patch"
|
||||||
|
)
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
default
|
default
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user