| 1 |
commit: 6792521f0d0d8c2c8e2c25e633f917c4052a457e |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 2 17:08:20 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 2 17:14:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6792521f |
| 7 |
|
| 8 |
sys-libs/libcap: Bump to version 2.42 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/libcap/Manifest | 1 + |
| 14 |
.../files/libcap-2.42-build-system-fixes.patch | 200 +++++++++++++++++++++ |
| 15 |
sys-libs/libcap/libcap-2.42.ebuild | 87 +++++++++ |
| 16 |
3 files changed, 288 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest |
| 19 |
index fbfeb0b4a0a..01adfee40c7 100644 |
| 20 |
--- a/sys-libs/libcap/Manifest |
| 21 |
+++ b/sys-libs/libcap/Manifest |
| 22 |
@@ -2,3 +2,4 @@ DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219b |
| 23 |
DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6 |
| 24 |
DIST libcap-2.40.tar.xz 137832 BLAKE2B 968b8563400e6d19f72660d51057ee893d35ddd029fb095364417cf4811516424aa49bb03de803642cb68cdbaa34e055f7fb0319e789f444b6ac6f2c372d06dd SHA512 117e8dbb81cbe8974f7d3f36e89e9bec69ce81c2662f7b8edfb1753a109de028427c07d0fd77e03f2004dfff88054daf284d50dd8226c7b5f087f6dd264dd3f2 |
| 25 |
DIST libcap-2.41.tar.xz 139812 BLAKE2B 96630d2ff45e3cc40f18d0a739796bbed4c5b246a48db64b81870c6f200c6cedfed74ed0267261c3de712e9d14799015ccd1a2391e9a2a9c6d5c250864bf841f SHA512 efb778f1fee3da9ccbcc5c05d0e33dfced55a7fdfe17e1f40f121b6ec08b891c0cd95e91e5b6dce84a9cdb62d40f20efe2b26454013e1e898c25c3f9550af0f9 |
| 26 |
+DIST libcap-2.42.tar.xz 141288 BLAKE2B 1ee5c3934ba88a8127a6d96780a539d8b291e99d2e621660338fb9a9d511470bedfc3406af0bc787fda0ee0c54ce491d65a11a3e92a8da9f5d494c0931de77db SHA512 2abe2d106583a48e3ee0dbc0f82e5ec92a3209cad2abcc1690a12f33364a1dab467b624670a1cdcac0c8d12761e86d5a05bca90aa4199fee75d46e181a695d50 |
| 27 |
|
| 28 |
diff --git a/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000000..10959cf9339 |
| 31 |
--- /dev/null |
| 32 |
+++ b/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch |
| 33 |
@@ -0,0 +1,200 @@ |
| 34 |
+From 8599fc87e91b7903cfb1877983615dadcbcc1b29 Mon Sep 17 00:00:00 2001 |
| 35 |
+From: Mike Frysinger <vapier@g.o> |
| 36 |
+Date: Tue, 5 May 2020 09:52:40 +0200 |
| 37 |
+Subject: [PATCH] build system fixes |
| 38 |
+ |
| 39 |
+This touches up the homebrewed build system to work much better "out of the |
| 40 |
+box" for people. Specifically: |
| 41 |
+ - allow toolchain vars to be set via environment |
| 42 |
+ - CC / BUILD_CC / AR / RANLIB |
| 43 |
+ - CFLAGS / CPPFLAGS / LDFLAGS |
| 44 |
+ - split CPPFLAGS out of CFLAGS |
| 45 |
+ - break -fPIC out of global CFLAGS and only use where needed |
| 46 |
+ - use LDLIBS for libraries, not LDFLAGS |
| 47 |
+ |
| 48 |
+Signed-off-by: Mike Frysinger <vapier@g.o> |
| 49 |
+ |
| 50 |
+Forward ported from libcap-2.24 to libcap-2.25 |
| 51 |
+Forward ported from libcap-2.25 to libcap-2.28 |
| 52 |
+Forward ported from libcap-2.28 to libcap-2.29 |
| 53 |
+Forward ported from libcap-2.29 to libcap-2.33 |
| 54 |
+Forward ported from libcap-2.33 to libcap-2.34 |
| 55 |
+Forward ported from libcap-2.34 to libcap-2.37 |
| 56 |
+Forward ported from libcap-2.37 to libcap-2.39 |
| 57 |
+Forward ported from libcap-2.39 to libcap-2.42 |
| 58 |
+ |
| 59 |
+Signed-off-by: Lars Wendler <polynomial-c@g.o> |
| 60 |
+--- |
| 61 |
+ Make.Rules | 12 +++++++----- |
| 62 |
+ Makefile | 1 - |
| 63 |
+ libcap/Makefile | 7 ++++--- |
| 64 |
+ pam_cap/Makefile | 8 +++++--- |
| 65 |
+ progs/Makefile | 2 +- |
| 66 |
+ tests/Makefile | 6 ++++-- |
| 67 |
+ 6 files changed, 21 insertions(+), 15 deletions(-) |
| 68 |
+ |
| 69 |
+diff --git a/Make.Rules b/Make.Rules |
| 70 |
+index 8440e18..67fd4a6 100644 |
| 71 |
+--- a/Make.Rules |
| 72 |
++++ b/Make.Rules |
| 73 |
+@@ -52,13 +52,12 @@ GOMAJOR=0 |
| 74 |
+ # Compilation specifics |
| 75 |
+ |
| 76 |
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi |
| 77 |
+-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include |
| 78 |
+ |
| 79 |
+ CC ?= $(CROSS_COMPILE)gcc |
| 80 |
+ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 81 |
+ CFLAGS ?= -O2 $(DEFINES) |
| 82 |
+ BUILD_CC ?= $(CC) |
| 83 |
+-BUILD_CFLAGS ?= -O2 $(DEFINES) $(IPATH) |
| 84 |
++BUILD_CFLAGS ?= $(CFLAGS) |
| 85 |
+ AR ?= $(CROSS_COMPILE)ar |
| 86 |
+ RANLIB ?= $(CROSS_COMPILE)ranlib |
| 87 |
+ DEBUG = -g #-DDEBUG |
| 88 |
+@@ -73,16 +72,19 @@ LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread |
| 89 |
+ |
| 90 |
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) |
| 91 |
+ |
| 92 |
+-SYSTEM_HEADERS = /usr/include |
| 93 |
++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES) |
| 94 |
++CPPFLAGS += $(LIBCAP_CPPFLAGS) |
| 95 |
++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS) |
| 96 |
+ INCS=$(topdir)/libcap/include/sys/capability.h |
| 97 |
+ LDFLAGS += -L$(topdir)/libcap |
| 98 |
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) |
| 99 |
++CPPFLAGS += -Dlinux |
| 100 |
++CFLAGS += $(WARNINGS) $(DEBUG) |
| 101 |
+ PAM_CAP ?= $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) |
| 102 |
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) |
| 103 |
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) |
| 104 |
+ |
| 105 |
+ GO := go |
| 106 |
+-GOLANG := $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi) |
| 107 |
++GOLANG ?= $(shell if [ -n "$(shell $(GO) version 2>/dev/null)" ]; then echo yes ; else echo no ; fi) |
| 108 |
+ ifeq ($(GOLANG),yes) |
| 109 |
+ GOROOT := $(shell $(GO) env GOROOT) |
| 110 |
+ GOCGO := $(shell if [ "$(shell $(GO) env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi) |
| 111 |
+diff --git a/Makefile b/Makefile |
| 112 |
+index 03d7748..4437468 100644 |
| 113 |
+--- a/Makefile |
| 114 |
++++ b/Makefile |
| 115 |
+@@ -17,7 +17,6 @@ ifeq ($(GOLANG),yes) |
| 116 |
+ $(MAKE) -C go $@ |
| 117 |
+ rm -f cap/go.sum |
| 118 |
+ endif |
| 119 |
+- $(MAKE) -C tests $@ |
| 120 |
+ $(MAKE) -C progs $@ |
| 121 |
+ $(MAKE) -C doc $@ |
| 122 |
+ $(MAKE) -C kdebug $@ |
| 123 |
+diff --git a/libcap/Makefile b/libcap/Makefile |
| 124 |
+index 81b089e..63fe555 100644 |
| 125 |
+--- a/libcap/Makefile |
| 126 |
++++ b/libcap/Makefile |
| 127 |
+@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES)) |
| 128 |
+ MAJLIBNAME=$(LIBNAME).$(VERSION) |
| 129 |
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR) |
| 130 |
+ GPERF_OUTPUT = _caps_output.gperf |
| 131 |
++CFLAGS += -fPIC |
| 132 |
+ |
| 133 |
+ all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME) |
| 134 |
+ |
| 135 |
+@@ -50,7 +51,7 @@ libpsx.pc: libpsx.pc.in |
| 136 |
+ $< >$@ |
| 137 |
+ |
| 138 |
+ _makenames: _makenames.c cap_names.list.h |
| 139 |
+- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ |
| 140 |
++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ |
| 141 |
+ |
| 142 |
+ cap_names.h: _makenames |
| 143 |
+ ./_makenames > cap_names.h |
| 144 |
+@@ -82,10 +83,10 @@ $(MINLIBNAME): $(CAPOBJS) |
| 145 |
+ ln -sf $(MAJLIBNAME) $(LIBNAME) |
| 146 |
+ |
| 147 |
+ %.o: %.c $(INCLS) |
| 148 |
+- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ |
| 149 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
| 150 |
+ |
| 151 |
+ cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) |
| 152 |
+- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ |
| 153 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ |
| 154 |
+ |
| 155 |
+ cap_test: cap_test.c libcap.h |
| 156 |
+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ |
| 157 |
+diff --git a/pam_cap/Makefile b/pam_cap/Makefile |
| 158 |
+index 56604fd..2da4674 100644 |
| 159 |
+--- a/pam_cap/Makefile |
| 160 |
++++ b/pam_cap/Makefile |
| 161 |
+@@ -3,6 +3,8 @@ |
| 162 |
+ topdir=$(shell pwd)/.. |
| 163 |
+ include ../Make.Rules |
| 164 |
+ |
| 165 |
++CFLAGS += -fPIC |
| 166 |
++ |
| 167 |
+ all: pam_cap.so |
| 168 |
+ $(MAKE) testlink |
| 169 |
+ |
| 170 |
+@@ -16,16 +18,16 @@ install: all |
| 171 |
+ # written (and you know why it fails), email me and explain why. Thanks! |
| 172 |
+ |
| 173 |
+ pam_cap.so: pam_cap.o |
| 174 |
+- $(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) |
| 175 |
++ $(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS) |
| 176 |
+ |
| 177 |
+ pam_cap.o: pam_cap.c |
| 178 |
+- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@ |
| 179 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
| 180 |
+ |
| 181 |
+ test_pam_cap: test_pam_cap.c pam_cap.c |
| 182 |
+ $(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static |
| 183 |
+ |
| 184 |
+ testlink: test.c pam_cap.o |
| 185 |
+- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) |
| 186 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS) |
| 187 |
+ |
| 188 |
+ test: pam_cap.so |
| 189 |
+ make testlink |
| 190 |
+diff --git a/progs/Makefile b/progs/Makefile |
| 191 |
+index 076e44f..fd13351 100644 |
| 192 |
+--- a/progs/Makefile |
| 193 |
++++ b/progs/Makefile |
| 194 |
+@@ -23,7 +23,7 @@ $(BUILD): %: %.o $(DEPS) |
| 195 |
+ $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) |
| 196 |
+ |
| 197 |
+ %.o: %.c $(INCS) |
| 198 |
+- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@ |
| 199 |
++ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ |
| 200 |
+ |
| 201 |
+ install: all |
| 202 |
+ mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR) |
| 203 |
+diff --git a/tests/Makefile b/tests/Makefile |
| 204 |
+index bfedbc2..2b9a801 100644 |
| 205 |
+--- a/tests/Makefile |
| 206 |
++++ b/tests/Makefile |
| 207 |
+@@ -16,19 +16,21 @@ test: run_psx_test run_libcap_psx_test |
| 208 |
+ |
| 209 |
+ sudotest: test run_libcap_launch_test run_libcap_launch_test |
| 210 |
+ |
| 211 |
++CFLAGS += -fPIC |
| 212 |
++ |
| 213 |
+ install: all |
| 214 |
+ |
| 215 |
+ run_psx_test: psx_test |
| 216 |
+ ./psx_test |
| 217 |
+ |
| 218 |
+ psx_test: psx_test.c $(DEPS) |
| 219 |
+- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create |
| 220 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create |
| 221 |
+ |
| 222 |
+ run_libcap_psx_test: libcap_psx_test |
| 223 |
+ ./libcap_psx_test |
| 224 |
+ |
| 225 |
+ libcap_psx_test: libcap_psx_test.c $(DEPS) |
| 226 |
+- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static |
| 227 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static |
| 228 |
+ |
| 229 |
+ run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop |
| 230 |
+ sudo ./libcap_launch_test |
| 231 |
+-- |
| 232 |
+2.28.0 |
| 233 |
+ |
| 234 |
|
| 235 |
diff --git a/sys-libs/libcap/libcap-2.42.ebuild b/sys-libs/libcap/libcap-2.42.ebuild |
| 236 |
new file mode 100644 |
| 237 |
index 00000000000..acba4de6b6c |
| 238 |
--- /dev/null |
| 239 |
+++ b/sys-libs/libcap/libcap-2.42.ebuild |
| 240 |
@@ -0,0 +1,87 @@ |
| 241 |
+# Copyright 1999-2020 Gentoo Authors |
| 242 |
+# Distributed under the terms of the GNU General Public License v2 |
| 243 |
+ |
| 244 |
+EAPI=7 |
| 245 |
+ |
| 246 |
+inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript |
| 247 |
+ |
| 248 |
+DESCRIPTION="POSIX 1003.1e capabilities" |
| 249 |
+HOMEPAGE="https://sites.google.com/site/fullycapable/" |
| 250 |
+SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" |
| 251 |
+ |
| 252 |
+# it's available under either of the licenses |
| 253 |
+LICENSE="|| ( GPL-2 BSD )" |
| 254 |
+SLOT="0" |
| 255 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 256 |
+IUSE="pam static-libs" |
| 257 |
+ |
| 258 |
+# While the build system optionally uses gperf, we don't DEPEND on it because |
| 259 |
+# the build automatically falls back when it's unavailable. #604802 |
| 260 |
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]" |
| 261 |
+PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" |
| 262 |
+DEPEND="${RDEPEND} |
| 263 |
+ ${PDEPEND} |
| 264 |
+ sys-kernel/linux-headers" |
| 265 |
+ |
| 266 |
+# Requires test suite being run as root (via sudo) |
| 267 |
+RESTRICT="test" |
| 268 |
+ |
| 269 |
+PATCHES=( |
| 270 |
+ "${FILESDIR}"/${PN}-2.42-build-system-fixes.patch |
| 271 |
+ "${FILESDIR}"/${PN}-2.38-no_perl.patch |
| 272 |
+ "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch |
| 273 |
+ "${FILESDIR}"/${PN}-2.21-include.patch |
| 274 |
+) |
| 275 |
+ |
| 276 |
+src_prepare() { |
| 277 |
+ default |
| 278 |
+ multilib_copy_sources |
| 279 |
+} |
| 280 |
+ |
| 281 |
+run_emake() { |
| 282 |
+ local args=( |
| 283 |
+ exec_prefix="${EPREFIX}" |
| 284 |
+ lib_prefix="${EPREFIX}/usr" |
| 285 |
+ lib="$(get_libdir)" |
| 286 |
+ prefix="${EPREFIX}/usr" |
| 287 |
+ PAM_CAP="$(usex pam yes no)" |
| 288 |
+ DYNAMIC=yes |
| 289 |
+ GOLANG=no |
| 290 |
+ ) |
| 291 |
+ emake "${args[@]}" "$@" |
| 292 |
+} |
| 293 |
+ |
| 294 |
+src_configure() { |
| 295 |
+ tc-export AR CC RANLIB |
| 296 |
+ tc-export_build_env BUILD_CC |
| 297 |
+ multilib-minimal_src_configure |
| 298 |
+} |
| 299 |
+ |
| 300 |
+multilib_src_compile() { |
| 301 |
+ run_emake |
| 302 |
+} |
| 303 |
+ |
| 304 |
+multilib_src_install() { |
| 305 |
+ # no configure, needs explicit install line #444724#c3 |
| 306 |
+ run_emake DESTDIR="${D}" install |
| 307 |
+ |
| 308 |
+ gen_usr_ldscript -a cap |
| 309 |
+ if ! use static-libs ; then |
| 310 |
+ # Don't remove libpsx.a! |
| 311 |
+ # See https://bugs.gentoo.org/703912 |
| 312 |
+ rm "${ED}"/usr/$(get_libdir)/libcap.a || die |
| 313 |
+ fi |
| 314 |
+ |
| 315 |
+ if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then |
| 316 |
+ rm -r "${ED}"/usr/$(get_libdir)/security || die |
| 317 |
+ fi |
| 318 |
+ |
| 319 |
+ if use pam; then |
| 320 |
+ dopammod pam_cap/pam_cap.so |
| 321 |
+ dopamsecurity '' pam_cap/capability.conf |
| 322 |
+ fi |
| 323 |
+} |
| 324 |
+ |
| 325 |
+multilib_src_install_all() { |
| 326 |
+ dodoc CHANGELOG README doc/capability.notes |
| 327 |
+} |
Archives