summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-12-12 16:17:04 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-12-12 16:17:04 -0200
commit732e9bfc2b8c14cdf68c537bec09c3aa58746f54 (patch)
tree6fd1a81775a9c9c102da1f3fc0ee43d853ee163c /pcr
parentd34446eefcef9f8098c7493d23be95aac9b3496c (diff)
parent22551fc31b10669bb8cd18323797247e41621ba8 (diff)
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre
Diffstat (limited to 'pcr')
-rw-r--r--pcr/apparmor/PKGBUILD20
-rw-r--r--pcr/apparmor/apparmor.service4
2 files changed, 13 insertions, 11 deletions
diff --git a/pcr/apparmor/PKGBUILD b/pcr/apparmor/PKGBUILD
index 9dd9061da..cb1bbd75b 100644
--- a/pcr/apparmor/PKGBUILD
+++ b/pcr/apparmor/PKGBUILD
@@ -1,18 +1,18 @@
-# Contributor (Arch) : Thomas Kuther <archlinux@kuther.net>
-# Contributor (Arch) : Gianni Vialetto <gianni at rootcube dot net>
-# Contributor (Arch) : Paul N. Maxwell <msg dot maxwel at gmail dot com>
-# Contributor (Arch) : Thomas Mudrunka <harvie@@email..cz>
-# Contributor (Arch) : Max Fierke <max@maxfierke.com>
-# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
+# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>
+# Contributor: Thomas Kuther <archlinux@kuther.net>
+# Contributor: Gianni Vialetto <gianni at rootcube dot net>
+# Contributor: Paul N. Maxwell <msg dot maxwel at gmail dot com>
+# Contributor: Thomas Mudrunka <harvie@@email..cz>
+# Contributor: Max Fierke <max@maxfierke.com>
pkgbase=apparmor
pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim)
-pkgver=2.8.3
+pkgver=2.9.0
#_majorver=${pkgver%.*} # bleh, AUR...
-_majorver=2.8
+_majorver=2.9
pkgrel=1
pkgdesc='Linux application security framework - mandatory access control for programs'
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
license=('GPL')
url='http://wiki.apparmor.net/index.php/Main_Page'
makedepends=('bzr' 'flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit')
@@ -22,12 +22,12 @@ source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname-
"apparmor_unload.sh"
"apparmor.service")
-
#Configuration
core_perl_dir='/usr/bin/core_perl'
export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man"
export MAKEFLAGS+=" POD2HTML=${core_perl_dir}/pod2html"
export MAKEFLAGS+=" PROVE=${core_perl_dir}/prove"
+export MAKEFLAGS+=" PYTHON=python3"
prepare() {
diff --git a/pcr/apparmor/apparmor.service b/pcr/apparmor/apparmor.service
index 7cee03ad9..200d9be74 100644
--- a/pcr/apparmor/apparmor.service
+++ b/pcr/apparmor/apparmor.service
@@ -1,5 +1,7 @@
[Unit]
Description=AppArmor profiles
+DefaultDependencies=no
+Before=sysinit.target
[Service]
Type=oneshot
@@ -8,4 +10,4 @@ ExecStop=/usr/bin/apparmor_unload.sh
RemainAfterExit=yes
[Install]
-WantedBy=basic.target
+WantedBy=multi-user.target