mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-07 04:58:47 +00:00
libcap-ng: resolved issue related with LONG_BIT definition
The problem is well known for 64 bits architectures and the solution is offered in the same recibe but in the meta-selinux layer. Signed-off-by: Alexandru.Vaduva <Alexandru.Vaduva at enea.com> Signed-off-by: Armin Kuster <akuster@mvista.com>
This commit is contained in:
committed by
Armin Kuster
parent
3689209e52
commit
914128d8c9
@@ -0,0 +1,39 @@
|
|||||||
|
configure.ac - Avoid an incorrect check for python.
|
||||||
|
Makefile.am - avoid hard coded host include paths.
|
||||||
|
|
||||||
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||||
|
|
||||||
|
--- libcap-ng-0.6.5/configure.ac.orig 2012-01-17 13:59:03.645898989 -0600
|
||||||
|
+++ libcap-ng-0.6.5/configure.ac 2012-01-17 13:59:46.353959252 -0600
|
||||||
|
@@ -120,17 +120,8 @@
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(testing)
|
||||||
|
AM_PATH_PYTHON
|
||||||
|
-if test -f /usr/include/python${am_cv_python_version}/Python.h ; then
|
||||||
|
- python_found="yes"
|
||||||
|
- AC_MSG_NOTICE(Python bindings will be built)
|
||||||
|
-else
|
||||||
|
- python_found="no"
|
||||||
|
- if test x$use_python = xyes ; then
|
||||||
|
- AC_MSG_ERROR([Python explicitly required and python headers found])
|
||||||
|
- else
|
||||||
|
- AC_MSG_WARN("Python headers not found - python bindings will not be made")
|
||||||
|
- fi
|
||||||
|
-fi
|
||||||
|
+python_found="yes"
|
||||||
|
+AC_MSG_NOTICE(Python bindings will be built)
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes")
|
||||||
|
|
||||||
|
--- libcap-ng-0.6.5/bindings/python/Makefile.am.orig 2010-11-03 12:31:59.000000000 -0500
|
||||||
|
+++ libcap-ng-0.6.5/bindings/python/Makefile.am 2012-01-17 14:05:50.199834467 -0600
|
||||||
|
@@ -24,7 +24,8 @@
|
||||||
|
CONFIG_CLEAN_FILES = *.loT *.rej *.orig
|
||||||
|
AM_CFLAGS = -fPIC -DPIC
|
||||||
|
PYLIBVER ?= python$(PYTHON_VERSION)
|
||||||
|
-INCLUDES = -I. -I$(top_builddir) -I/usr/include/$(PYLIBVER)
|
||||||
|
+PYINC ?= /usr/include/$(PYLIBVER)
|
||||||
|
+INCLUDES = -I. -I$(top_builddir) -I$(PYINC)
|
||||||
|
LIBS = $(top_builddir)/src/libcap-ng.la
|
||||||
|
pyexec_PYTHON = capng.py
|
||||||
|
pyexec_LTLIBRARIES = _capng.la
|
||||||
@@ -1,11 +1,37 @@
|
|||||||
DESCRIPTION = "The libcap-ng library is intended to make programming with posix capabilities much easier than the traditional libcap library."
|
SUMMARY = "An alternate posix capabilities library"
|
||||||
HOMEPAGE = "http://people.redhat.com/sgrubb/libcap-ng/index.html"
|
DESCRIPTION = "The libcap-ng library is intended to make programming \
|
||||||
LICENSE = "GPL-2.0"
|
with POSIX capabilities much easier than the traditional libcap library."
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
HOMEPAGE = "http://freecode.com/projects/libcap-ng"
|
||||||
|
SECTION = "base"
|
||||||
|
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/${PN}-${PV}.tar.gz"
|
SRC_URI = "http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
|
||||||
|
file://python.patch"
|
||||||
|
|
||||||
|
inherit lib_package autotools pythonnative
|
||||||
|
|
||||||
SRC_URI[md5sum] = "610afb774f80a8032b711281df126283"
|
SRC_URI[md5sum] = "610afb774f80a8032b711281df126283"
|
||||||
SRC_URI[sha256sum] = "5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1"
|
SRC_URI[sha256sum] = "5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1"
|
||||||
|
|
||||||
inherit autotools
|
DEPENDS += "swig-native python"
|
||||||
|
|
||||||
|
EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'"
|
||||||
|
|
||||||
|
PACKAGES += "${PN}-python"
|
||||||
|
|
||||||
|
FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug"
|
||||||
|
FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
# Moving libcap-ng to base_libdir
|
||||||
|
if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
|
||||||
|
mkdir -p ${D}/${base_libdir}/
|
||||||
|
mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/
|
||||||
|
relpath=${@os.path.relpath("${base_libdir}", "${libdir}")}
|
||||||
|
ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user