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

[David Runge]

    Date: Monday, October 15, 2018 @ 09:14:21
  Author: dvzrv
Revision: 393990

upgpkg: apparmor 2.13.1-1

Upgrading to 2.13.1. Removing binmerge patch (now included).

Modified:
  apparmor/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-15 08:31:04 UTC (rev 393989)
+++ PKGBUILD	2018-10-15 09:14:21 UTC (rev 393990)
@@ -1,7 +1,7 @@
 # Maintainer: David Runge <dave at sleepmap.de>
 pkgname=apparmor
-pkgver=2.13.0
-pkgrel=10
+pkgver=2.13.1
+pkgrel=1
 pkgdesc="Mandatory Access Control (MAC) using Linux Security Module (LSM)"
 arch=('x86_64')
 url="https://gitlab.com/apparmor/apparmor"
@@ -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%.[0-9]}.tar.gz"{,.asc}
-        "binmerge.patch::https://gitlab.com/${pkgname}/${pkgname}/commit/4200932d8fb31cc3782d96dd8312511e807fd09b.patch")
+source=("https://launchpad.net/${pkgname}/${pkgver%.[0-9]}/${pkgver}/+download/${pkgname}-${pkgver%.[0-9]}.tar.gz"{,.asc})
 sha512sums=('f98914713153d4c823a3ea7e96291cc4528bf7c8d3a139286ae0ecd806613e9c34b0ad81f2b258df2193cf6f3157d3252ef72d32d339427948a3fd8ba5651827'
-            'SKIP'
-            'f8f083b43970f2273a79efd08841c50b0333d526e32f85a66a6099e70fd8f36eb8f1c4433e1b37ac99bdfa8fcb2c541704f286ecc9fd5daf978996889b4d2286')
+            'SKIP')
 # AppArmor Development Team (AppArmor signing key) <apparmor at lists.ubuntu.com>
 validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB')
 _core_perl="/usr/bin/core_perl"
@@ -42,11 +40,6 @@
   sed -e '722i\ \ \ \ \ \ \ \ print(e)' -i utils/apparmor/sandbox.py
   # remove test-aa.py (utils check), producing too many fails
   rm -v utils/test/test-aa.py
-
-  # backport upstream 'binmerge' patch
-  patch -Np1 -i ../binmerge.patch
-  #removing stale file
-  rm -v profiles/apparmor.d/usr.sbin.smbd.orig
   # fix bin directory for parser install target
   # fix lib dir location
   # fix missing executable bit on apparmor.systemd script