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

[David Runge]

    Date: Thursday, April 23, 2020 @ 18:24:02
  Author: dvzrv
Revision: 381217

upgpkg: apparmor 2.13.4-4: Adding upstream fix for generation of vim files (FS#65450).

Modified:
  apparmor/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-23 17:56:19 UTC (rev 381216)
+++ PKGBUILD	2020-04-23 18:24:02 UTC (rev 381217)
@@ -2,7 +2,7 @@
 
 pkgname=apparmor
 pkgver=2.13.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor"
@@ -21,11 +21,13 @@
         'etc/apparmor/severity.db')
 source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}
         "${pkgname}-2.13.4-make4.3.patch::https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"
+        "${pkgname}-2.13.4-vim_file.patch::https://gitlab.com/apparmor/apparmor/-/merge_requests/472.patch"
         "${pkgname}-2.13.4-run_variable.patch::https://gitlab.com/apparmor/apparmor/-/commit/454fca7483eae7b7ee613343c2c02abaa20e37e3.patch"
         "${pkgname}-2.13.4-fix_systemd_userdb.patch::https://gitlab.com/apparmor/apparmor/-/commit/d4296d217c888e08e10bec300fe35351c2ef2f81.patch")
 sha512sums=('d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651'
             'SKIP'
             '8d0eb65624a7dcc7f019974a7ad10ec0b3e2d61e51a3f9771564b4e0ddaaece17e90f78388933e8f9451ad413a51dd16d479b99733ceef73b86eb8308122a335'
+            '987d2d0dd1148c28796cbb933ea79a14ef2bdf903253a10f369614f0cbbd0309c9848e28dd2f2aa216d8deaf8412e6dd043e867da34466fe39169fc0e44f07ad'
             '0abe606ad510cc97947152b28750354bd43046b38abcd6b28bbc04916fad39308f78b3626ca8b4a3ec59612fea908bdef2e309376f617595b5fc1aaec2bc6343'
             '0fde84730115b2854b85d1b72fbbd5c54730e887af333bfff917da529a08a429d3494efdae9d1baa1d05891d925b04d69f079d11d4afb0907cbfefbd0f280583')
 # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
@@ -37,6 +39,9 @@
   # fix problems in Makefile (header inclusion):
   # https://gitlab.com/apparmor/apparmor/-/issues/74
   patch -Np1 -i "../${pkgname}-2.13.4-make4.3.patch"
+  # fix generating of apparmor.vim:
+  # https://bugs.archlinux.org/task/65450
+  patch -Np1 -i "../${pkgname}-2.13.4-vim_file.patch"
   # fix problems with /run/systemd/userdb access
   # https://bugs.archlinux.org/task/65777
   # https://gitlab.com/apparmor/apparmor/-/issues/82