Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/, sys-libs/libcap/files/
Date: Tue, 05 May 2020 08:25:36
Message-Id: 1588667127.6e9aa54aa0785b630136284d92cd2b784c99862d.polynomial-c@gentoo
1 commit: 6e9aa54aa0785b630136284d92cd2b784c99862d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 5 08:23:58 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue May 5 08:25:27 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e9aa54a
7
8 sys-libs/libcap: Bump to version 2.34
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-libs/libcap/Manifest | 1 +
14 .../files/libcap-2.34-build-system-fixes.patch | 214 +++++++++++++++++++++
15 sys-libs/libcap/libcap-2.34.ebuild | 84 ++++++++
16 3 files changed, 299 insertions(+)
17
18 diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
19 index e603b8d4cd1..b7274f8bc9a 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.32.tar.xz 99708 BLAKE2B cbd4676ca9ada4c4dd6dee5137c0bb16f23af5d9a224c81b476c19326f87352fb06e2e123c9431558cd22f91032064ed6de8407d5861728dd141be16957363db SHA512 e2325cf0a1d0509c49336f7e5760e5b339c889cdde8d6c359197aed711423f951ad390a2a3dd4943b03afe152ad8502ea1db9d7ef247148b93e93a3c4895a019
25 DIST libcap-2.33.tar.xz 111280 BLAKE2B 9a34b6e871c6175da5ef665ab7a5ed8b9889f598875f58a6e0b7aef9b6b2737f2a85bb0a6e259a730a3fcea3b8ebbec793b52ee5dec7d11fcf236dfb2148eb83 SHA512 bb5bdc1318b524ee607026038dff7c1c621f1710fa07f8c341b1f86761cb086d32b93d7a12dbe4256d4440ee984143db8659d2679330e221ce184d7048c142b4
26 +DIST libcap-2.34.tar.xz 111556 BLAKE2B 083599a899e5cc8942aedc3c932627d8608ea9cdc4eefe716e5fe2fb195276be26373697aa5bb3e84b801ccabb08f78c44f67ed82ea5c383a7c6a4d86f9e06b4 SHA512 6604aeab3de547e16e3c63e35cf41a5aaacf0cb52ffc818c822ada88595437986df731990d4b288eb72f9150de41fb8a93a6a727b936058e88b49b86352c4771
27
28 diff --git a/sys-libs/libcap/files/libcap-2.34-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.34-build-system-fixes.patch
29 new file mode 100644
30 index 00000000000..126e538633b
31 --- /dev/null
32 +++ b/sys-libs/libcap/files/libcap-2.34-build-system-fixes.patch
33 @@ -0,0 +1,214 @@
34 +From ac790bb368d309d1d2add15bbb59559d53cb05bb 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 +
56 +Signed-off-by: Lars Wendler <polynomial-c@g.o>
57 +---
58 + Make.Rules | 24 +++++++++++++-----------
59 + Makefile | 1 -
60 + libcap/Makefile | 7 ++++---
61 + pam_cap/Makefile | 8 +++++---
62 + progs/Makefile | 2 +-
63 + tests/Makefile | 8 +++++---
64 + 6 files changed, 28 insertions(+), 22 deletions(-)
65 +
66 +diff --git a/Make.Rules b/Make.Rules
67 +index 0fbfba0..755581d 100644
68 +--- a/Make.Rules
69 ++++ b/Make.Rules
70 +@@ -47,36 +47,38 @@ MINOR=34
71 + # Compilation specifics
72 +
73 + KERNEL_HEADERS := $(topdir)/libcap/include/uapi
74 +-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
75 +
76 +-CC := $(CROSS_COMPILE)gcc
77 ++CC ?= $(CROSS_COMPILE)gcc
78 + DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
79 +-CFLAGS := -O2 $(DEFINES)
80 +-BUILD_CC := $(CC)
81 +-BUILD_CFLAGS := -O2 $(DEFINES) $(IPATH)
82 +-AR := $(CROSS_COMPILE)ar
83 +-RANLIB := $(CROSS_COMPILE)ranlib
84 ++CFLAGS ?= -O2 $(DEFINES)
85 ++BUILD_CC ?= $(CC)
86 ++BUILD_CFLAGS ?= $(CFLAGS)
87 ++AR ?= $(CROSS_COMPILE)ar
88 ++RANLIB ?= $(CROSS_COMPILE)ranlib
89 + DEBUG = -g #-DDEBUG
90 + WARNINGS=-Wall -Wwrite-strings \
91 + -Wpointer-arith -Wcast-qual -Wcast-align \
92 + -Wstrict-prototypes -Wmissing-prototypes \
93 + -Wnested-externs -Winline -Wshadow
94 + LD=$(CC) -Wl,-x -shared
95 +-LDFLAGS := #-g
96 ++LDFLAGS ?= #-g
97 + LIBCAPLIB := -L$(topdir)/libcap -lcap
98 + LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
99 +
100 + BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
101 +
102 +-SYSTEM_HEADERS = /usr/include
103 ++LIBCAP_CPPFLAGS = -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include $(DEFINES)
104 ++CPPFLAGS += $(LIBCAP_CPPFLAGS)
105 ++BUILD_CPPFLAGS += $(LIBCAP_CPPFLAGS)
106 + INCS=$(topdir)/libcap/include/sys/capability.h
107 + LDFLAGS += -L$(topdir)/libcap
108 +-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
109 ++CPPFLAGS += -Dlinux
110 ++CFLAGS += $(WARNINGS) $(DEBUG)
111 + PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
112 + INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
113 + DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
114 +
115 +-GOLANG := $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
116 ++GOLANG ?= $(shell if [ -n "$(shell go version 2>/dev/null)" ]; then echo yes ; else echo no ; fi)
117 + ifeq ($(GOLANG),yes)
118 + GOROOT := $(shell go env GOROOT)
119 + GOCGO := $(shell if [ "$(shell go env CGO_ENABLED)" = 1 ]; then echo yes ; else echo no ; fi)
120 +diff --git a/Makefile b/Makefile
121 +index d8cf49c..c0b10a0 100644
122 +--- a/Makefile
123 ++++ b/Makefile
124 +@@ -16,7 +16,6 @@ endif
125 + ifeq ($(GOLANG),yes)
126 + $(MAKE) -C go $@
127 + endif
128 +- $(MAKE) -C tests $@
129 + $(MAKE) -C progs $@
130 + $(MAKE) -C doc $@
131 + $(MAKE) -C kdebug $@
132 +diff --git a/libcap/Makefile b/libcap/Makefile
133 +index c2cb0d1..406dfe5 100644
134 +--- a/libcap/Makefile
135 ++++ b/libcap/Makefile
136 +@@ -21,6 +21,7 @@ PSXOBJS=$(addsuffix .o, $(PSXFILES))
137 + MAJLIBNAME=$(LIBNAME).$(VERSION)
138 + MINLIBNAME=$(MAJLIBNAME).$(MINOR)
139 + GPERF_OUTPUT = _caps_output.gperf
140 ++CFLAGS += -fPIC
141 +
142 + all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME)
143 +
144 +@@ -48,7 +49,7 @@ libpsx.pc: libpsx.pc.in
145 + $< >$@
146 +
147 + _makenames: _makenames.c cap_names.list.h
148 +- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
149 ++ $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
150 +
151 + cap_names.h: _makenames
152 + ./_makenames > cap_names.h
153 +@@ -75,10 +76,10 @@ $(MINLIBNAME): $(CAPOBJS)
154 + ln -sf $(MAJLIBNAME) $(LIBNAME)
155 +
156 + %.o: %.c $(INCLS)
157 +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@
158 ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
159 +
160 + cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
161 +- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
162 ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
163 +
164 + cap_test: cap_test.c libcap.h
165 + $(CC) $(CFLAGS) $(IPATH) $< -o $@
166 +diff --git a/pam_cap/Makefile b/pam_cap/Makefile
167 +index 56604fd..2da4674 100644
168 +--- a/pam_cap/Makefile
169 ++++ b/pam_cap/Makefile
170 +@@ -3,6 +3,8 @@
171 + topdir=$(shell pwd)/..
172 + include ../Make.Rules
173 +
174 ++CFLAGS += -fPIC
175 ++
176 + all: pam_cap.so
177 + $(MAKE) testlink
178 +
179 +@@ -16,16 +18,16 @@ install: all
180 + # written (and you know why it fails), email me and explain why. Thanks!
181 +
182 + pam_cap.so: pam_cap.o
183 +- $(LD) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
184 ++ $(LD) $(CFLAGS) -o pam_cap.so $< $(LIBCAPLIB) $(LDFLAGS)
185 +
186 + pam_cap.o: pam_cap.c
187 +- $(CC) $(CFLAGS) $(IPATH) -c $< -o $@
188 ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
189 +
190 + test_pam_cap: test_pam_cap.c pam_cap.c
191 + $(CC) $(CFLAGS) $(IPATH) -o $@ test_pam_cap.c $(LIBCAPLIB) $(LDFLAGS) --static
192 +
193 + testlink: test.c pam_cap.o
194 +- $(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
195 ++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) $(LDFLAGS)
196 +
197 + test: pam_cap.so
198 + make testlink
199 +diff --git a/progs/Makefile b/progs/Makefile
200 +index 076e44f..fd13351 100644
201 +--- a/progs/Makefile
202 ++++ b/progs/Makefile
203 +@@ -23,7 +23,7 @@ $(BUILD): %: %.o $(DEPS)
204 + $(CC) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
205 +
206 + %.o: %.c $(INCS)
207 +- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -c $< -o $@
208 ++ $(CC) $(CAPSH_SHELL) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
209 +
210 + install: all
211 + mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
212 +diff --git a/tests/Makefile b/tests/Makefile
213 +index 3fedeca..3645ddd 100644
214 +--- a/tests/Makefile
215 ++++ b/tests/Makefile
216 +@@ -16,6 +16,8 @@ test: run_psx_test run_libcap_psx_test
217 +
218 + sudotest: test run_libcap_launch_test run_libcap_launch_test
219 +
220 ++CFLAGS += -fPIC
221 ++
222 + install: all
223 +
224 + run_psx_test: psx_test psx_test_wrap
225 +@@ -23,16 +25,16 @@ run_psx_test: psx_test psx_test_wrap
226 + ./psx_test_wrap
227 +
228 + psx_test: psx_test.c $(DEPS)
229 +- $(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
230 ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DNOWRAP $< -o $@ $(LIBPSXLIB)
231 +
232 + psx_test_wrap: psx_test.c $(DEPS)
233 +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
234 ++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
235 +
236 + run_libcap_psx_test: libcap_psx_test
237 + ./libcap_psx_test
238 +
239 + libcap_psx_test: libcap_psx_test.c $(DEPS)
240 +- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
241 ++ $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
242 +
243 + run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
244 + sudo ./libcap_launch_test
245 +--
246 +2.26.2
247 +
248
249 diff --git a/sys-libs/libcap/libcap-2.34.ebuild b/sys-libs/libcap/libcap-2.34.ebuild
250 new file mode 100644
251 index 00000000000..1c62c6a414a
252 --- /dev/null
253 +++ b/sys-libs/libcap/libcap-2.34.ebuild
254 @@ -0,0 +1,84 @@
255 +# Copyright 1999-2020 Gentoo Authors
256 +# Distributed under the terms of the GNU General Public License v2
257 +
258 +EAPI=7
259 +
260 +inherit multilib multilib-minimal toolchain-funcs pam usr-ldscript
261 +
262 +DESCRIPTION="POSIX 1003.1e capabilities"
263 +HOMEPAGE="https://sites.google.com/site/fullycapable/"
264 +SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
265 +
266 +# it's available under either of the licenses
267 +LICENSE="|| ( GPL-2 BSD )"
268 +SLOT="0"
269 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
270 +IUSE="pam static-libs"
271 +
272 +# While the build system optionally uses gperf, we don't DEPEND on it because
273 +# the build automatically falls back when it's unavailable. #604802
274 +RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
275 + pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
276 +DEPEND="${RDEPEND}
277 + sys-kernel/linux-headers"
278 +
279 +# Requires test suite being run as root (via sudo)
280 +RESTRICT="test"
281 +
282 +PATCHES=(
283 + "${FILESDIR}"/${PN}-2.34-build-system-fixes.patch
284 + "${FILESDIR}"/${PN}-2.28-no_perl.patch
285 + "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
286 + "${FILESDIR}"/${PN}-2.21-include.patch
287 +)
288 +
289 +src_prepare() {
290 + default
291 + multilib_copy_sources
292 +}
293 +
294 +run_emake() {
295 + local args=(
296 + exec_prefix="${EPREFIX}"
297 + lib_prefix="${EPREFIX}/usr"
298 + lib="$(get_libdir)"
299 + prefix="${EPREFIX}/usr"
300 + PAM_CAP="$(usex pam yes no)"
301 + DYNAMIC=yes
302 + GOLANG=no
303 + )
304 + emake "${args[@]}" "$@"
305 +}
306 +
307 +multilib_src_compile() {
308 + tc-export AR CC RANLIB
309 + local BUILD_CC
310 + tc-export_build_env BUILD_CC
311 +
312 + run_emake
313 +}
314 +
315 +multilib_src_install() {
316 + # no configure, needs explicit install line #444724#c3
317 + run_emake DESTDIR="${D}" install
318 +
319 + gen_usr_ldscript -a cap
320 + if ! use static-libs ; then
321 + # Don't remove libpsx.a!
322 + # See https://bugs.gentoo.org/703912
323 + rm "${ED}"/usr/$(get_libdir)/libcap.a || die
324 + fi
325 +
326 + if [[ -d "${ED}"/usr/$(get_libdir)/security ]] ; then
327 + rm -r "${ED}"/usr/$(get_libdir)/security || die
328 + fi
329 +
330 + if use pam; then
331 + dopammod pam_cap/pam_cap.so
332 + dopamsecurity '' pam_cap/capability.conf
333 + fi
334 +}
335 +
336 +multilib_src_install_all() {
337 + dodoc CHANGELOG README doc/capability.notes
338 +}