mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcap: update 2.49 -> 2.50

Browse Source 
(From OE-Core rev: 791d1a215400db08ef98193b2621ec02f108a302)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-06-04 11:14:51 +02:00
committed by Richard Purdie
parent c7b15f642b
commit d39cef3f82
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
View File

@@ -1,4 +1,4 @@
From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001 From 897900f3f9084c5542097851323bba3f2691df20 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 15 Jan 2020 17:16:28 +0100 Date: Wed, 15 Jan 2020 17:16:28 +0100
Subject: [PATCH] tests: do not statically link a test Subject: [PATCH] tests: do not statically link a test
@@ -7,26 +7,27 @@ This fails on e.g. centos 7
Upstream-Status: Inappropriate [oe-core specific] Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
progs/Makefile | 2 +- progs/Makefile | 2 +-
tests/Makefile | 4 ++-- tests/Makefile | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-) 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/progs/Makefile b/progs/Makefile diff --git a/progs/Makefile b/progs/Makefile
index 1d7fc7a..37db8f7 100644 index 289186e..071a285 100644
--- a/progs/Makefile --- a/progs/Makefile
+++ b/progs/Makefile +++ b/progs/Makefile
@@ -42,7 +42,7 @@ endif @@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS)
test: $(PROGS) $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
tcapsh-static: capsh.c $(DEPS) tcapsh-static: capsh.c capshdoc.h.cf $(DEPS)
- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static
+ $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) + $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
sudotest: test tcapsh-static sudotest: test tcapsh-static
sudo $(LDPATH) ./quicktest.sh sudo $(LDPATH) ./quicktest.sh
diff --git a/tests/Makefile b/tests/Makefile diff --git a/tests/Makefile b/tests/Makefile
index 01f7589..094ec57 100644 index 4a5f2f9..4266d86 100644
--- a/tests/Makefile --- a/tests/Makefile
+++ b/tests/Makefile +++ b/tests/Makefile
@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes) @@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
@@ -38,7 +39,7 @@ index 01f7589..094ec57 100644
DEPS=../libcap/libcap.a DEPS=../libcap/libcap.a
ifeq ($(PTHREADS),yes) ifeq ($(PTHREADS),yes)
DEPS += ../libcap/libpsx.a DEPS += ../libcap/libpsx.a
@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS) @@ -113,7 +113,7 @@ noexploit: exploit.o $(DEPS)
# This one runs in a chroot with no shared library files. # This one runs in a chroot with no shared library files.
noop: noop.c noop: noop.c
@@ -46,7 +47,4 @@ index 01f7589..094ec57 100644
+ $(CC) $(CFLAGS) $< -o $@ + $(CC) $(CFLAGS) $< -o $@
clean: clean:
rm -f psx_test libcap_psx_test libcap_launch_test *~ rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~
--
2.17.1

2
meta/recipes-support/libcap/libcap_2.49.bb → meta/recipes-support/libcap/libcap_2.50.bb
View File

@@ -14,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
file://0002-tests-do-not-run-target-executables.patch \ file://0002-tests-do-not-run-target-executables.patch \
file://0001-tests-do-not-statically-link-a-test.patch \ file://0001-tests-do-not-statically-link-a-test.patch \
" "
SRC_URI[sha256sum] = "e98bc4d93645082ec787730b0fd1a712b38882465c505777de17c338831ee181" SRC_URI[sha256sum] = "47a57b8bd238b84c93c921a9b4ff82337551dbcb0cca071316aadf3e23b19261"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"