diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-12-16 08:53:45 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-16 08:53:45 +0000 |
| commit | d969fd257186a9d8083279276697f827331f0e46 (patch) | |
| tree | a4fe23332c9c7bacf2bf53f2ceeeb5af501d373f /sys-libs/libseccomp | |
| parent | d17fad940dac9897b8b58d2f1d072869942696a5 (diff) | |
gentoo auto-resync : 16:12:2023 - 08:53:44
Diffstat (limited to 'sys-libs/libseccomp')
| -rw-r--r-- | sys-libs/libseccomp/Manifest | 3 | ||||
| -rw-r--r-- | sys-libs/libseccomp/files/libseccomp-2.5.5-which-hunt.patch | 69 | ||||
| -rw-r--r-- | sys-libs/libseccomp/libseccomp-2.5.5.ebuild | 1 |
3 files changed, 72 insertions, 1 deletions
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest index d127571c9abd..7a9e35d9a015 100644 --- a/sys-libs/libseccomp/Manifest +++ b/sys-libs/libseccomp/Manifest @@ -1,4 +1,5 @@ AUX libseccomp-2.5.3-skip-valgrind.patch 516 BLAKE2B d5dc87fcca8e20b7edd427c434d875c9c3c7aa130a651dbe06c2c648825312e330400f89177afcfe4985fa48e0f95de9937773deb6d3d83da9b2351e6e0488fc SHA512 96053f8ca6abc97ea7c5565c3c25563881e8c0363e9c38fa05836d59b5d9ea1a375f9e072bd5f89a67ddac159c1219be7ed829facd651b3fb8bd5071c89bddcb +AUX libseccomp-2.5.5-which-hunt.patch 1779 BLAKE2B 00ac7f24b718f450c258c0d69f600a739360ac6cce45acdca51d413e07396d16ffa50d64fda2744968171e33e3a0e2ac17fa01c6016a95fab6774a4f6c7ba7c4 SHA512 b077a3f1075664fdfec6fecc077bd53685823794f037315a559f205cb6dc78a7d5e720ea4587dfdb605bfbeae79cf964d083157fbfae2085ca1d9e2995015067 AUX libseccomp-2.6.0-python-shared.patch 778 BLAKE2B 343bcb6c8e8cfc9bab3e0439d391ddfae023587f64f23860c1594cacb60d3af58e031edd5f37ba705bf3da01799ed12ab931a4b9a98e9063922f16cab814d5e6 SHA512 029b1403a3b0af5931833837d9b640d8d9ee172972f927f756137ca51bdbfd3f9cd42657029397fdb2cb727a5065356e05ca196fcb2170484f807bb65cd5a398 AUX libseccomp-python-shared.patch 759 BLAKE2B e2c42e18ca93fe5fddbc3a5b47ac0e6a29e566292fd62b87e6b45f6cb230570a2d1907a8b192e80b32c1900d069a4f10a866fa50bd9b88f5b78abff4206bd4cb SHA512 74548c7969869ff8f937a75eac720f1c654fad87dc17aed1c041bcb765586b4ee978a3ff7c6281be03277f6c74f2ec32624f91beb55afec3066a06a9e51483e2 DIST libseccomp-2.5.4-loongarch64-20220425.patch.xz 132768 BLAKE2B f3ab165b028b5f8b4c16574936b915595807ebeb49ef7365d6051f3dfafa7da46ef2a9de458e0a268298cb340152abe1f3c0c293446462a06696bc9ce92d2f72 SHA512 94f23c7a2cc2ea8acb01fef00ef184295c276b14b2b3ba0c65687fd72081df8478f3f04c51b0b391ba44529c4f914e6edbb4132af935e3be55902f641d478780 @@ -8,6 +9,6 @@ DIST libseccomp-2.5.5-loongarch64-20231204.patch.xz 41236 BLAKE2B 7831b28c275771 DIST libseccomp-2.5.5.tar.gz 642445 BLAKE2B d770cee1f3e02fbbcd9f25655b360ab38160ad800e2829a67f2b9da62b095a90be99ac851a67344cf95bd6810a6268da4655dc1d37d996e58239c4999eb41998 SHA512 f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da EBUILD libseccomp-2.5.4-r1.ebuild 2892 BLAKE2B 9a6d7af3efc13ff8a4ef7529ce8d16f87268eb63f3b7ba4759113f3f4de51907dda2a06768a5c64ec19ef3b364aa558eb12c093d8fe0f0ebc8646efa1eb356cf SHA512 5c3bda3415903d3baedcd41319caa7daac9d5ec01a7f0044d3a3084b027be40bce7f5886f788135bb627b00fe2348ecf203e2c2b7ad4411cf71f4d4db51e3517 EBUILD libseccomp-2.5.4.ebuild 2869 BLAKE2B 2eec1616d9e6e66191a0b2e49b26908777d1df0e8647a3dd2812fcb422f53dd35e1616cc747a6d0096f03cdc72d291429f69f1c31b4ee9d5560d5b40c5a36eee SHA512 b7be9c2f80496e48498eec6a6219ba4e66087db25b0abb58dd6b99f3ebe18d1e55ca883af98f129a44fd846eb37f42f86cd17035b65e0c99b05c781789ebd798 -EBUILD libseccomp-2.5.5.ebuild 2890 BLAKE2B 59f7cea33461ca816ab5d7d503361d18ee3f43158adb75b86659ea89cb61ca5117446b21faaa0ed367536f63d1518b8cf631aee5b7f54de4d851fb337dd8d43b SHA512 07459d5e692479b2e18caabeef76be191d4dd544143da34460143e0280b064b9a4f2523231ac33e8e5abd284c52ceca03de8c5c4473fe6d86d9f4e69630ea62e +EBUILD libseccomp-2.5.5.ebuild 2939 BLAKE2B 1c5181358fa85f65059d9633821a0dbe8864d7b02b484fddd5bf0d5e3fcc8d71068d07948ef227292d473592b058409bfbe79dbbe69a9eeaf8c1364037f32c18 SHA512 01150fe32346d2fe09cdeea25ac752a11e24253ea9d94fae1f996e2cde13f3d7701017f7a27ea64518192c2fd9de8ada2feb5b4bdbd5ce4a3d097be06075dd83 EBUILD libseccomp-9999.ebuild 2395 BLAKE2B 585bfd4132bfc731a507bc867a5af585427def52f0618ea37208a53a2abe99d06f80005671c234e1a8f7dd243ab690717ddd040be1665d12db9e641ccf350705 SHA512 d9fe1e6a07790aa193eeccd3752a30a7bc70428762876e0c78f6df7aeebf7367a762f8d605bea19c4a48b3e626ff7d462d489081e8fcc835c675b01e9066d713 MISC metadata.xml 506 BLAKE2B 44dc13629234226f9314270c05d5c7c87575639fe12282e73697ead63d016ee9b52a89d673be5881bfcbf4d605024ecfcc3e19510581d334a6d5737df6a36b50 SHA512 93b0a53783499eab6b6264867a049830d765ee56d19b0c60e764f6651dff9f0d11efbec0783fdeb17c2c64d3f409bb4b1b1f74f267022775b992b61a1df03100 diff --git a/sys-libs/libseccomp/files/libseccomp-2.5.5-which-hunt.patch b/sys-libs/libseccomp/files/libseccomp-2.5.5-which-hunt.patch new file mode 100644 index 000000000000..90dc25bf4e7c --- /dev/null +++ b/sys-libs/libseccomp/files/libseccomp-2.5.5-which-hunt.patch @@ -0,0 +1,69 @@ +https://github.com/seccomp/libseccomp/pull/424 + +From 865adeed17cac7063cbbce0c5df225aa35c83621 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 16 Dec 2023 02:17:36 +0000 +Subject: [PATCH] tests: avoid use of non-portable `which` + +which is not a standard POSIX utility, and indeed, each of these test scripts +uses #!/bin/bash as its shebang, so we can use `type -P` which has the same +behaviour as `which` for free. + +(If the tests used POSIX shell, we could do `command -v`, its only caveat is +that it'll pick up functions in the user's shell, which doesn't matter 99% of +the time anyway.) + +Distributions like Debian [0] and Gentoo [1] are looking to remove `which` +from their base set of packages. + +[0] https://lwn.net/Articles/874049/ +[1] https://bugs.gentoo.org/646588 + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/tests/38-basic-pfc_coverage.sh ++++ b/tests/38-basic-pfc_coverage.sh +@@ -18,7 +18,7 @@ + # + function check_deps() { + [[ -z "$1" ]] && return +- which "$1" >& /dev/null ++ type -P "$1" >& /dev/null + return $? + } + +--- a/tests/55-basic-pfc_binary_tree.sh ++++ b/tests/55-basic-pfc_binary_tree.sh +@@ -18,7 +18,7 @@ + # + function check_deps() { + [[ -z "$1" ]] && return +- which "$1" >& /dev/null ++ type -P "$1" >& /dev/null + return $? + } + +--- a/tests/regression ++++ b/tests/regression +@@ -73,7 +73,7 @@ GLBL_SYS_API="../tools/scmp_api_level" + # + function check_deps() { + [[ -z "$1" ]] && return +- which "$1" >& /dev/null ++ type -P "$1" >& /dev/null + return $? + } + +--- a/tests/testgen ++++ b/tests/testgen +@@ -32,7 +32,7 @@ + # + function verify_deps() { + [[ -z "$1" ]] && return +- if ! which "$1" >& /dev/null; then ++ if ! type -P "$1" >& /dev/null; then + echo "error: install \"$1\" and include it in your \$PATH" + exit 1 + fi +-- +2.43.0 + diff --git a/sys-libs/libseccomp/libseccomp-2.5.5.ebuild b/sys-libs/libseccomp/libseccomp-2.5.5.ebuild index e65a98cb7fc6..51018de4ccdd 100644 --- a/sys-libs/libseccomp/libseccomp-2.5.5.ebuild +++ b/sys-libs/libseccomp/libseccomp-2.5.5.ebuild @@ -40,6 +40,7 @@ BDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/libseccomp-python-shared.patch "${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch + "${FILESDIR}"/libseccomp-2.5.5-which-hunt.patch ) src_prepare() { |