mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 07:31:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-libs/libcap-ng: Sync with Gentoo

Browse Source 
It's from Gentoo commit dfc4d55e7af6dcd888b193fbcd6d1b31b8591840.
This commit is contained in:
Flatcar Buildbot 2024-04-08 07:18:17 +00:00 committed by Krzesimir Nowak
parent bc5beb0670
commit 1185cecf5c
4 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch vendored Normal file
View File

@ -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

4
sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild vendored
View File

@ -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/"

12
sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild vendored
View File

@ -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=(

2
sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild vendored
View File

@ -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/"