[arch-commits] Commit in apparmor/trunk (PKGBUILD)

[David Runge]

    Date: Saturday, December 22, 2018 @ 22:10:00
  Author: dvzrv
Revision: 417566

upgpkg: apparmor 2.13.2-1

Upgrading to 2.13.2. Removing now included fix for syntax error in rc.apparmor.functions. Adding mod_apparmor for apache.

Modified:
  apparmor/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-22 20:48:19 UTC (rev 417565)
+++ PKGBUILD	2018-12-22 22:10:00 UTC (rev 417566)
@@ -1,13 +1,13 @@
 # Maintainer: David Runge <dave at sleepmap.de>
 pkgname=apparmor
-pkgver=2.13.1
-pkgrel=3
+pkgver=2.13.2
+pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor"
-license=('GPL')
+license=('GPL2' 'LGPL2.1')
 depends=('audit' 'pam' 'python')
-makedepends=('swig' 'ruby')
+makedepends=('apache' 'ruby' 'swig')
 checkdepends=('dejagnu' 'python-pyflakes')
 optdepends=('perl: perl bindings'
             'ruby: ruby bindings')
@@ -20,11 +20,9 @@
         'etc/apparmor/parser.conf'
         'etc/apparmor/subdomain.conf'
         'etc/apparmor/severity.db')
-source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "https://gitlab.com/${pkgname}/${pkgname}/merge_requests/240.diff")
-sha512sums=('e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7'
-            'SKIP'
-            'f784a6939352d12f9641d70e58447d1cfd018a6986141d4c9e8188032d71532b8c9dd38c4fec99d08bbe464527eb7031c504803de702a9ece4e331a1fea0980a')
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})
+sha512sums=('2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f'
+            'SKIP')
 # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -48,9 +46,6 @@
   # fix default installation path for vim syntax file
   sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
       -i utils/vim/Makefile
-  # fixing syntax error in rc.apparmor.functions:
-  # https://gitlab.com/apparmor/apparmor/merge_requests/240/diffs
-  patch -Np1 -i ../240.diff
   cd libraries/libapparmor/
   autoreconf -vfi
 }
@@ -74,6 +69,7 @@
   make -C profiles
   make -C utils
   make -C changehat/pam_apparmor
+  make -C changehat/mod_apparmor
   make -C utils/vim
 }
 
@@ -92,6 +88,7 @@
   cd "$pkgname-$pkgver"
   make -C libraries/libapparmor DESTDIR="${pkgdir}" install
   make -C changehat/pam_apparmor DESTDIR="${pkgdir}/usr" install
+  make -C changehat/mod_apparmor DESTDIR="${pkgdir}" install
   make -C binutils DESTDIR="${pkgdir}" install
   make -C parser DESTDIR="${pkgdir}" install
   make -C parser DESTDIR="${pkgdir}" install-systemd