libselinux: update to 3.11
This commit is contained in:
committed by
Duncan Overbruck
parent
b25ddba948
commit
fc3e7aef99
@@ -1,13 +0,0 @@
|
||||
diff --git utils/Makefile utils/Makefile
|
||||
index 3615063..3c1be17 100644
|
||||
--- a/utils/Makefile
|
||||
+++ b/utils/Makefile
|
||||
@@ -47,6 +47,8 @@ override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS)
|
||||
override LDFLAGS += -L../src
|
||||
override LDLIBS += -lselinux
|
||||
PCRE_LDLIBS ?= -lpcre
|
||||
+FTS_LDLIBS ?=
|
||||
+override LDLIBS += $(FTS_LDLIBS)
|
||||
|
||||
ifeq ($(ANDROID_HOST),y)
|
||||
TARGETS=sefcontext_compile
|
||||
@@ -1,30 +0,0 @@
|
||||
musl defines gettid(), current glibc is >2.30
|
||||
|
||||
--- a/src/procattr.c
|
||||
+++ b/src/procattr.c
|
||||
@@ -22,25 +22,6 @@
|
||||
static int destructor_key_initialized = 0;
|
||||
static __thread char destructor_initialized;
|
||||
|
||||
-/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and
|
||||
- * has a definition for it */
|
||||
-#ifdef __BIONIC__
|
||||
- #define OVERRIDE_GETTID 0
|
||||
-#elif !defined(__GLIBC_PREREQ)
|
||||
- #define OVERRIDE_GETTID 1
|
||||
-#elif !__GLIBC_PREREQ(2,30)
|
||||
- #define OVERRIDE_GETTID 1
|
||||
-#else
|
||||
- #define OVERRIDE_GETTID 0
|
||||
-#endif
|
||||
-
|
||||
-#if OVERRIDE_GETTID
|
||||
-static pid_t gettid(void)
|
||||
-{
|
||||
- return syscall(__NR_gettid);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
static void procattr_thread_destructor(void __attribute__((unused)) *unused)
|
||||
{
|
||||
if (prev_current != UNSET)
|
||||
@@ -1,18 +1,17 @@
|
||||
# Template file for 'libselinux'
|
||||
pkgname=libselinux
|
||||
version=3.0
|
||||
revision=2
|
||||
_tag=20191204
|
||||
version=3.11
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
make_install_args="SHLIBDIR=/usr/lib SBINDIR=/usr/bin"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libsepol-devel pcre-devel"
|
||||
makedepends="libsepol-devel pcre2-devel"
|
||||
short_desc="SELinux library and simple utilities"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="GPL-2.0-only"
|
||||
homepage="https://www.nsa.gov/what-we-do/research/selinux/"
|
||||
distfiles="https://github.com/SELinuxProject/selinux/releases/download/${_tag}/${pkgname}-${version}.tar.gz"
|
||||
checksum=2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433
|
||||
distfiles="https://github.com/SELinuxProject/selinux/releases/download/${version}/libselinux-${version}.tar.gz"
|
||||
checksum=73d419c6e20e874adaa4019372cbd097eecf4d276e13f27ec5e67d35c0bd203c
|
||||
|
||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||
makedepends+=" musl-fts-devel"
|
||||
|
||||
Reference in New Issue
Block a user