diff options
| -rw-r--r-- | package/libsemanage/0001-execption-lib-path-fix.patch | 14 | ||||
| -rw-r--r-- | package/libsemanage/0001-workaround-blackfin-issue.patch (renamed from package/libsemanage/0002-workaround-blackfin-issue.patch) | 5 | ||||
| -rw-r--r-- | package/libsemanage/Config.in | 8 | ||||
| -rw-r--r-- | package/libsemanage/libsemanage.hash | 2 | ||||
| -rw-r--r-- | package/libsemanage/libsemanage.mk | 6 |
5 files changed, 13 insertions, 22 deletions
diff --git a/package/libsemanage/0001-execption-lib-path-fix.patch b/package/libsemanage/0001-execption-lib-path-fix.patch deleted file mode 100644 index cbcbea5995..0000000000 --- a/package/libsemanage/0001-execption-lib-path-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Patch to correct a missing header file issue. - -Signed-off-by Clayton Shotwell <clshotwe@rockwellcollins.com> - ---- a/src/exception.sh 2011-12-21 11:46:04.000000000 -0600 -+++ b/src/exception.sh 2012-08-27 11:29:58.000000000 -0500 -@@ -9,6 +9,6 @@ - } - " - } --gcc -x c -c - -aux-info temp.aux < ../include/semanage/semanage.h -+gcc -x c -c - -aux-info temp.aux -I../include < ../include/semanage/semanage.h - for i in `awk '/extern int/ { print $6 }' temp.aux`; do except $i ; done - rm -f -- temp.aux -.o diff --git a/package/libsemanage/0002-workaround-blackfin-issue.patch b/package/libsemanage/0001-workaround-blackfin-issue.patch index 5d00c6983b..7ce960665c 100644 --- a/package/libsemanage/0002-workaround-blackfin-issue.patch +++ b/package/libsemanage/0001-workaround-blackfin-issue.patch @@ -8,14 +8,15 @@ symbols are visible in the final DSO, which is not a problem for proper execution, it just isn't as clean. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Adam Duskett <Aduskett@gmail.com> Index: b/src/dso.h =================================================================== --- a/src/dso.h +++ b/src/dso.h @@ -1,7 +1,7 @@ - #ifndef _SELINUX_DSO_H - #define _SELINUX_DSO_H 1 + #ifndef _SEPOL_DSO_H + #define _SEPOL_DSO_H 1 -#ifdef SHARED +#if defined(SHARED) && !defined(__bfin__) diff --git a/package/libsemanage/Config.in b/package/libsemanage/Config.in index 4465ef46d8..4318dbfc5f 100644 --- a/package/libsemanage/Config.in +++ b/package/libsemanage/Config.in @@ -1,12 +1,15 @@ config BR2_PACKAGE_LIBSEMANAGE bool "libsemanage" + select BR2_PACKAGE_AUDIT select BR2_PACKAGE_LIBSELINUX select BR2_PACKAGE_USTR select BR2_PACKAGE_BZIP2 + depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - # libselinux needs fts.h (not available in uClibc/musl) and - # libsemanage itself needs getpwent_r() not available in musl + # - libselinux needs fts.h (not available in uClibc/musl) + # - libsemanage itself needs getpwent_r() not available in musl + # - audit is not available on musl depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_arc help @@ -22,5 +25,6 @@ config BR2_PACKAGE_LIBSEMANAGE comment "libsemanage needs a glibc toolchain w/ threads, dynamic library" depends on !BR2_arc + depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index d4204d1b62..69f7c8d3ae 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 de2e8077245581e94576276f54e80a53c23c28d6961d2dfbe2f004eaba452e91 libsemanage-2.1.10.tar.gz +sha256 46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006 libsemanage-2.5.tar.gz diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index 197c14e422..a60d018698 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,11 +4,11 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 2.1.10 -LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20130423 +LIBSEMANAGE_VERSION = 2.5 +LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223 LIBSEMANAGE_LICENSE = LGPLv2.1+ LIBSEMANAGE_LICENSE_FILES = COPYING -LIBSEMANAGE_DEPENDENCIES = host-bison host-flex libselinux ustr bzip2 +LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2 LIBSEMANAGE_INSTALL_STAGING = YES LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) |
