summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2018-10-30 17:54:45 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2018-10-30 17:54:45 +0100
commitd00ea7cb8b4cf04d634e07a6ecf9d12d0e0bd97a (patch)
tree4b0102880127c4ecffa918da255faba43dd5d048
parent2fc2879164ce6cdc43c5e41e97244651b4357f67 (diff)
downloadcogitri-d00ea7cb8b4cf04d634e07a6ecf9d12d0e0bd97a.tar.gz
cogitri-d00ea7cb8b4cf04d634e07a6ecf9d12d0e0bd97a.tar.xz
apparmor: version bump to 2.13.1
-rw-r--r--packages/security/apparmor/apparmor-2.13.1.exheres-0 (renamed from packages/security/apparmor/apparmor-2.13-r2.exheres-0)0
-rw-r--r--packages/security/apparmor/apparmor.exlib32
-rw-r--r--packages/security/apparmor/files/use-correct-sbin.patch6
3 files changed, 21 insertions, 17 deletions
diff --git a/packages/security/apparmor/apparmor-2.13-r2.exheres-0 b/packages/security/apparmor/apparmor-2.13.1.exheres-0
index 75f7fc4..75f7fc4 100644
--- a/packages/security/apparmor/apparmor-2.13-r2.exheres-0
+++ b/packages/security/apparmor/apparmor-2.13.1.exheres-0
diff --git a/packages/security/apparmor/apparmor.exlib b/packages/security/apparmor/apparmor.exlib
index 72266ac..21b2e31 100644
--- a/packages/security/apparmor/apparmor.exlib
+++ b/packages/security/apparmor/apparmor.exlib
@@ -1,7 +1,7 @@
# Copyright 2018 Rasmus Thomsen <cogitri@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require gitlab [ tag=v${PV} ] openrc-service s6-rc-service
+require gitlab [ tag=v${PV} ] openrc-service s6-rc-service systemd-service
require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
require python [ blacklist=none multibuild=false ]
@@ -16,7 +16,6 @@ includes all of its user-space utilities and profiles.
LICENCES="GPL-2"
SLOT="0"
-
MYOPTIONS="
extra-profiles [[
description = [ Add extra downstream profiles (e.g. for pulseaudio) ]
@@ -57,7 +56,16 @@ apparmor_src_prepare() {
apparmor_src_configure() {
edo pushd libraries/libapparmor
- econf --with-perl --with-python
+
+ local myconf=(
+ --enable-static
+ --with-perl
+ --with-python
+ --without-ruby
+ )
+
+ econf "${myconf[@]}"
+
edo popd
}
@@ -76,23 +84,19 @@ apparmor_src_install() {
dodir /usr/$(exhost --target)/lib/apparmor
emake -C libraries/libapparmor DESTDIR="${IMAGE}" install
- emake -C parser DISTRO="unknown" SBINDIR="${IMAGE}/usr/$(exhost --target)/bin" APPARMOR_BIN_PREFIX="${IMAGE}/usr/$(exhost --target)/lib/apparmor" DESTDIR="${IMAGE}" SYSTEMD_UNIT_DIR="${IMAGE}/usr/$(exhost --target)/lib/systemd/system" install install-systemd
- emake -C utils BINDIR="${IMAGE}/usr/$(exhost --target)/bin" DESTDIR="${IMAGE}" install
- emake -C binutils BINDIR="${IMAGE}/usr/$(exhost --target)/bin" DESTDIR="${IMAGE}" install
+ emake -C parser DISTRO="unknown" SBINDIR="${IMAGE}"/usr/$(exhost --target)/bin APPARMOR_BIN_PREFIX="${IMAGE}"/usr/$(exhost --target)/lib/apparmor DESTDIR="${IMAGE}" SYSTEMD_UNIT_DIR="${IMAGE}"/${SYSTEMDSYSTEMUNITDIR} install install-systemd
+ emake -C utils BINDIR="${IMAGE}"/usr/$(exhost --target)/bin DESTDIR="${IMAGE}" install
+ emake -C binutils BINDIR="${IMAGE}"/usr/$(exhost --target)/bin DESTDIR="${IMAGE}" install
emake -C profiles DESTDIR="${IMAGE}" install
- dodir /etc/apparmor.d/disable
keepdir /etc/apparmor.d/disable
-
keepdir /var/lib/apparmor
- edo chmod 755 "${IMAGE}"/usr/$(exhost --target)/lib/apparmor/apparmor.systemd
-
# TODO: Their custom python script thingie installs into these paths :(
- edo mv "${IMAGE}/usr/bin/aa-easyprof" "${IMAGE}/usr/$(exhost --target)/bin"
- edo rmdir "${IMAGE}/usr/bin"
- edo cp -r "${IMAGE}/usr/lib/python$(python_get_abi)/" "${IMAGE}/usr/$(exhost --target)/lib/python$(python_get_abi)"
- edo rm -r "${IMAGE}/usr/lib"
+ edo mv "${IMAGE}"/usr/bin/aa-easyprof "${IMAGE}"/usr/$(exhost --target)/bin
+ edo rmdir "${IMAGE}"/usr/bin
+ edo cp -r "${IMAGE}"/usr/lib/python$(python_get_abi)/ "${IMAGE}"/usr/$(exhost --target)/lib/python$(python_get_abi)
+ edo rm -r "${IMAGE}"/usr/lib
install_openrc_files
install_s6-rc_files
diff --git a/packages/security/apparmor/files/use-correct-sbin.patch b/packages/security/apparmor/files/use-correct-sbin.patch
index cf7c091..a67b214 100644
--- a/packages/security/apparmor/files/use-correct-sbin.patch
+++ b/packages/security/apparmor/files/use-correct-sbin.patch
@@ -45,9 +45,9 @@ index b18cfe4..9850c7e 100644
@@ -384,8 +385,8 @@ install-systemd:
install -m 755 -d $(SYSTEMD_UNIT_DIR)
install -m 644 apparmor.service $(SYSTEMD_UNIT_DIR)
- install -m 644 apparmor.systemd $(APPARMOR_BIN_PREFIX)
-- install -m 755 -d $(DESTDIR)/sbin
-- install -m 755 aa-teardown $(DESTDIR)/sbin
+ install -m 755 apparmor.systemd $(APPARMOR_BIN_PREFIX)
+- install -m 755 -d $(DESTDIR)/usr/sbin
+- install -m 755 aa-teardown $(DESTDIR)/usr/sbin
+ install -m 755 -d $(SBINDIR)
+ install -m 755 aa-teardown $(SBINDIR)