mirror of
https://github.com/flatcar/scripts.git
synced 2026-02-13 19:51:03 +01:00
net-misc/iputils: Sync with Gentoo
It's from Gentoo commit d1e0a4ffab535715f6b87f65813a619f37264647. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
parent
bf3859f4d1
commit
4a9dbcac98
@ -3,4 +3,5 @@ DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be5
|
||||
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-20250605.tar.xz.asc 833 BLAKE2B 8a430477c320a617248a73f46ece8db3418f724095b9a76b3d5347a14438b4f691fc656680fc3e9dbcaa0ab11e66ca31030fd19d20158474a0ed5222c3bf657b SHA512 d130018ffb881a28a1d058d478736e241f9a2ac2419be29f7f8f35622a0530b747d5d895e10e61d23eb5d62b3687f72ba13187f0bf42687c3ed0970631063a4e
|
||||
DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee
|
||||
|
||||
@ -1,12 +1,21 @@
|
||||
https://github.com/iputils/iputils/pull/601
|
||||
https://github.com/iputils/iputils/commit/35ed506fe4bfc393284138915017d4b7da1a6f3e
|
||||
From: Brahmajit Das <listout@listout.xyz>
|
||||
Date: Sun, 22 Jun 2025 07:30:38 +0530
|
||||
Subject: [PATCH] meson.build: strict check for error function
|
||||
Subject: [PATCH] meson.build: Enhance 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.
|
||||
Along with checking for presence of <error.h> some toolchains also
|
||||
require to check for error() function to avoid linking error, e.g.
|
||||
powerpc64-unknown-linux-musl-gcc from Gentoo:
|
||||
|
||||
Dowstream-bug: https://bugs.gentoo.org/947680
|
||||
[17/18] powerpc64-unknown-linux-musl-gcc -o ping/ping ping/ping.p/ping.c.o ping/ping.p/ping_common.c.o ping/ping.p/ping6_common.c.o ping/ping.p/node_info.c.o -Wl,--as-needed -Wl,--no-undefined -Os -pipe -mcpu=970 -mtune=970 -maltivec -mabi=altivec -Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,--start-group libcommon.a -lm -lresolv -Wl,--end-group
|
||||
FAILED: ping/ping
|
||||
powerpc64-unknown-linux-musl-gcc -o ping/ping ping/ping.p/ping.c.o ping/ping.p/ping_common.c.o ping/ping.p/ping6_common.c.o ping/ping.p/node_info.c.o -Wl,--as-needed -Wl,--no-undefined -Os -pipe -mcpu=970 -mtune=970 -maltivec -mabi=altivec -Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs -Wl,--start-group libcommon.a -lm -lresolv -Wl,--end-group
|
||||
/usr/lib/gcc/powerpc64-unknown-linux-musl/14/../../../../powerpc64-unknown-linux-musl/bin/ld: ping/ping.p/ping.c.o: in function `ping_strtod':
|
||||
ping.c:(.text+0x1c8): undefined reference to `error'
|
||||
|
||||
Closes: https://github.com/iputils/iputils/pull/601
|
||||
Dowstream-bug: https://bugs.gentoo.org/951050
|
||||
Reviewed-by: Petr Vorel <pvorel@suse.cz>
|
||||
Signed-off-by: Brahmajit Das <listout@listout.xyz>
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@ -19,6 +28,3 @@ Signed-off-by: Brahmajit Das <listout@listout.xyz>
|
||||
conf.set('HAVE_' + h.to_upper().underscorify(), 1,
|
||||
description : 'Define if ' + h + ' can be included.')
|
||||
endif
|
||||
--
|
||||
2.50.0
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
|
||||
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 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
|
||||
@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
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 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
|
||||
@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
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"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
|
||||
@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
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"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
|
||||
@ -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"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
|
||||
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"
|
||||
@ -39,7 +48,7 @@ DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
BDEPEND+="
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
|
||||
@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
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"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||
|
||||
@ -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"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
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"
|
||||
@ -39,7 +48,7 @@ DEPEND="
|
||||
${RDEPEND}
|
||||
virtual/os-headers
|
||||
"
|
||||
BDEPEND="
|
||||
BDEPEND+="
|
||||
virtual/pkgconfig
|
||||
test? ( sys-apps/iproute2 )
|
||||
nls? ( sys-devel/gettext )
|
||||
@ -55,10 +64,6 @@ if [[ ${PV} == 9999 ]] ; then
|
||||
"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/meson-build-strict-check-for-error-function.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user