| 1 |
commit: d7b7d0c23c6ed894ed37937833dcc50981a514af |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 5 21:55:50 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 5 22:10:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b7d0c2 |
| 7 |
|
| 8 |
sys-libs/libseccomp: add 2.5.3 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libseccomp/Manifest | 1 + |
| 13 |
.../libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch | 13 +++++++++++++ |
| 14 |
.../{libseccomp-9999.ebuild => libseccomp-2.5.3.ebuild} | 13 +++++++++++-- |
| 15 |
sys-libs/libseccomp/libseccomp-9999.ebuild | 13 +++++++++++-- |
| 16 |
4 files changed, 36 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest |
| 19 |
index 55539be93ca..e405158403d 100644 |
| 20 |
--- a/sys-libs/libseccomp/Manifest |
| 21 |
+++ b/sys-libs/libseccomp/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST libseccomp-2.5.1.tar.gz 638811 BLAKE2B 683ae7536c0cba36f4d30640b42361171fc34b7cb04985ea56e64369df29c440361a0205385b14580cc0e481e0f9ffd0b0e8ebd4ac98817ed59298db6b274c35 SHA512 2be80a6323f9282dbeae8791724e5778b32e2382b2a3d1b0f77366371ec4072ea28128204f675cce101c091c0420d12c497e1a9ccbb7dc5bcbf61bfd777160af |
| 24 |
DIST libseccomp-2.5.2.tar.gz 640305 BLAKE2B b61214cb9a9a793d1f04ae1de3f62c578cfaec54fcc355947b4c71efb75072bf60497db8c8a0fd34a46764952349027df3f025ddbd276d58be93209170950e89 SHA512 b2a95152cb274d6b35753596fd825406dae20c4a48b2f4076f835f977ecf324de38a3fe02e789dc20b49ecf6b4eb67f03e7733e92d40f5e20f25874307f1c2ac |
| 25 |
+DIST libseccomp-2.5.3.tar.gz 637572 BLAKE2B cedf04b3a926f9fe5202e6169ddac6b983e755009c14fc1d645157b9c0bcdf65d4085f8ea7abad90f3a0c13ae4d66b5d8306e725168490863aad15976de1eae7 SHA512 00170fe2360f0c0b33293dccfcc33e98fabb99619f34ecefbcc92bfdaa249ba91e7433226545b842b71542a3b224b6e980ea2ae656c4addf07e84a0def1870a0 |
| 26 |
|
| 27 |
diff --git a/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch b/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch |
| 28 |
new file mode 100644 |
| 29 |
index 00000000000..baf3ed971fc |
| 30 |
--- /dev/null |
| 31 |
+++ b/sys-libs/libseccomp/files/libseccomp-2.5.3-skip-valgrind.patch |
| 32 |
@@ -0,0 +1,13 @@ |
| 33 |
+Valgrind isn't supported on all arches (and indeed profiles for older types |
| 34 |
+of some arches) so let's just skip the automagic Valgrind dependency entirely. |
| 35 |
+--- a/tests/regression |
| 36 |
++++ b/tests/regression |
| 37 |
+@@ -876,7 +876,7 @@ function run_test() { |
| 38 |
+ run_test_bpf_sim_fuzz "$1" $2 "$3" |
| 39 |
+ elif [[ "$4" == "bpf-valgrind" ]]; then |
| 40 |
+ # only run this test if valgrind is installed |
| 41 |
+- if check_deps valgrind; then |
| 42 |
++ if false; then |
| 43 |
+ run_test_bpf_valgrind "$testnumstr" "$3" |
| 44 |
+ else |
| 45 |
+ print_result $testnumstr "SKIPPED" \ |
| 46 |
|
| 47 |
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-2.5.3.ebuild |
| 48 |
similarity index 92% |
| 49 |
copy from sys-libs/libseccomp/libseccomp-9999.ebuild |
| 50 |
copy to sys-libs/libseccomp/libseccomp-2.5.3.ebuild |
| 51 |
index eea16fa2bbf..e0277c89c97 100644 |
| 52 |
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild |
| 53 |
+++ b/sys-libs/libseccomp/libseccomp-2.5.3.ebuild |
| 54 |
@@ -22,7 +22,8 @@ fi |
| 55 |
|
| 56 |
LICENSE="LGPL-2.1" |
| 57 |
SLOT="0" |
| 58 |
-IUSE="python static-libs" |
| 59 |
+IUSE="python static-libs test" |
| 60 |
+RESTRICT="!test? ( test )" |
| 61 |
|
| 62 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 63 |
|
| 64 |
@@ -39,10 +40,14 @@ DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" |
| 65 |
src_prepare() { |
| 66 |
local PATCHES=( |
| 67 |
"${FILESDIR}/libseccomp-python-shared.patch" |
| 68 |
+ "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" |
| 69 |
) |
| 70 |
+ |
| 71 |
default |
| 72 |
+ |
| 73 |
if [[ "${PV}" == *9999 ]] ; then |
| 74 |
- sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac |
| 75 |
+ sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die |
| 76 |
+ |
| 77 |
eautoreconf |
| 78 |
fi |
| 79 |
} |
| 80 |
@@ -52,12 +57,14 @@ multilib_src_configure() { |
| 81 |
$(use_enable static-libs static) |
| 82 |
--disable-python |
| 83 |
) |
| 84 |
+ |
| 85 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 86 |
} |
| 87 |
|
| 88 |
do_python() { |
| 89 |
# setup.py reads VERSION_RELEASE from the environment |
| 90 |
local -x VERSION_RELEASE=${PRERELEASE-${PV}} |
| 91 |
+ |
| 92 |
pushd "${BUILD_DIR}/src/python" >/dev/null || die |
| 93 |
"$@" |
| 94 |
popd >/dev/null || die |
| 95 |
@@ -72,6 +79,7 @@ multilib_src_compile() { |
| 96 |
rm -r "${BUILD_DIR}/src/python" || die |
| 97 |
cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die |
| 98 |
local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" |
| 99 |
+ |
| 100 |
do_python distutils-r1_src_compile |
| 101 |
fi |
| 102 |
} |
| 103 |
@@ -86,5 +94,6 @@ multilib_src_install() { |
| 104 |
|
| 105 |
multilib_src_install_all() { |
| 106 |
find "${ED}" -type f -name "${PN}.la" -delete || die |
| 107 |
+ |
| 108 |
einstalldocs |
| 109 |
} |
| 110 |
|
| 111 |
diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild |
| 112 |
index eea16fa2bbf..e0277c89c97 100644 |
| 113 |
--- a/sys-libs/libseccomp/libseccomp-9999.ebuild |
| 114 |
+++ b/sys-libs/libseccomp/libseccomp-9999.ebuild |
| 115 |
@@ -22,7 +22,8 @@ fi |
| 116 |
|
| 117 |
LICENSE="LGPL-2.1" |
| 118 |
SLOT="0" |
| 119 |
-IUSE="python static-libs" |
| 120 |
+IUSE="python static-libs test" |
| 121 |
+RESTRICT="!test? ( test )" |
| 122 |
|
| 123 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 124 |
|
| 125 |
@@ -39,10 +40,14 @@ DEPEND="${DEPEND} >=sys-kernel/linux-headers-4.3" |
| 126 |
src_prepare() { |
| 127 |
local PATCHES=( |
| 128 |
"${FILESDIR}/libseccomp-python-shared.patch" |
| 129 |
+ "${FILESDIR}/libseccomp-2.5.3-skip-valgrind.patch" |
| 130 |
) |
| 131 |
+ |
| 132 |
default |
| 133 |
+ |
| 134 |
if [[ "${PV}" == *9999 ]] ; then |
| 135 |
- sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac |
| 136 |
+ sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die |
| 137 |
+ |
| 138 |
eautoreconf |
| 139 |
fi |
| 140 |
} |
| 141 |
@@ -52,12 +57,14 @@ multilib_src_configure() { |
| 142 |
$(use_enable static-libs static) |
| 143 |
--disable-python |
| 144 |
) |
| 145 |
+ |
| 146 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 147 |
} |
| 148 |
|
| 149 |
do_python() { |
| 150 |
# setup.py reads VERSION_RELEASE from the environment |
| 151 |
local -x VERSION_RELEASE=${PRERELEASE-${PV}} |
| 152 |
+ |
| 153 |
pushd "${BUILD_DIR}/src/python" >/dev/null || die |
| 154 |
"$@" |
| 155 |
popd >/dev/null || die |
| 156 |
@@ -72,6 +79,7 @@ multilib_src_compile() { |
| 157 |
rm -r "${BUILD_DIR}/src/python" || die |
| 158 |
cp -r "${S}/src/python" "${BUILD_DIR}/src/python" || die |
| 159 |
local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" |
| 160 |
+ |
| 161 |
do_python distutils-r1_src_compile |
| 162 |
fi |
| 163 |
} |
| 164 |
@@ -86,5 +94,6 @@ multilib_src_install() { |
| 165 |
|
| 166 |
multilib_src_install_all() { |
| 167 |
find "${ED}" -type f -name "${PN}.la" -delete || die |
| 168 |
+ |
| 169 |
einstalldocs |
| 170 |
} |
Archives