mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-26 08:01:14 +02:00
sys-libs/libcap-ng: Sync with Gentoo
It's from Gentoo commit 952318d9086090123e22a7949456653c5bd09d42.
This commit is contained in:
parent
29fbb0234c
commit
3dab58d6fd
@ -1,2 +1 @@
|
||||
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
|
||||
|
@ -1,32 +0,0 @@
|
||||
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
|
@ -1,31 +0,0 @@
|
||||
https://bugs.gentoo.org/921305
|
||||
https://github.com/stevegrubb/libcap-ng/issues/48
|
||||
https://github.com/stevegrubb/libcap-ng/commit/30453b6553948cd05c438f9f509013e3bb84f25b
|
||||
|
||||
From 30453b6553948cd05c438f9f509013e3bb84f25b Mon Sep 17 00:00:00 2001
|
||||
From: Steve Grubb <ausearch.1@gmail.com>
|
||||
Date: Thu, 4 Jan 2024 15:06:29 -0500
|
||||
Subject: [PATCH] Remove python global exception handler since its deprecated
|
||||
|
||||
---
|
||||
bindings/src/capng_swig.i | 7 -------
|
||||
2 files changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i
|
||||
index fcdaf18..fa85e13 100644
|
||||
--- a/bindings/src/capng_swig.i
|
||||
+++ b/bindings/src/capng_swig.i
|
||||
@@ -30,13 +30,6 @@
|
||||
|
||||
%varargs(16, signed capability = 0) capng_updatev;
|
||||
|
||||
-%except(python) {
|
||||
- $action
|
||||
- if (result < 0) {
|
||||
- PyErr_SetFromErrno(PyExc_OSError);
|
||||
- return NULL;
|
||||
- }
|
||||
-}
|
||||
#endif
|
||||
|
||||
%define __signed__
|
@ -1,103 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
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 out-of-source-utils python-r1
|
||||
|
||||
DESCRIPTION="POSIX 1003.1e capabilities"
|
||||
HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
|
||||
SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~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=(
|
||||
"${FILESDIR}"/${P}-swig.patch
|
||||
# https://bugs.gentoo.org/928450
|
||||
"${FILESDIR}"/${P}-slibtool.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use sparc && replace-flags -O? -O0
|
||||
|
||||
local ECONF_SOURCE="${S}"
|
||||
|
||||
local myconf=(
|
||||
$(use_enable static-libs static)
|
||||
--with-capability_header="${ESYSROOT}"/usr/include/linux/capability.h
|
||||
)
|
||||
|
||||
local pythonconf=(
|
||||
--without-python3
|
||||
)
|
||||
|
||||
# Set up python bindings build(s)
|
||||
if use python ; then
|
||||
setup_python_flags_configure() {
|
||||
pythonconf=(
|
||||
--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
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user