summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorNicolas Iooss2016-08-16 10:18:47 +0200
committerNicolas Iooss2016-08-16 10:18:47 +0200
commit5f8a4aa9ef53c19e192342eb4108c6c405d1e101 (patch)
treed35731f1c25acaaacf2dae811ee0a62d873a2897 /PKGBUILD
parentc5d4a9a840d587678e42ad18ce5b1c9e2bc80514 (diff)
downloadaur-5f8a4aa9ef53c19e192342eb4108c6c405d1e101.tar.gz
libselinux 2.5-2 update
Backport fixes to make systemd 231 works on systems when SELinux is installed but disabled.
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD15
1 files changed, 12 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 95eb4457b9b..ee95fe76d63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=libselinux
pkgver=2.5
-pkgrel=1
+pkgrel=2
pkgdesc="SELinux library and simple utilities"
arch=('i686' 'x86_64' 'armv6h')
url='http://userspace.selinuxproject.org'
@@ -21,14 +21,23 @@ conflicts=("selinux-usr-${pkgname}")
provides=("selinux-usr-${pkgname}=${pkgver}-${pkgrel}")
options=(!emptydirs)
source=("https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/${pkgname}-${pkgver}.tar.gz"
- "libselinux.tmpfiles.d")
+ "libselinux.tmpfiles.d"
+ "0001-libselinux-only-mount-proc-if-necessary.patch"
+ "0002-Avoid-mounting-proc-outside-of-selinux_init_load_pol.patch")
sha256sums=('94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f'
- 'afe23890fb2e12e6756e5d81bad3c3da33f38a95d072731c0422fbeb0b1fa1fc')
+ 'afe23890fb2e12e6756e5d81bad3c3da33f38a95d072731c0422fbeb0b1fa1fc'
+ 'da3ed20d45b7656c25411bcc31109a78b64265978839bbc06b25151a7231611c'
+ '1d20ae0d6fb39dd93258388297206980cb530b04511c4b16db247e05c84804a8')
prepare() {
cd "${pkgname}-${pkgver}"
sed -i 's|pkg-config --cflags ruby|pkg-config --cflags ruby-$(RUBYLIBVER)|' src/Makefile
sed -i 's|site_ruby|vendor_ruby|' src/Makefile
+
+ # Backport commits to fix issues when SELinux is disabled
+ # https://github.com/systemd/systemd/issues/3962#issuecomment-239827399
+ patch -Np2 -i "../0001-libselinux-only-mount-proc-if-necessary.patch"
+ patch -Np2 -i "../0002-Avoid-mounting-proc-outside-of-selinux_init_load_pol.patch"
}
build() {