apparmor: update to 4.1.7

srcpkgs/apparmor/patches/fix_logprofconf.patch

@@ -1,65 +1,16 @@
 modify logprof.conf for Void Linux
-
 --- a/utils/logprof.conf
 +++ b/utils/logprof.conf
-@@ -12,11 +12,11 @@
+@@ -12,10 +12,10 @@
  [settings]
    profiledir = /etc/apparmor.d /etc/subdomain.d
-   inactive_profiledir = /usr/share/apparmor/extra-profiles 
+   inactive_profiledir = /usr/share/apparmor/extra-profiles
 -  logfiles = /var/log/audit/audit.log /var/log/syslog /var/log/messages
 +  logfiles = /var/log/audit/audit.log /var/log/socklog/kernel/current /var/log/syslog /var/log/messages
 
 -  parser = /sbin/apparmor_parser /sbin/subdomain_parser
-+  parser = /usr/bin/apparmor_parser /usr/bin/subdomain_parser
-   ldd = /usr/bin/ldd
 -  logger = /bin/logger /usr/bin/logger
++  parser = /usr/bin/apparmor_parser /usr/bin/subdomain_parser
 +  logger = /usr/bin/logger
 
    # customize how file ownership permissions are presented
-   # 0 - off
-@@ -38,27 +38,29 @@
-
- [qualifiers]
-   # things will be painfully broken if bash has a profile
--  /bin/bash     = icnu
--  /usr/bin/bash = icnu
--  /bin/ksh	    = icnu
--  /usr/bin/ksh	= icnu
--  /bin/dash	    = icnu
--  /usr/bin/dash	= icnu
--  /bin/zsh      = icnu
--  /usr/bin/zsh  = icnu
-+  /bin/bash      = icnu
-+  /usr/bin/bash  = icnu
-+  /bin/ksh	     = icnu
-+  /usr/bin/ksh	 = icnu
-+  /bin/dash	     = icnu
-+  /usr/bin/dash	 = icnu
-+  /bin/zsh       = icnu
-+  /usr/bin/zsh   = icnu
-+  /bin/fish      = icnu
-+  /usr/bin/fish  = icnu
-+  /bin/ash       = icnu
-+  /usr/bin/ash   = icnu
-+  /bin/rc        = icnu
-+  /usr/bin/rc    = icnu
-
-   # these programs can't function if they're confined
-   /bin/mount    = u
-   /usr/bin/mount = u
-   /etc/init.d/subdomain = u
--  /sbin/cardmgr = u
--  /usr/sbin/cardmgr = u
--  /sbin/subdomain_parser = u
--  /usr/sbin/subdomain_parser = u
--  /usr/sbin/genprof = u
--  /usr/sbin/logprof = u
--  /usr/lib/YaST2/servers_non_y2/ag_genprof = u
--  /usr/lib/YaST2/servers_non_y2/ag_logprof = u
-+  /usr/bin/cardmgr = u
-+  /usr/bin/subdomain_parser = u
-+  /usr/bin/genprof = u
-+  /usr/bin/logprof = u
-
-   # these ones shouldn't have their own profiles
-   /bin/awk      = icn

srcpkgs/apparmor/template

@@ -1,15 +1,14 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-reverts="4.0.2_1"
-version=3.1.7
-revision=6
+version=4.1.7
+revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
 make_dirs="/etc/apparmor.d/disable 0755 root root"
 configure_args="$(vopt_with python) $(vopt_with perl)"
 hostmakedepends="bison flex gettext python3 which python3-setuptools pkg-config
- perl $(vopt_if python swig)"
+ perl autoconf-archive automake libtool python3-packaging-bootstrap $(vopt_if python swig)"
 makedepends="$(vopt_if python python3-devel)"
 depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
  python3-psutil python3-dbus iproute2"
@@ -19,8 +18,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
-distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
-checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
+distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
+checksum=ded4cd419b8a05002a108a0912208e2098695752664c6a59464d2dda418e0452
 replaces="apparmor-vim>=0"
 
 # /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t';
@@ -39,6 +38,11 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" perl"
 fi
 
+pre_configure() {
+	cd ${wrksrc}/libraries/libapparmor
+	autoreconf -fiv
+}
+
 pre_build() {
 	# Replace release profiles with our own
 	cd ${wrksrc}
@@ -72,9 +76,6 @@ post_install() {
 		rm -f ${DESTDIR}/usr/bin/aa-notify
 	fi
 
-	# we installed a custom conflicting profile
-	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
-
 	vinstall utils/aa-notify.desktop 644 usr/share/applications
 	vdoc "${FILESDIR}/README.voidlinux"
 }