diff options
| author | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-12-16 22:06:02 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-12-16 22:06:02 +0000 |
| commit | c4248a0062f5561ff959dd738d4331f8d7d36101 (patch) | |
| tree | cb885bad459f492932122642f7fa8d2d76bd3030 /testing | |
| parent | 212a9e33b40936d7c7fcbdb886c13014ed238d03 (diff) | |
| download | aports-c4248a0062f5561ff959dd738d4331f8d7d36101.tar.bz2 aports-c4248a0062f5561ff959dd738d4331f8d7d36101.tar.xz | |
testing/policycoreutils: upgrade to 2.8
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/policycoreutils/0001-drop-some-binaries-from-policycoreutils.patch | 30 | ||||
| -rw-r--r-- | testing/policycoreutils/APKBUILD | 37 | ||||
| -rw-r--r-- | testing/policycoreutils/busybox-install-compat.patch | 11 |
3 files changed, 34 insertions, 44 deletions
diff --git a/testing/policycoreutils/0001-drop-some-binaries-from-policycoreutils.patch b/testing/policycoreutils/0001-drop-some-binaries-from-policycoreutils.patch deleted file mode 100644 index d9afa92e67..0000000000 --- a/testing/policycoreutils/0001-drop-some-binaries-from-policycoreutils.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a72fed555a3d2698b3aebc7a429c9f038139308d Mon Sep 17 00:00:00 2001 -From: Tycho Andersen <tycho@docker.com> -Date: Thu, 16 Mar 2017 11:48:08 -0700 -Subject: [PATCH] drop some binaries from policycoreutils - -Signed-off-by: Tycho Andersen <tycho@docker.com> ---- - policycoreutils/Makefile | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 962ac12..817fe36 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,11 +1,7 @@ --SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll -+SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll - - INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) - --ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) -- SUBDIRS += restorecond --endif -- - all install relabel clean indent: - @for subdir in $(SUBDIRS); do \ - (cd $$subdir && $(MAKE) $@) || exit 1; \ --- -2.11.1 - diff --git a/testing/policycoreutils/APKBUILD b/testing/policycoreutils/APKBUILD index 0ab136903a..603069432b 100644 --- a/testing/policycoreutils/APKBUILD +++ b/testing/policycoreutils/APKBUILD @@ -1,34 +1,43 @@ # Maintainer: Tycho Andersen <tycho@docker.com> pkgname=policycoreutils -pkgver=2.6 -pkgrel=1 +pkgver=2.8 +pkgrel=0 pkgdesc="SELinux policy core utilities" url="https://selinuxproject.org/" arch="all" license="GPL-2.0" -depends="libsepol libselinux libsemanage gettext linux-pam python audit-libs" -depends_dev="" -makedepends="$depends_dev fts-dev libsepol-dev libselinux-dev libsemanage-dev gawk bsd-compat-headers linux-headers gettext-dev linux-pam-dev libcap-ng-dev coreutils python audit-dev" +depends="" +makedepends=" + gettext-dev + libsepol-dev + libselinux-dev + libsemanage-dev + fts-dev + linux-pam-dev + libcap-ng-dev + audit-dev + + gawk + " install="" subpackages="$pkgname-doc $pkgname-lang" -source="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014/policycoreutils-$pkgver.tar.gz - 0001-drop-some-binaries-from-policycoreutils.patch +source="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/policycoreutils-2.8.tar.gz 0002-hack-around-GLOB-BRACE-TILDE.patch -" + busybox-install-compat.patch + " builddir="$srcdir/policycoreutils-$pkgver" options="suid" build() { cd "$builddir" - # we use the static library for libsepol because it's the only one that exports hasthab_ symbols; the .so doesn't - make LDLIBS="-lintl -lselinux -laudit -lcap-ng -lpam -lpam_misc -lsemanage /usr/lib/libsepol.a" LSPP_PRIV=y || return 1 + make LDLIBS="$LDLIBS -lintl" LSPP_PRIV=y } package() { cd "$builddir" - make LSPP_PRIV=y DESTDIR="$pkgdir" install || return 1 + make LSPP_PRIV=y DESTDIR="$pkgdir" install } -sha512sums="ba289060bc348f9315bce84a5e5daf145600274289fdd2206edc10bb0ee03f9b02a9e40e9c118809961ddfe7844dee7d8952d8c9a239af7282f4fc1614c21e9d policycoreutils-2.6.tar.gz -50fe8865c13a2d05827bc639ce7f04f0754f8b04419cf8580611da5c97857da777183b3643f98c53beab480edfcee3d2b444b7b882d1553b98a899670b6dee03 0001-drop-some-binaries-from-policycoreutils.patch -d611ca3107439fbdb9618a72f55cb66e299fa71392821b223343aa314c65af3e67d6e79ff40e93eca9a20dd0e90c660393c604a18048fcf293374cf2bc61e918 0002-hack-around-GLOB-BRACE-TILDE.patch" +sha512sums="2b4a70836fd8727a16b8f8d4afcc39c9461ab6f5bc1ba5ce5833d41150da921ebb3c9bdbd1cfa7dd31fd382ba18b5433ca9b63bce58bd290db81fa9bedfe29f3 policycoreutils-2.8.tar.gz +d611ca3107439fbdb9618a72f55cb66e299fa71392821b223343aa314c65af3e67d6e79ff40e93eca9a20dd0e90c660393c604a18048fcf293374cf2bc61e918 0002-hack-around-GLOB-BRACE-TILDE.patch +cc0244d19b0ef4c0453d5ba02144f9a47c61164b55e8ed946c25075e1fac6401edbd46b2efc8ac0e733e1989ec6755409512b8a5c3e6ff31d59ad43b3ba41783 busybox-install-compat.patch" diff --git a/testing/policycoreutils/busybox-install-compat.patch b/testing/policycoreutils/busybox-install-compat.patch new file mode 100644 index 0000000000..aba281d57a --- /dev/null +++ b/testing/policycoreutils/busybox-install-compat.patch @@ -0,0 +1,11 @@ +--- ./po/Makefile.orig ++++ ./po/Makefile +@@ -130,7 +130,7 @@ + @for n in $(MOFILES); do \ + l=`basename $$n .mo`; \ + $(INSTALL_DIR) $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES; \ +- $(INSTALL_DATA) --verbose $$n $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \ ++ $(INSTALL_DATA) $$n $(DESTDIR)$(INSTALL_NLS_DIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \ + done + + %.mo: %.po |