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

[David Runge]

    Date: Wednesday, June 5, 2019 @ 10:45:10
  Author: dvzrv
Revision: 476964

upgpkg: apparmor 2.13.2-4

Applying upstream patch for swig >= 4.0.0, which broke the libraries/libapparmor checks.

Modified:
  apparmor/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-05 10:20:13 UTC (rev 476963)
+++ PKGBUILD	2019-06-05 10:45:10 UTC (rev 476964)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge <dave at sleepmap.de>
 pkgname=apparmor
 pkgver=2.13.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor"
@@ -20,9 +20,11 @@
         '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})
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        "${pkgname}-2.13.2-swig4.patch::https://gitlab.com/apparmor/apparmor/merge_requests/384.patch")
 sha512sums=('2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f'
-            'SKIP')
+            'SKIP'
+            'd80dfb222b43a6b347cb952ec7672e3bc24d144a8678fab737520823ff84c45d6a4bd997416c5f67679fdf58172843003dd0c8dbed0f30646a6937922683d9ff')
 # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -46,6 +48,8 @@
   # fix default installation path for vim syntax file
   sed -e 's/share\/apparmor/share\/vim\/vimfiles\/syntax/' \
       -i utils/vim/Makefile
+  # fix issue with swig >= 4.0.0: https://gitlab.com/apparmor/apparmor/issues/33
+  patch -Np1 -i "../${pkgname}-2.13.2-swig4.patch"
   cd libraries/libapparmor/
   autoreconf -vfi
 }
@@ -75,9 +79,7 @@
 
 check() {
   cd "$pkgname-$pkgver"
-# failing python checks:
-# https://gitlab.com/apparmor/apparmor/issues/33
-#  make -C libraries/libapparmor check
+  make -C libraries/libapparmor check
   make -C binutils check
 # parser checks don't run on non-apparmor enabled kernel
 #  make -C parser check