aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2021-07-14 15:48:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2021-07-14 15:48:14 +0000
commit630cfd6f38eddce25fd3511030d149922ac16f47 (patch)
tree0c62755ca4120bca95259bd842dd86aa5988d624
parent11b377d977145c36d8fd7312878ea471d3c5448e (diff)
downloadaports-630cfd6f38eddce25fd3511030d149922ac16f47.tar.gz
aports-630cfd6f38eddce25fd3511030d149922ac16f47.tar.bz2
aports-630cfd6f38eddce25fd3511030d149922ac16f47.tar.xz
community/libselinux: upgrade to 3.2
-rw-r--r--community/libselinux/APKBUILD16
-rw-r--r--community/libselinux/musl.patch19
2 files changed, 9 insertions, 26 deletions
diff --git a/community/libselinux/APKBUILD b/community/libselinux/APKBUILD
index 4a3d0d4d3d..e9f3af0f75 100644
--- a/community/libselinux/APKBUILD
+++ b/community/libselinux/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libselinux
-pkgver=2.8
+pkgver=3.2
pkgrel=0
pkgdesc="SELinux library and simple utilities"
url="https://github.com/SELinuxProject/selinux/wiki"
@@ -9,14 +9,15 @@ license="Public-Domain"
# we need coreutils for ln --relative
makedepends="pcre-dev linux-headers libsepol-dev fts-dev coreutils"
subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libselinux-$pkgver.tar.gz
- musl.patch
+source="https://github.com/SELinuxProject/selinux/releases/download/$pkgver/libselinux-$pkgver.tar.gz
"
-[ "$CARCH" = "riscv64" ] && options="textrels"
+if [ "$CARCH" = "riscv64" ]; then
+ options="textrels"
+fi
build() {
- make PCRE_LDLIBS="-lpcre -lfts"
+ make FTS_LDLIBS="-lfts"
}
package() {
@@ -29,5 +30,6 @@ utils() {
mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/
}
-sha512sums="2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019 libselinux-2.8.tar.gz
-e5de8fb698222cdbec7a9a7af62419ed567d896a33caafc1b1c9c4741ae1e1d20be536b94a4b49393329b4a6526eb6435178aac689008ec665e12cbfe6eb332f musl.patch"
+sha512sums="
+18129ac0b9936e1f66021f1b311cf1c1e27a01e50cb70f08a3e1c642c5251e4538aec25a8427778569dfecf5333cf1fb84f1a59afdce8019328d0cff7e5833c5 libselinux-3.2.tar.gz
+"
diff --git a/community/libselinux/musl.patch b/community/libselinux/musl.patch
deleted file mode 100644
index d7321af05d..0000000000
--- a/community/libselinux/musl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/procattr.c b/src/procattr.c
-index 48dd8af..8fa31d8 100644
---- a/src/procattr.c
-+++ b/src/procattr.c
-@@ -22,14 +22,6 @@ static pthread_key_t destructor_key;
- static int destructor_key_initialized = 0;
- static __thread char destructor_initialized;
-
--#ifndef __BIONIC__
--/* Bionic declares this in unistd.h and has a definition for it */
--static pid_t gettid(void)
--{
-- return syscall(__NR_gettid);
--}
--#endif
--
- static void procattr_thread_destructor(void __attribute__((unused)) *unused)
- {
- if (prev_current != UNSET)