diff options
| author | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-12-16 22:02:29 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-12-16 22:02:29 +0000 |
| commit | c3e685320315cf6d88cccaef50b6f669e6483bde (patch) | |
| tree | 266af5d8744901feb19ba66137b145b27f116e09 | |
| parent | 8748c10f3feda5ab036620a064826b6242e90d89 (diff) | |
| download | aports-c3e685320315cf6d88cccaef50b6f669e6483bde.tar.bz2 aports-c3e685320315cf6d88cccaef50b6f669e6483bde.tar.xz | |
community/libselinux: upgrade to 2.8
| -rw-r--r-- | community/libselinux/0001-libselinux-allow-link-with-lfts.patch | 40 | ||||
| -rw-r--r-- | community/libselinux/APKBUILD | 16 |
2 files changed, 7 insertions, 49 deletions
diff --git a/community/libselinux/0001-libselinux-allow-link-with-lfts.patch b/community/libselinux/0001-libselinux-allow-link-with-lfts.patch deleted file mode 100644 index 744bc4222a..0000000000 --- a/community/libselinux/0001-libselinux-allow-link-with-lfts.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 79e346397327277ab793868e2f9d4a29525b6bf3 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue, 21 Feb 2017 19:50:18 +0100 -Subject: [PATCH] libselinux: allow link with -lfts - -This makes it possible to build libselinux with the external libtfs for -systems which does not implement the non-standard fts. For example musl -libc. - - make FTS_LDFLAGS=-lfts - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - libselinux/src/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile -index 5640a57..513a9e7 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -92,6 +92,7 @@ LD_SONAME_FLAGS=-install_name,$(LIBSO) - endif - - PCRE_LDFLAGS ?= -lpcre -+FTS_LDFLAGS ?= - - override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) - -@@ -143,7 +144,7 @@ $(LIBA): $(OBJS) - $(RANLIB) $@ - - $(LIBSO): $(LOBJS) -- $(CC) $(CFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,$(LD_SONAME_FLAGS) -+ $(CC) $(CFLAGS) -shared -o $@ $^ $(PCRE_LDFLAGS) $(FTS_LDFLAGS) -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,$(LD_SONAME_FLAGS) - ln -sf $@ $(TARGET) - - $(LIBPC): $(LIBPC).in ../VERSION --- -2.11.1 - diff --git a/community/libselinux/APKBUILD b/community/libselinux/APKBUILD index 6e70975b29..baffe4dbfd 100644 --- a/community/libselinux/APKBUILD +++ b/community/libselinux/APKBUILD @@ -1,30 +1,28 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libselinux -pkgver=2.6 -pkgrel=1 +pkgver=2.8 +pkgrel=0 pkgdesc="SELinux library and simple utilities" url="https://github.com/SELinuxProject/selinux/wiki" arch="all" license="Public-Domain" -depends="" -depends_dev="" # we need coreutils for ln --relative -makedepends="$depends_dev pcre-dev linux-headers libsepol-dev fts-dev coreutils" +makedepends="pcre-dev linux-headers libsepol-dev fts-dev coreutils" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-utils" -source="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/libselinux-$pkgver.tar.gz +source="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libselinux-$pkgver.tar.gz " builddir="$srcdir/libselinux-$pkgver" build() { cd "$builddir" - make PCRE_LDFLAGS="-lpcre -lfts" || return 1 + make PCRE_LDLIBS="-lpcre -lfts" } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install } utils() { @@ -33,4 +31,4 @@ utils() { mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/ } -sha512sums="906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b libselinux-2.6.tar.gz" +sha512sums="2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019 libselinux-2.8.tar.gz" |