From 485822d38b64f9e54d064deb865e261a26d683ca Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Sun, 21 Oct 2018 14:22:17 +0200
Subject: [PATCH] apparmor: update to 2.13.1.

Also cleanup the template a little
---
 .../files/profiles/usr.bin.iputils-ping       | 19 --------
 srcpkgs/apparmor/template                     | 46 +++++++------------
 2 files changed, 17 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/apparmor/files/profiles/usr.bin.iputils-ping

diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.iputils-ping b/srcpkgs/apparmor/files/profiles/usr.bin.iputils-ping
deleted file mode 100644
index 3508789e9b2..00000000000
--- a/srcpkgs/apparmor/files/profiles/usr.bin.iputils-ping
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim:syntax=apparmor
-
-#include <tunables/global>
-profile ping /{usr/,}bin/iputils-ping {
-  #include <abstractions/base>
-  #include <abstractions/consoles>
-  #include <abstractions/nameservice>
-
-  capability net_raw,
-  capability setuid,
-  network inet raw,
-  network inet6 raw,
-
-  /{usr/,}bin/iputils-ping mixr,
-  /etc/modules.conf r,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.bin.iputils-ping>
-}
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index ed8f8895ea9..eba7f3f0910 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,15 +1,16 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=2.13.0
-revision=7
+version=2.13.1
+revision=1
 build_style=gnu-configure
 _short_ver=${version%\.*}
 wrksrc="${pkgname}-v${_short_ver}"
-build_wrksrc="libraries/libapparmor"
+build_wrksrc=libraries/libapparmor
 patch_args="-Np1"
 hostmakedepends="bison flex autoconf automake libtool swig python3"
 makedepends="perl python3-devel"
 depends="runit-void-apparmor python3 libapparmor"
+checkdepends="dejagnu"
 short_desc="Mandatory access control to restrict programs"
 maintainer="Olivier Mauras <olivier@mauras.ch>"
 license="GPL-2.0-only, LGPL-2.1-only"
@@ -24,7 +25,7 @@ if [ -z "$CROSS_BUILD" ]; then
 fi
 
 pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
+	autoreconf -if
 }
 
 pre_build() {
@@ -33,37 +34,24 @@ pre_build() {
 
 	# Put in place our own profiles
 	cp ${FILESDIR}/profiles/* profiles/apparmor.d/
-	mv profiles/apparmor.d/bin.ping profiles/apparmor/profiles/extras/
 }
 
 post_build() {
-	cd ${wrksrc}/binutils
-	make ${makejobs}
-
-	cd ${wrksrc}/utils
-	make ${makejobs}
-
-	cd ${wrksrc}/parser
-	sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' Makefile
-	sed -i 's#${DESTDIR}/lib#${DESTDIR}/usr/lib#g' Makefile
-	make ${makejobs}
-
-	cd ${wrksrc}/profiles
-	make ${makejobs}
+	cd ${wrksrc}
+	sed -i 's#$(DESTDIR)/sbin#$(DESTDIR)/usr/bin#g' parser/Makefile
+	make ${makejobs} -C binutils
+	make ${makejobs} -C utils
+	make ${makejobs} -C parser
+	make ${makejobs} -C profiles
 }
 
 post_install() {
-	cd ${wrksrc}/binutils
-	make DESTDIR=${DESTDIR} install
-
-	cd ${wrksrc}/utils
-	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install
-
-	cd ${wrksrc}/parser
-	make DESTDIR=${DESTDIR} install
-
-	cd ${wrksrc}/profiles
-	make DESTDIR=${DESTDIR} install
+	cd ${wrksrc}
+	make DESTDIR=${DESTDIR} install -C binutils
+	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install -C utils
+	make DESTDIR=${DESTDIR} APPARMOR_BIN_PREFIX=${DESTDIR}/usr/lib/apparmor \
+		SBINDIR=${DESTDIR}/usr/bin USR_SBINDIR=${DESTDIR}/usr/bin install -C parser
+	make DESTDIR=${DESTDIR} install -C profiles
 
 	# Put Vim syntax in the correct place
 	mkdir -p ${DESTDIR}/usr/share/vim/vim80/syntax/