From 97358a9bd51f685d73b5c5df690864103e799391 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Jul 2024 07:19:38 +0000 Subject: [PATCH] sys-libs/libcap-ng: Sync with Gentoo It's from Gentoo commit a8073b700740a789081d5a09e88cfadb0d01a53e. --- .../sys-libs/libcap-ng/Manifest | 3 +- .../files/libcap-ng-0.8.5-python.patch | 23 ++++ .../sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild | 109 ------------------ ...ng-0.8.4.ebuild => libcap-ng-0.8.5.ebuild} | 11 +- 4 files changed, 30 insertions(+), 116 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild rename sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/{libcap-ng-0.8.4.ebuild => libcap-ng-0.8.5.ebuild} (94%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest index 0ffa199c45..43578be711 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/Manifest @@ -1,3 +1,2 @@ -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 +DIST libcap-ng-0.8.5.tar.gz 460149 BLAKE2B ce0fc4ebceaa66d6f888f8b752e501bed7513d45231425054340016a6215ce52f0cd81b3a4a54c7c9ec0b623965002d66316c6c37844f0bd132b186ff7c6a41f SHA512 89fb86454847f354c012411ecdc7e17f07bb40d7e9719ca0b93ea81c436113685bbbb5c1b9cb1b7ac92d216c105c687285304135beb156aedd55ab1c61e4f269 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch new file mode 100644 index 0000000000..ddad5ff49d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch @@ -0,0 +1,23 @@ +https://github.com/stevegrubb/libcap-ng/commit/1fe7c1cfeea00ba4eb903fbb39b74361594d4835 + +From 1fe7c1cfeea00ba4eb903fbb39b74361594d4835 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Wed, 10 Apr 2024 21:30:51 +0200 +Subject: [PATCH] Fix python path when invoking py-compile (#54) + +48eebb2 replaced custom PYTHON3 variable with PYTHON by using standard +AM_PATH_PYTHON macro. Makefile however still referred to old one. +There's no need to set PYTHON explicitly anymore so drop it. + +Fixes #53 +--- a/bindings/python3/Makefile.am ++++ b/bindings/python3/Makefile.am +@@ -27,7 +27,6 @@ AM_CPPFLAGS = -I. -I$(top_builddir) $(PYTHON3_INCLUDES) + LIBS = ${top_builddir}/src/libcap-ng.la + SWIG_FLAGS = -python + SWIG_INCLUDES = ${AM_CPPFLAGS} +-PYTHON = $(PYTHON3) + pyexec_PYTHON = capng.py + pyexec_LTLIBRARIES = _capng.la + pyexec_SOLIBRARIES = _capng.so + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild deleted file mode 100644 index ffb59a3726..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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 out-of-source-utils python-r1 - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" -# Patch works around / reverts a behaviour change because not all consumers were ready. -# Keep this patch for a bit longer until Fedora stop shipping it (not clear what else -# other than gnome-keyring was broken by it: bug #759550) -# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master -SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz - https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" -BDEPEND="python? ( >=dev-lang/swig-2 )" - -PATCHES=( - "${DISTDIR}"/libcap-ng-0.8.2-apply-disable.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 -} - -src_configure() { - use sparc && replace-flags -O? -O0 - - local ECONF_SOURCE="${S}" - - local myconf=( - $(use_enable static-libs static) - ) - - local pythonconf=( - --without-python - --without-python3 - ) - - # Set up python bindings build(s) - if use python ; then - setup_python_flags_configure() { - pythonconf=( - --without-python - --with-python3 - ) - - run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" - } - - python_foreach_impl setup_python_flags_configure - else - local BUILD_DIR="${WORKDIR}"/build - run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" - fi -} - -src_compile() { - if use python ; then - python_foreach_impl run_in_build_dir emake - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" - fi -} - -src_test() { - if [[ "${EUID}" -eq 0 ]] ; then - ewarn "Skipping tests due to root permissions." - return - fi - - if use python ; then - python_foreach_impl run_in_build_dir emake check - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" check - fi -} - -src_install() { - if use python ; then - python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild similarity index 94% rename from sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild index cffaa6067d..ff393d8f69 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild @@ -25,14 +25,14 @@ DEPEND=" " BDEPEND="python? ( >=dev-lang/swig-2 )" +PATCHES=( + "${FILESDIR}"/${P}-python.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 + eautoreconf } src_configure() { @@ -42,6 +42,7 @@ src_configure() { local myconf=( $(use_enable static-libs static) + --with-capability_header="${ESYSROOT}"/usr/include/linux/capability.h ) local pythonconf=(