mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
libcap-ng:upgrade 0.7.10 -> 0.7.11
0001-configure.ac-add-library-if-header-found.patch 0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch Removed since these are included in 0.7.11 Refresh the following patch: python.patch (From OE-Core rev: e883035f13ee86a63eaffe5ac55bf2ce20c5ba10) Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
zangrc
Richard Purdie
@@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
|
||||
SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
|
||||
file://python.patch \
|
||||
file://0001-configure.ac-add-library-if-header-found.patch \
|
||||
file://0002-Wrap-pthread_atfork-usage-in-HAVE_PTHREAD_H.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "57dc267e2949cdecb651a929f9206572"
|
||||
SRC_URI[sha256sum] = "a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf"
|
||||
SRC_URI[md5sum] = "5883ed10b621c87e29a05cff36d2928e"
|
||||
SRC_URI[sha256sum] = "85815c711862d01a440db471f12fba462c9949e923966f5859607e652d9c0ae9"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
-31
@@ -1,31 +0,0 @@
|
||||
From 0230e2e374bb71aed0181ccd9ebd13c0c5125a5d Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Woerner <twoerner@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 17:01:20 -0400
|
||||
Subject: [PATCH] configure.ac: add library if header found
|
||||
|
||||
If the pthread.h header is found, make sure library containing
|
||||
"pthread_atfork" is added to the list of libraries against which to link.
|
||||
On some hosts (e.g. openSUSE 15.1) "-lpthread" needs to be explicitly added
|
||||
in order for the code to compile correctly.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/stevegrubb/libcap-ng/pull/10]
|
||||
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
|
||||
---
|
||||
configure.ac | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 63088f4..639b464 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -56,7 +56,9 @@ AC_CHECK_HEADERS(sys/xattr.h, [], [
|
||||
AC_CHECK_HEADERS(attr/xattr.h, [], [AC_MSG_WARN(attr/xattr.h not found, disabling file system capabilities.)])
|
||||
])
|
||||
AC_CHECK_HEADERS(linux/securebits.h, [], [])
|
||||
-AC_CHECK_HEADERS(pthread.h, [], [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)])
|
||||
+AC_CHECK_HEADERS(pthread.h,
|
||||
+ [AC_SEARCH_LIBS(pthread_atfork, pthread)],
|
||||
+ [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)])
|
||||
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
From d95c4018ad57c37f6272dbedfa5217776567c329 Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Larson <chris_larson@mentor.com>
|
||||
Date: Tue, 26 Nov 2019 22:34:34 +0500
|
||||
Subject: [PATCH] Wrap pthread_atfork usage in HAVE_PTHREAD_H
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
---
|
||||
src/cap-ng.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/cap-ng.c b/src/cap-ng.c
|
||||
index 35fcd7a..97a3dbd 100644
|
||||
--- a/src/cap-ng.c
|
||||
+++ b/src/cap-ng.c
|
||||
@@ -166,7 +166,9 @@ static void deinit(void)
|
||||
static void init_lib(void) __attribute__ ((constructor));
|
||||
static void init_lib(void)
|
||||
{
|
||||
+#ifdef HAVE_PTHREAD_H
|
||||
pthread_atfork(NULL, NULL, deinit);
|
||||
+#endif
|
||||
}
|
||||
|
||||
static void init(void)
|
||||
@@ -1,6 +1,3 @@
|
||||
From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001
|
||||
From: Li xin <lixin.fnst@cn.fujitsu.com>
|
||||
Date: Sat, 18 Jul 2015 23:03:30 +0900
|
||||
Subject: [PATCH] configure.ac - Avoid an incorrect check for python.
|
||||
Makefile.am - avoid hard coded host include paths.
|
||||
|
||||
@@ -9,6 +6,8 @@ Upstream-Status: pending
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
|
||||
|
||||
---
|
||||
bindings/python/Makefile.am | 4 +++-
|
||||
configure.ac | 17 ++---------------
|
||||
@@ -30,12 +29,12 @@ index 999b184..c8e49db 100644
|
||||
SWIG_INCLUDES = ${AM_CPPFLAGS}
|
||||
pyexec_PYTHON = capng.py
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7f66179..079d026 100644
|
||||
index 8b46f51..2d7e00c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -123,21 +123,8 @@ if test x$use_python = xno ; then
|
||||
else
|
||||
AC_MSG_RESULT(testing)
|
||||
@@ -141,21 +141,8 @@ fi
|
||||
|
||||
# Setup Python2 with the interpreter found previously.
|
||||
AM_PATH_PYTHON
|
||||
-PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"`
|
||||
-if test -f ${PYINCLUDEDIR}/Python.h ; then
|
||||
@@ -46,7 +45,7 @@ index 7f66179..079d026 100644
|
||||
- AC_MSG_NOTICE(Python bindings will be built)
|
||||
-else
|
||||
- python_found="no"
|
||||
- if test x$use_python = xyes ; then
|
||||
- if test "x$use_python" = xyes ; then
|
||||
- AC_MSG_ERROR([Python explicitly requested and python headers were not found])
|
||||
- else
|
||||
- AC_MSG_WARN("Python headers not found - python bindings will not be made")
|
||||
@@ -58,5 +57,4 @@ index 7f66179..079d026 100644
|
||||
AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes")
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user