Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/, sys-libs/libcap/
Date: Sun, 06 Jun 2021 15:43:00
Message-Id: 1622994092.53df70d1da114743aa102595785c9e6d67cfb70c.soap@gentoo
1 commit: 53df70d1da114743aa102595785c9e6d67cfb70c
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 6 15:41:32 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 6 15:41:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53df70d1
7
8 sys-libs/libcap: drop 2.43, 2.48
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sys-libs/libcap/Manifest | 2 -
13 .../files/libcap-2.42-build-system-fixes.patch | 200 ---------------------
14 sys-libs/libcap/libcap-2.43.ebuild | 87 ---------
15 sys-libs/libcap/libcap-2.48.ebuild | 89 ---------
16 4 files changed, 378 deletions(-)
17
18 diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
19 index 671d87f49eb..bcb7ccd2a72 100644
20 --- a/sys-libs/libcap/Manifest
21 +++ b/sys-libs/libcap/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST libcap-2.43.tar.xz 125284 BLAKE2B bde36f8397f4adb74760eb403daa06bee1b8f45ddc253cc3c3ef1f6e95d0e4c76d0f2e6fa3335a8bc451f18ac7128c96230f6aba9ae0320fa4f9d669e7b4f715 SHA512 817add571fb2c54ad2a39974e6545b8fc8d855ecdcf2e00b2cc10e583802c49dfea2d8bca484c89ecd574fdacfc46565b51e3064a4407cf1985defb913240d45
24 -DIST libcap-2.48.tar.xz 132280 BLAKE2B 43ab75b73a5297ec24467fae82378f8c7aba5356afcebfb32a695d664a4b5268526fd90a009596c0f516a626d8f4523a9b49ec3225b6a886da32e62eb5b55ea5 SHA512 3cb1e2b026c0f60d6f225c7255944d45023e59fd065b8f832739fc90d33b3347981675de12dd705c4ecbd647a494a17daf39e1d92599bcd1a83306886edadba1
25 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
26 DIST libcap-2.50.tar.xz 143792 BLAKE2B be83dfe1e55a4363936f53afb13edd2c1fd8c9bc27f7946bfda1eb8fb3046d0370997dcf85ba9dab7de10673527b4e8d15f104a75eaf407cba8ed0fc42465790 SHA512 6ac2df1ea9a9154e082c0595d343380ff8abed953b53c635a9297683289f2fa708eff488a42c6053e5ac556a5d90faa8709b3d98a47b2911f05bf80f2663a543
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 deleted file mode 100644
30 index 10959cf9339..00000000000
31 --- a/sys-libs/libcap/files/libcap-2.42-build-system-fixes.patch
32 +++ /dev/null
33 @@ -1,200 +0,0 @@
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.43.ebuild b/sys-libs/libcap/libcap-2.43.ebuild
236 deleted file mode 100644
237 index e167daea97b..00000000000
238 --- a/sys-libs/libcap/libcap-2.43.ebuild
239 +++ /dev/null
240 @@ -1,87 +0,0 @@
241 -# Copyright 1999-2021 Gentoo Authors
242 -# Distributed under the terms of the GNU General Public License v2
243 -
244 -EAPI=7
245 -
246 -inherit 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 -}
328
329 diff --git a/sys-libs/libcap/libcap-2.48.ebuild b/sys-libs/libcap/libcap-2.48.ebuild
330 deleted file mode 100644
331 index 9cfc5eb049e..00000000000
332 --- a/sys-libs/libcap/libcap-2.48.ebuild
333 +++ /dev/null
334 @@ -1,89 +0,0 @@
335 -# Copyright 1999-2021 Gentoo Authors
336 -# Distributed under the terms of the GNU General Public License v2
337 -
338 -EAPI=7
339 -
340 -inherit multilib-minimal toolchain-funcs pam usr-ldscript
341 -
342 -DESCRIPTION="POSIX 1003.1e capabilities"
343 -HOMEPAGE="https://sites.google.com/site/fullycapable/"
344 -SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
345 -
346 -# it's available under either of the licenses
347 -LICENSE="|| ( GPL-2 BSD )"
348 -SLOT="0"
349 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
350 -IUSE="pam static-libs"
351 -
352 -# While the build system optionally uses gperf, we don't DEPEND on it because
353 -# the build automatically falls back when it's unavailable. #604802
354 -RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
355 -PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
356 -DEPEND="${RDEPEND}
357 - ${PDEPEND}
358 - sys-kernel/linux-headers"
359 -
360 -# Requires test suite being run as root (via sudo)
361 -RESTRICT="test"
362 -
363 -PATCHES=(
364 - "${FILESDIR}"/${PN}-2.48-build-system-fixes.patch
365 - "${FILESDIR}"/${PN}-2.38-no_perl.patch
366 - "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
367 - "${FILESDIR}"/${PN}-2.21-include.patch
368 -)
369 -
370 -src_prepare() {
371 - default
372 - multilib_copy_sources
373 -}
374 -
375 -run_emake() {
376 - local args=(
377 - exec_prefix="${EPREFIX}"
378 - lib_prefix="${EPREFIX}/usr"
379 - lib="$(get_libdir)"
380 - prefix="${EPREFIX}/usr"
381 - PAM_CAP="$(usex pam yes no)"
382 - DYNAMIC=yes
383 - GOLANG=no
384 - CC="$(tc-getCC)"
385 - AR="$(tc-getAR)"
386 - RANLIB="$(tc-getRANLIB)"
387 - )
388 - emake "${args[@]}" "$@"
389 -}
390 -
391 -src_configure() {
392 - tc-export AR CC RANLIB
393 - tc-export_build_env BUILD_CC
394 - multilib-minimal_src_configure
395 -}
396 -
397 -multilib_src_compile() {
398 - run_emake
399 -}
400 -
401 -multilib_src_install() {
402 - # no configure, needs explicit install line #444724#c3
403 - run_emake DESTDIR="${D}" install
404 -
405 - gen_usr_ldscript -a cap
406 - gen_usr_ldscript -a psx
407 - if ! use static-libs ; then
408 - rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
409 - fi
410 -
411 - if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
412 - rm -r "${ED}"/usr/$(get_libdir)/security || die
413 - fi
414 -
415 - if use pam; then
416 - dopammod pam_cap/pam_cap.so
417 - dopamsecurity '' pam_cap/capability.conf
418 - fi
419 -}
420 -
421 -multilib_src_install_all() {
422 - dodoc CHANGELOG README doc/capability.notes
423 -}