diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2020-07-06 20:16:27 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-07-06 20:17:19 +0200 |
| commit | 204842b30798d4bf9ede39f2718fac59aae6de11 (patch) | |
| tree | f18e721aa6ef35f36bcee96b9828a2f635f9fba0 /sys-libs/libcap/files | |
| parent | sci-electronics/pulseview: python3_8, python3_9 (diff) | |
| download | gentoo-204842b30798d4bf9ede39f2718fac59aae6de11.tar.gz gentoo-204842b30798d4bf9ede39f2718fac59aae6de11.tar.bz2 gentoo-204842b30798d4bf9ede39f2718fac59aae6de11.zip | |
sys-libs/libcap: Bump to version 2.38
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-libs/libcap/files')
| -rw-r--r-- | sys-libs/libcap/files/libcap-2.37-build-system-fixes.patch | 3 | ||||
| -rw-r--r-- | sys-libs/libcap/files/libcap-2.38-no_perl.patch | 71 |
2 files changed, 73 insertions, 1 deletions
diff --git a/sys-libs/libcap/files/libcap-2.37-build-system-fixes.patch b/sys-libs/libcap/files/libcap-2.37-build-system-fixes.patch index 797ac62dd1f1..3d0a771aa5f3 100644 --- a/sys-libs/libcap/files/libcap-2.37-build-system-fixes.patch +++ b/sys-libs/libcap/files/libcap-2.37-build-system-fixes.patch @@ -1,4 +1,4 @@ -From 16bca4a0f45a712867992dbe30aa51558c78d424 Mon Sep 17 00:00:00 2001 +From 33c8c4ebf725aa9950689d4dc72d2f5da30beab5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Tue, 5 May 2020 09:52:40 +0200 Subject: [PATCH] build system fixes @@ -19,6 +19,7 @@ Forward ported from libcap-2.25 to libcap-2.28 Forward ported from libcap-2.28 to libcap-2.29 Forward ported from libcap-2.29 to libcap-2.33 Forward ported from libcap-2.33 to libcap-2.34 +Forward ported from libcap-2.34 to libcap-2.37 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> --- diff --git a/sys-libs/libcap/files/libcap-2.38-no_perl.patch b/sys-libs/libcap/files/libcap-2.38-no_perl.patch new file mode 100644 index 000000000000..f3e0c468c869 --- /dev/null +++ b/sys-libs/libcap/files/libcap-2.38-no_perl.patch @@ -0,0 +1,71 @@ +From 3f76418eaf73896489129c529fac021e4f3a03c0 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Wed, 21 Nov 2018 11:00:54 +0100 +Subject: [PATCH] use awk/sed instead of perl for creating header files + +More systems should have awk/sed than perl. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +Forward ported from libcap-2.22 to libcap-2.26 +and incorporated the gperf-3.1 fix provided by Mike Gilbert +<floppym@gentoo.org> +Forward ported from libcap-2.26 to libcap-2.28 +Forward ported from libcap-2.28 to libcap-2.38 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + libcap/Makefile | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +diff --git a/libcap/Makefile b/libcap/Makefile +index 3d6463d..df2526c 100644 +--- a/libcap/Makefile ++++ b/libcap/Makefile +@@ -22,6 +22,8 @@ MAJLIBNAME=$(LIBNAME).$(VERSION) + MINLIBNAME=$(MAJLIBNAME).$(MINOR) + GPERF_OUTPUT = _caps_output.gperf + CFLAGS += -fPIC ++AWK = awk ++SED = sed + + all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME) + +@@ -55,17 +57,27 @@ cap_names.h: _makenames + ./_makenames > cap_names.h + + $(GPERF_OUTPUT): cap_names.list.h +- perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@ +- sed -e 's/unsigned int len/size_t len/' -i $@ ++ (printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \ ++ $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \ ++ gperf \ ++ --ignore-case \ ++ --language=ANSI-C \ ++ --includes \ ++ --readonly \ ++ --null-strings \ ++ --global-table \ ++ --hash-function-name=__cap_hash_name \ ++ --lookup-function-name="__cap_lookup_name" \ ++ -c -t -m20 $(INDENT) > $@ + +-# Intention is that libcap keeps up with torvalds' tree, as reflected +-# by this maintained version of the kernel header. libcap dynamically +-# trims the meaning of "all" capabilities down to that of the running +-# kernel as of 2.30. + UAPI_HEADER := $(topdir)/libcap/include/uapi/linux/capability.h + cap_names.list.h: Makefile $(UAPI_HEADER) + @echo "=> making $@ from $(UAPI_HEADER)" +- perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(UAPI_HEADER) | fgrep -v 0x > $@ ++ $(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $(UAPI_HEADER) > $@ ++ ++cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile ++ @echo "=> making $@ from $<" ++ $(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@ + + $(STACAPLIBNAME): $(CAPOBJS) + $(AR) rcs $@ $^ +-- +2.27.0 + |