Skip to contentSkip to conversation

libcap: update 2.45 -> 2.46

PATCH New Yi Zhao 1 participant 2 messages Dec 23, 2020

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/2 libcap: update 2.45 -> 2.46

Rebase 0001-tests-do-not-statically-link-a-test.patch

---
 .../0001-tests-do-not-statically-link-a-test.patch     | 10 ++++++----
 .../libcap/{libcap_2.45.bb => libcap_2.46.bb}          |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.45.bb => libcap_2.46.bb} (96%)
meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +6 -4
index 3c737b884e..d2653afb75 100644
@@ -1,4 +1,4 @@
-From c22c6c16362c7dbc8d6faea06edee5e07759c5fa Mon Sep 17 00:00:00 2001
+From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Wed, 15 Jan 2020 17:16:28 +0100
 Subject: [PATCH] tests: do not statically link a test
@@ -7,7 +7,6 @@ This fails on e.g. centos 7
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
-
 ---
  progs/Makefile | 2 +-
  tests/Makefile | 4 ++--
@@ -27,7 +26,7 @@ index 1d7fc7a..37db8f7 100644
  sudotest: test tcapsh-static
  	sudo $(LDPATH) ./quicktest.sh
 diff --git a/tests/Makefile b/tests/Makefile
-index 3431df9..727fb86 100644
+index 01f7589..094ec57 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
 @@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
@@ -36,7 +35,7 @@ index 3431df9..727fb86 100644
  else
 -LDFLAGS += --static
 +LDFLAGS +=
- DEPS=../libcap/libcap.a ../progs/tcapsh-static
+ DEPS=../libcap/libcap.a
  ifeq ($(PTHREADS),yes)
  DEPS +=  ../libcap/libpsx.a
 @@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS)
@@ -48,3 +47,6 @@ index 3431df9..727fb86 100644
  
  clean:
  	rm -f psx_test libcap_psx_test libcap_launch_test *~
+-- 
+2.17.1
+
meta/recipes-support/libcap/libcap_2.46.bb renamed from meta/recipes-support/libcap/libcap_2.45.bb +1 -1
similarity index 96%
rename from meta/recipes-support/libcap/libcap_2.45.bb
rename to meta/recipes-support/libcap/libcap_2.46.bb
index 067ba32d99..605a738127 100644
@@ -12,7 +12,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] = "d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286"
+SRC_URI[sha256sum] = "4ed3d11413fa6c9667e49f819808fbb581cd8864b839f87d7c2a02c70f21d8b4"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 libcap-ng: upgrade 0.8.1 -> 0.8.2

SRC_URI update: http -> https

---
 .../{libcap-ng-python_0.8.1.bb => libcap-ng-python_0.8.2.bb}  | 0
 meta/recipes-support/libcap-ng/libcap-ng.inc                  | 4 ++--
 .../libcap-ng/{libcap-ng_0.8.1.bb => libcap-ng_0.8.2.bb}      | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.8.1.bb => libcap-ng-python_0.8.2.bb} (100%)
 rename meta/recipes-support/libcap-ng/{libcap-ng_0.8.1.bb => libcap-ng_0.8.2.bb} (100%)
meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb renamed from meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb +0 -0
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.8.1.bb
rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb
meta/recipes-support/libcap-ng/libcap-ng.inc +2 -2
index a312b602ff..8c52b5d0b9 100644
@@ -7,10 +7,10 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
-SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
+SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
            file://python.patch \
 "
 
-SRC_URI[sha256sum] = "f06b17aaca029e245c9a26c698c6cc8a1cf42b58483d93e94ee02b478bdc1055"
+SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9"
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb renamed from meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb +0 -0
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng_0.8.1.bb
rename to meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb
Signature · 1 line
2.25.1