All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 03/10] libcap: update 2.49 -> 2.50
Date: Fri,  4 Jun 2021 11:14:51 +0200	[thread overview]
Message-ID: <20210604091458.1381144-3-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20210604091458.1381144-1-alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...-tests-do-not-statically-link-a-test.patch | 20 +++++++++----------
 .../libcap/{libcap_2.49.bb => libcap_2.50.bb} |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.49.bb => libcap_2.50.bb} (95%)

diff --git a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
index d2653afb75..414e45a6f4 100644
--- a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
+++ b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
@@ -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>
 Date: Wed, 15 Jan 2020 17:16:28 +0100
 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]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
  progs/Makefile | 2 +-
  tests/Makefile | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/progs/Makefile b/progs/Makefile
-index 1d7fc7a..37db8f7 100644
+index 289186e..071a285 100644
 --- a/progs/Makefile
 +++ b/progs/Makefile
-@@ -42,7 +42,7 @@ endif
- test: $(PROGS)
+@@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS)
+ 	$(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)
  
  sudotest: test tcapsh-static
  	sudo $(LDPATH) ./quicktest.sh
 diff --git a/tests/Makefile b/tests/Makefile
-index 01f7589..094ec57 100644
+index 4a5f2f9..4266d86 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
 @@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
@@ -38,7 +39,7 @@ index 01f7589..094ec57 100644
  DEPS=../libcap/libcap.a
  ifeq ($(PTHREADS),yes)
  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.
  noop: noop.c
@@ -46,7 +47,4 @@ index 01f7589..094ec57 100644
 +	$(CC) $(CFLAGS) $< -o $@
  
  clean:
- 	rm -f psx_test libcap_psx_test libcap_launch_test *~
--- 
-2.17.1
-
+ 	rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~
diff --git a/meta/recipes-support/libcap/libcap_2.49.bb b/meta/recipes-support/libcap/libcap_2.50.bb
similarity index 95%
rename from meta/recipes-support/libcap/libcap_2.49.bb
rename to meta/recipes-support/libcap/libcap_2.50.bb
index eb9fc5b4b3..15137f0ac0 100644
--- a/meta/recipes-support/libcap/libcap_2.49.bb
+++ b/meta/recipes-support/libcap/libcap_2.50.bb
@@ -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://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/"
 
-- 
2.31.1


  parent reply	other threads:[~2021-06-04  9:15 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-04  9:14 [PATCH 01/10] virglrenderer: explicitly depend on libgbm Alexander Kanavin
2021-06-04  9:14 ` [PATCH 02/10] elfutils: update 0.183 -> 0.185 Alexander Kanavin
2021-06-04  9:14 ` Alexander Kanavin [this message]
2021-06-04  9:14 ` [PATCH 04/10] cmake: update 3.20.2 -> 3.20.3 Alexander Kanavin
2021-06-05 14:35   ` [OE-core] " Richard Purdie
     [not found]   ` <1685B658849E960A.4717@lists.openembedded.org>
2021-06-05 15:13     ` Richard Purdie
2021-06-05 15:32       ` Khem Raj
2021-06-05 16:09         ` Richard Purdie
2021-06-05 19:27           ` Alexander Kanavin
2021-06-05 23:10             ` Richard Purdie
2021-06-06 19:51               ` Alexander Kanavin
2021-06-06 21:51                 ` Khem Raj
2021-06-06 22:06                   ` Alexander Kanavin
2021-06-06 22:18                     ` Khem Raj
2021-06-07 10:20                       ` Alexander Kanavin
2021-06-07 15:10                         ` Khem Raj
2021-06-07 16:40                           ` Michael Halstead
2021-06-07 17:18                             ` Khem Raj
2021-06-07 18:04                               ` Alexander Kanavin
2021-06-08 15:40                                 ` Michael Halstead
2021-06-08 18:15                                   ` Alexander Kanavin
2021-06-09 11:37                                     ` Richard Purdie
2021-06-09 14:07                                       ` Alexander Kanavin
2021-06-11 21:56                                         ` Michael Halstead
2021-06-11 22:18                                           ` Alexander Kanavin
2021-06-11 23:29                                             ` Michael Halstead
2021-06-16 22:45                 ` Richard Purdie
2021-09-29  1:11                   ` Mittal, Anuj
2021-10-04 16:27                     ` Michael Halstead
2021-10-04 18:28                       ` Alexander Kanavin
2021-10-04 22:38                         ` Michael Halstead
2021-06-04  9:14 ` [PATCH 05/10] perl: split perl-cross into its own recipe Alexander Kanavin
2021-06-07  5:29   ` [OE-core] " Jacob Kroon
2021-06-07  9:13     ` Richard Purdie
2021-06-04  9:14 ` [PATCH 06/10] perl-cross: 1.3.5 -> 1.3.6 Alexander Kanavin
2021-06-04  9:14 ` [PATCH 07/10] perl: update 5.32.1 -> 5.34.0 Alexander Kanavin
2021-06-04  9:14 ` [PATCH 08/10] libgcrypt: upgrade 1.9.2 -> 1.9.3 Alexander Kanavin
2021-06-04  9:14 ` [PATCH 09/10] xf86-input-libinput: update 0.30.0 -> 1.0.1 Alexander Kanavin
2021-06-04  9:14 ` [PATCH 10/10] erofs-utils: correct upstream version check Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210604091458.1381144-3-alex.kanavin@gmail.com \
    --to=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.