Updated Apparmor

This is an update for the apparmor package

3 files changed, 31 insertions, 27 deletions

diff --git a/pcr/apparmor/PKGBUILD b/pcr/apparmor/PKGBUILD
index 070f4c64f..def30d3e4 100644
--- a/pcr/apparmor/PKGBUILD
+++ b/pcr/apparmor/PKGBUILD
@@ -1,36 +1,43 @@
-# Mantainer (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: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: David P. <megver83@parabola.nu>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Marcin Wieczorek <marcin@marcin.co>
+# 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.10
+pkgver=2.11.0
 #_majorver=${pkgver%.*}  # bleh, AUR...
-_majorver=2.10
-pkgrel=2
+_majorver=2.11
+pkgrel=1
 pkgdesc='Linux application security framework - mandatory access control for programs'
 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')
+makedepends=('flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit')
 
-source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname-$pkgver.tar.gz"
+source=(https://launchpad.net/$pkgname/${_majorver}/${_majorver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}
         "apparmor_load.sh"
         "apparmor_unload.sh"
         "apparmor.service")
 
-sha256sums=('4d0e224257a29671b694bd9054edf0dd213aa690fd02844ecf3329b86ac506f4'
-            'd2fea5a62bacae350cfe56bad1b293c12afe803bec10e546b901324e582e89af'
-            '076aebfa815543f85d26215056a921996fbff14d1678ddfa07ab50dbfda94ba1'
+sha256sums=('b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a'
+            'SKIP'
+            '124300162dab2a923c024b91c5a977dbee901376a22eefc64cad2f91319876d5'
+            '9704478ae13fe1c3fb2747afac86c31b1b4593493f0e1425ae2b77d47878e32e'
             'eea47ec2a3fb0c1104193bed91586cfccda745f2e0a473f6d1d2a0d2fe42c413')
 
+# 3D3664BB: AppArmor Development Team (AppArmor signing key) <apparmor@lists.ubuntu.com>
+validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
+
 #Configuration
 core_perl_dir='/usr/bin/core_perl'
 export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man"
 export MAKEFLAGS+=" POD2HTML=${core_perl_dir}/pod2html"
+export MAKEFLAGS+=" PODCHECKER=${core_perl_dir}/podchecker"
 export MAKEFLAGS+=" PROVE=${core_perl_dir}/prove"
 export MAKEFLAGS+=" PYTHON=python3"
 
@@ -52,7 +59,7 @@ prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d"
   # /usr merge vs. profiles
   for i in `find . -name "*sbin*"`; do sed -i -e 's@sbin@bin@g' ${i} && mv ${i} ${i/sbin/bin}; done
-  for i in klogd ping syslog-ng syslogd; do 
+  for i in klogd ping syslog-ng syslogd; do
     sed -e "s@/bin/${i}@/usr/bin/${i}@g" \
         -e "s@bin\.${i}@usr\.bin\.${i}@g" \
         -i bin.${i} && \
@@ -94,7 +101,7 @@ package_apparmor() {
 
 package_apparmor-parser() {
   pkgdesc='AppArmor parser - loads AA profiles to kernel module'
-  depends=('apparmor-libapparmor' 'bash')
+  depends=('apparmor-libapparmor')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C parser install DESTDIR=${pkgdir}
@@ -108,18 +115,18 @@ package_apparmor-libapparmor() {
   depends=('python')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C libraries/libapparmor install DESTDIR=${pkgdir}
+  make -C libraries/libapparmor install DESTDIR="${pkgdir}"
   install -D -m644 "libraries/libapparmor/swig/perl/LibAppArmor.pm" "${pkgdir}/usr/lib/perl5/vendor_perl/"
 }
 
 package_apparmor-utils() {
   pkgdesc='AppArmor userspace utilities'
-  depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' 
-    'perl-file-tail' 'perl-rpc-xml' 'python' 'bash')
+  depends=('perl' 'perl-locale-gettext' 'perl-term-readkey'
+    'perl-file-tail' 'perl-rpc-xml' 'python')
   install='apparmor-utils.install'
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C utils install DESTDIR=${pkgdir} BINDIR=${pkgdir}/usr/bin
+  make -C utils install DESTDIR="${pkgdir}" BINDIR="${pkgdir}/usr/bin"
   install -D -m755 "${srcdir}/apparmor_load.sh" "${pkgdir}/usr/bin/apparmor_load.sh"
   install -D -m755 "${srcdir}/apparmor_unload.sh" "${pkgdir}/usr/bin/apparmor_unload.sh"
   install -D -m644 "${srcdir}/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service"
@@ -135,7 +142,7 @@ package_apparmor-profiles() {
   backup=(`echo ${_profiles[@]}`)
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C profiles install DESTDIR=${pkgdir}
+  make -C profiles install DESTDIR="${pkgdir}"
 }
 
 package_apparmor-pam() {
@@ -143,7 +150,7 @@ package_apparmor-pam() {
   depends=('apparmor-libapparmor' 'pam')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C changehat/pam_apparmor install DESTDIR=${pkgdir}/usr
+  make -C changehat/pam_apparmor install DESTDIR="${pkgdir}/usr"
   install -D -m644 changehat/pam_apparmor/README "${pkgdir}/usr/share/doc/apparmor/README.pam_apparmor"
 }
 package_apparmor-vim() {
diff --git a/pcr/apparmor/apparmor_load.sh b/pcr/apparmor/apparmor_load.sh
index 30ce04086..663ebc045 100644
--- a/pcr/apparmor/apparmor_load.sh
+++ b/pcr/apparmor/apparmor_load.sh
@@ -2,4 +2,4 @@
 
 aa_profiles='/etc/apparmor.d/'
 aa_log='/var/log/apparmor.init.log'
-/usr/bin/apparmor_parser -r $(find "$aa_profiles" -maxdepth 1 -type f) 2>> "$aa_log"
+find "$aa_profiles" -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -r {} + 2>> "$aa_log"
diff --git a/pcr/apparmor/apparmor_unload.sh b/pcr/apparmor/apparmor_unload.sh
index de13938ab..f2d987dc2 100644
--- a/pcr/apparmor/apparmor_unload.sh
+++ b/pcr/apparmor/apparmor_unload.sh
@@ -2,7 +2,4 @@
 
 aa_profiles='/etc/apparmor.d/'
 aa_log='/var/log/apparmor.init.log'
-PROFILES=`find "$aa_profiles" -maxdepth 1 -type f`
-for profile in $PROFILES; do
-    apparmor_parser -R "$profile" 2>> "$aa_log"
-done
+find "$aa_profiles" -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -R {} \; 2>> "$aa_log"