diff options
Diffstat (limited to 'sys-libs/libcap-ng')
| -rw-r--r-- | sys-libs/libcap-ng/Manifest | 7 | ||||
| -rw-r--r-- | sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch | 32 | ||||
| -rw-r--r-- | sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild | 4 | ||||
| -rw-r--r-- | sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild | 12 | ||||
| -rw-r--r-- | sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild | 2 |
5 files changed, 44 insertions, 13 deletions
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest index 50a97a0b93f0..e5032bd63f8a 100644 --- a/sys-libs/libcap-ng/Manifest +++ b/sys-libs/libcap-ng/Manifest @@ -1,8 +1,9 @@ +AUX libcap-ng-0.8.4-slibtool.patch 1294 BLAKE2B 7234f8d137570f68d3de9ab0020c3d8d7626d31d8651c4588be74d2762126ed5559004c16a5cbb256a52155c48d61c42117c1164cae9397454467a4f6e76a6a3 SHA512 157fd91974350adc89ca2a08561bb40d01d7a615e94b82e1f002f10d479138e311f6b653e7026182514f52706319269996c3c37054ccf4c73a89e2ef7870146e AUX libcap-ng-0.8.4-swig.patch 873 BLAKE2B 8ec0c99cfaef7885ece5cb11a17ee09bf3903f3bf9ba99f507c2f93f39fd27d5bd497fe967acc735c012ad2a086913257cb0001971e9c86731c44184fa64ec01 SHA512 d68fe855d2c50ed8a46376c5b388b543658e2726e54c190098849b74f6993f1cf9f5d08505ece7ce44220547d6c42ee963cb67cf35be4998b2262069ce4fabd3 DIST libcap-ng-0.8.2-apply-disable.patch 723 BLAKE2B 70d9959c55119c02bbc4ea605251491c04c477511c20b9fe93e6527ffd3fe2f35a72fabab5ca149c4aaf536c6cd8dceb15375297158f8827a0c676744381bbc1 SHA512 8c9317bdd4fde7d6a4618ec613bce46bed7646891bd16bc3fa307e9a814e38601bf3c6ad13102389d4596d9ed6a7ad853cca58624e724fe07383007e386c51f8 DIST libcap-ng-0.8.3.tar.gz 455383 BLAKE2B c54dd753e0ef6dd21bcf6af7b003f85ded9faf2fbf1ea834cda6b181b165ff4b11a0284c23c73d0e6f97a810b3e6a63fceeb57ff583a2b32f23924bdee597ef5 SHA512 0ef9bc7bc6b7b59991f43b79aa6cde3e8d2c22c4b9ced2af8deae501e01d51e893033d109cb8aa0fdcba190140110993089245346334d7b114d18f1bb1b55b97 DIST libcap-ng-0.8.4.tar.gz 453749 BLAKE2B 523480281cfa544e77e30932968b4b18424286dbced06bb4645d536cf19d4cc0f7c73de82006ffc329aa7ef208e0cf8e3379f1b20e1e8e4e90e422ed736f6c44 SHA512 f4f3499d592e8583c2bdb8d700981a7930bd545f0889bc02f49acecf17e3bc600b100cd4f64e9326e5bac0a07a02a1ac4b7e83e919563066665a3d67cbe6871e -EBUILD libcap-ng-0.8.3.ebuild 2785 BLAKE2B b4c7234874675e79880b5fd361852ec6045d1f0a04973143e929ba91a31894829d3a0475e8370d230778bc60d508c52c062d715721cdbd559c75be48ad18daf9 SHA512 4d704cf25334b38d1b90d26d96acb95c6f340857b16c8c3b4521a15f0d36973b4f9b7cc4714e0e9cdc089026ab146cacead4be63389c4ed361ef6e40be26b897 -EBUILD libcap-ng-0.8.4-r1.ebuild 2281 BLAKE2B e116ea77dede7b8bb7aba4b46e63e238a887ea2817d090d309343d060303c9af2e1c43c6b185cafeffe9ee6313a549e7c509daa42399aca6e34e73ac4bfc26bf SHA512 feb1195d322b6a925df53a0fabc97c46480497f506739534b96cc08c578644e360ad41a529d08958e9bfc33c990cc006d88b65d59e4084a1104ce195685cd76f -EBUILD libcap-ng-0.8.4.ebuild 2216 BLAKE2B e8a9708b635e04fa18a575dc844f324c6468d6370665c50aed0eb9383fbc0696eeeec83b3b9d15eccac560a429f2f90a695bb74412366c3ec4839eefd7944730 SHA512 80cff45951993a8f054c244d46d0bc149cdf5d5e832d12c504c2d63dbe30213a77a18084a52063a6b03568cf2e68b926a8b419476c32fd4e5a64e70c432b84bd +EBUILD libcap-ng-0.8.3.ebuild 2805 BLAKE2B e24c4fa5f972c5b42d24e9a0a644beef2d00e2d17615feafbf111268b6289fd5df5089b93fe58d74bbfa4692ba48e55eed162a5cd30d19dacf17dfaab2fe07ff SHA512 c18382cab33d64744a15bad7499288fc1227fd815ffbabd461fe5dfeec7ef01130a8494383ef34e075ffa35ba9eefc02c229999d824585605d4594d1ad8850cc +EBUILD libcap-ng-0.8.4-r1.ebuild 2302 BLAKE2B d7ad850929c5155d09d24c6cc4c7cea68eda3a1c13d5cbed659942e25e4a764a17695e4e4a018b91105a4da1da0b242abaffcb8602b7f2449cff8a7add0f7ad1 SHA512 9351f765fbe922c962b175c0a2a5be4500b2502d700760d70d26455e83710b572ab9d2d457b4131a6dffeec253981947fdf97aa044e1683abf2022d9d894bbbb +EBUILD libcap-ng-0.8.4.ebuild 2236 BLAKE2B 56edf7cd1f7c39acfbd8bdbdae3f2c300ef04f8db86707d32357ba73dbb2153640ac5621ca0a8c010c11303041b3d9b7a4dce872b87ea0046e48b74039e7627d SHA512 81e894250bf2f0d5ebca68ce050a01f7d3171f267d086a7b29facca9cafab6ca0960c553ae8a2f3123b73cb4d76f5ac39b55cf26ed30221e2072187c0f0be810 MISC metadata.xml 743 BLAKE2B 76f6f5e1f041c4609c640c0ad15363124e7e4adcf013180aa965a2b45da54de2d9574b21c8d1c7c1504c06df1bd7c34c765a44261da99e3080f0f92d89584e33 SHA512 c674b44010c80273ca64554911408e9533a29152d8cff2dcee7a5554c8269e32214e406d04082b267f9d958a53f3bd7f653af7a004a487aa6dd2d253314c2f25 diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch b/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch new file mode 100644 index 000000000000..d69f986875e3 --- /dev/null +++ b/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch @@ -0,0 +1,32 @@ +https://github.com/stevegrubb/libcap-ng/commit/75fe3714a8da28f0e2939c4402527782014401dd +https://github.com/stevegrubb/libcap-ng/pull/52 + +From b7d21b473badb349bc0d6246b3804a8a2d329f36 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Wed, 3 Apr 2024 17:32:04 -0700 +Subject: [PATCH] utils: link using libcap-ng.la + +When linking internal dependencies that were linked using $(LIBTOOL) the +ideal method is to use the generated libtool archive (.la) file. This +fixes the build with slibtool which doesn't find -lcap-ng during the +build and explicitly requires the .la file to be used. + +Gentoo Issue: https://bugs.gentoo.org/928450 +Signed-off-by: orbea <orbea@riseup.net> +--- + utils/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/Makefile.am b/utils/Makefile.am +index f430454..97aa021 100644 +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -25,7 +25,7 @@ CONFIG_CLEAN_FILES = *.loT *.rej *.orig + AUTOMAKE_OPTIONS = no-dependencies + EXTRA_DIST = $(man_MANS) + AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/src +-LIBS = -L${top_builddir}/src -lcap-ng ++LDADD = ${top_builddir}/src/libcap-ng.la + AM_CFLAGS = -W -Wall -Wshadow ${WFLAGS} -Wundef -D_GNU_SOURCE + bin_PROGRAMS = pscap netcap filecap captest + man_MANS = pscap.8 netcap.8 filecap.8 captest.8 diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild index fdc6248bdbe1..ffb59a372613 100644 --- a/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild +++ b/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 # Keep an eye on Fedora's packaging (https://src.fedoraproject.org/rpms/libcap-ng/tree/rawhide) for patches # Same maintainer in Fedora as upstream PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic python-r1 +inherit autotools flag-o-matic out-of-source-utils python-r1 DESCRIPTION="POSIX 1003.1e capabilities" HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild index f69c5049ed83..f6c6b3dbba65 100644 --- a/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild +++ b/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Keep an eye on Fedora's packaging (https://src.fedoraproject.org/rpms/libcap-ng/tree/rawhide) for patches # Same maintainer in Fedora as upstream PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools flag-o-matic libtool python-r1 +inherit autotools flag-o-matic out-of-source-utils python-r1 DESCRIPTION="POSIX 1003.1e capabilities" HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" @@ -27,17 +27,14 @@ BDEPEND="python? ( >=dev-lang/swig-2 )" PATCHES=( "${FILESDIR}"/${P}-swig.patch + # https://bugs.gentoo.org/928450 + "${FILESDIR}"/${P}-slibtool.patch ) src_prepare() { default - if use prefix ; then - sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die - # bug #668722 - eautomake - fi - elibtoolize + eautoreconf } src_configure() { @@ -47,6 +44,7 @@ src_configure() { local myconf=( $(use_enable static-libs static) + --with-capability_header="${ESYSROOT}"/usr/include/linux/capability.h ) local pythonconf=( diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild index f0f688f287be..cffaa6067dc7 100644 --- a/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild +++ b/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Keep an eye on Fedora's packaging (https://src.fedoraproject.org/rpms/libcap-ng/tree/rawhide) for patches # Same maintainer in Fedora as upstream PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools flag-o-matic python-r1 +inherit autotools flag-o-matic out-of-source-utils python-r1 DESCRIPTION="POSIX 1003.1e capabilities" HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" |