[PR PATCH] apparmor: update to 3.1.2.

[PR PATCH] apparmor: update to 3.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 2023 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages apparmor-3.1.2
https://github.com/void-linux/void-packages/pull/40965

apparmor: update to 3.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

**NOTE**: after I installed AppArmor 3.1.2 on my system and rebooted the machine for testing, I had some weird issues (was not able to connect to internet either through Wi-Fi or USB tethering, mouse cursor did not appear in Sway anymore), but after fiddling around with some stuff which may or may not have helped (e.g. `xbps-reconfigure -fa` ) and rebooting a couple times, the problems were fixed. My machine did have its plug pulled out by mistake and as a result power off abruptly before I started testing AppArmor 3.1.2, which may have been the cause of the problems, but I wanted to note this just in case. Everything is working perfectly  It would probably be a good idea for somebody else to test this update too, just in case the issues were not simply a fluke.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apparmor-3.1.2-40965.patch --]
[-- Type: text/x-diff, Size: 7575 bytes --]

From 159d3a33e4dbf1f0de970ac6195a63b3a115a769 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 7 Dec 2022 22:14:36 +0000
Subject: [PATCH] apparmor: update to 3.1.2.

---
 .../apparmor/patches/fix_logprofconf.patch    | 12 +--
 srcpkgs/apparmor/patches/python-3.10.patch    | 84 -------------------
 .../apparmor/patches/python-distutils.patch   | 13 ---
 srcpkgs/apparmor/template                     | 11 ++-
 4 files changed, 8 insertions(+), 112 deletions(-)
 delete mode 100644 srcpkgs/apparmor/patches/python-3.10.patch
 delete mode 100644 srcpkgs/apparmor/patches/python-distutils.patch

diff --git a/srcpkgs/apparmor/patches/fix_logprofconf.patch b/srcpkgs/apparmor/patches/fix_logprofconf.patch
index 62de9909717e..6a98bddc9af5 100644
--- a/srcpkgs/apparmor/patches/fix_logprofconf.patch
+++ b/srcpkgs/apparmor/patches/fix_logprofconf.patch
@@ -61,15 +61,5 @@ modify logprof.conf for Void Linux
 +  /usr/bin/genprof = u
 +  /usr/bin/logprof = u
  
-   # these ones shouln't have their own profiles
+   # these ones shouldn't have their own profiles
    /bin/awk      = icn
-@@ -112,6 +113,9 @@
-   /usr/bin/python3.5    = icn
-   /usr/bin/python3.6    = icn
-   /usr/bin/python3.7    = icn
-+  /usr/bin/python3.8    = icn
-+  /usr/bin/python3.9    = icn
-+  /usr/bin/python3.10    = icn
-   /usr/bin/tr   = icn
- 
- [required_hats]
diff --git a/srcpkgs/apparmor/patches/python-3.10.patch b/srcpkgs/apparmor/patches/python-3.10.patch
deleted file mode 100644
index 90d176d3b8c2..000000000000
--- a/srcpkgs/apparmor/patches/python-3.10.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ea7b201ba48b87469297d58751c57b03ceb82320 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Wed, 11 Aug 2021 21:37:40 +0200
-Subject: [PATCH] Update abstractions/python and profiles for python 3.10
-
-Fixes: https://gitlab.com/apparmor/apparmor/-/issues/187
----
- profiles/apparmor.d/abstractions/python        | 18 +++++++++---------
- profiles/apparmor.d/lsb_release                |  2 +-
- .../profiles/extras/usr.bin.chromium-browser   |  4 ++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/profiles/apparmor.d/abstractions/python b/profiles/apparmor.d/abstractions/python
-index 1b5cc9d0d..727030bdf 100644
---- a/profiles/apparmor.d/abstractions/python
-+++ b/profiles/apparmor.d/abstractions/python
-@@ -12,18 +12,18 @@
- 
-   abi <abi/3.0>,
- 
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{pyc,so}           mr,
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{egg,py,pth}       r,
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/{site,dist}-packages/ r,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{pyc,so}           mr,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{egg,py,pth}       r,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
-   /usr/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
- 
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{pyc,so}           mr,
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{egg,py,pth}       r,
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/{site,dist}-packages/ r,
--  /usr/local/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{pyc,so}           mr,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{egg,py,pth}       r,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
-+  /usr/local/lib{,32,64}/python3.{1,}[0-9]/lib-dynload/*.so            mr,
- 
-   # Site-wide configuration
--  /etc/python{2.[4-7],3.[0-9]}/** r,
-+  /etc/python{2.[4-7],3.[0-9],3.1[0-9]}/** r,
- 
-   # shared python paths
-   /usr/share/{pyshared,pycentral,python-support}/**      r,
-@@ -36,7 +36,7 @@
-   /usr/lib/wx/python/*.pth r,
- 
-   # python build configuration and headers
--  /usr/include/python{2.[4-7],3.[0-9]}*/pyconfig.h r,
-+  /usr/include/python{2.[4-7],3.[0-9],3.1[0-9]}*/pyconfig.h r,
- 
-   # Include additions to the abstraction
-   include if exists <abstractions/python.d>
-diff --git a/profiles/apparmor.d/lsb_release b/profiles/apparmor.d/lsb_release
-index 33a1c71db..ad8b998fc 100644
---- a/profiles/apparmor.d/lsb_release
-+++ b/profiles/apparmor.d/lsb_release
-@@ -18,7 +18,7 @@ profile lsb_release {
-   /dev/tty rw,
- 
-   /usr/bin/lsb_release r,
--  /usr/bin/python3.[0-9] mr,
-+  /usr/bin/python3.{1,}[0-9] mr,
- 
-   /etc/debian_version r,
-   /etc/default/apport r,
-diff --git a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-index 2df5338db..b47b6f721 100644
---- a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-+++ b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-@@ -267,9 +267,9 @@ profile chromium_browser /usr/lib/@{chromium}/@{chromium} flags=(attach_disconne
-     /usr/share/distro-info/** r,
-     /var/lib/dpkg/** r,
- 
--    /usr/local/lib/python3.[0-9]/dist-packages/ r,
-+    /usr/local/lib/python3.{1,}[0-9]/dist-packages/ r,
-     /usr/bin/ r,
--    /usr/bin/python3.[0-9] mr,
-+    /usr/bin/python3.{1,}[0-9] mr,
-   }
- 
-   profile sandbox {
--- 
-GitLab
-
diff --git a/srcpkgs/apparmor/patches/python-distutils.patch b/srcpkgs/apparmor/patches/python-distutils.patch
deleted file mode 100644
index 9c22c7f11649..000000000000
--- a/srcpkgs/apparmor/patches/python-distutils.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-distutils is deprecated in python 3.10, which means it imports but prints warnings
-
---- a/libraries/libapparmor/m4/ac_python_devel.m4
-+++ b/libraries/libapparmor/m4/ac_python_devel.m4
-@@ -69,7 +69,7 @@
-         # Check if you have distutils, else fail
-         #
-         AC_MSG_CHECKING([for the distutils Python package])
--        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-+        ac_distutils_result=`$PYTHON -W ignore -c "import distutils" 2>&1`
-         if test -z "$ac_distutils_result"; then
-                 AC_MSG_RESULT([yes])
-         else
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index d3d2922f968f..286dd1cb1416 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,12 +1,13 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.0.3
-revision=4
+version=3.1.2
+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"
-hostmakedepends="bison flex autoconf automake libtool gettext swig python3 which"
+hostmakedepends="bison flex autoconf automake libtool gettext swig python3 which
+ python3-setuptools"
 makedepends="perl python3-devel"
 depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
  python3-psutil python3-dbus iproute2 which"
@@ -17,7 +18,7 @@ license="GPL-2.0-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=51b1db60e962dd01856a1ec6a9d43b11ed4350dcc5738ef901097c999bcbf50e
+checksum=e7c7c4bc3a05a074322f9a19232c925b37e9a23dffa66d764dc27ebb82f0462c
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -63,6 +64,8 @@ post_install() {
 
 	# we installed a custom conflicting profile
 	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
+
+	vinstall utils/aa-notify.desktop 0644 usr/share/applications
 }
 
 libapparmor_package() {

Re: apparmor: update to 3.1.2.

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/40965#issuecomment-1353442205

Comment:
I tested this and it is working alright for me.

Re: [PR REVIEW] apparmor: update to 3.1.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40965#discussion_r1051057270

Comment:
iirc, this version doesn't call which anymore, would you mind checking if that's correct?
```suggestion
hostmakedepends="bison flex autoconf automake libtool gettext swig python3
```

Re: [PR REVIEW] apparmor: update to 3.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 2042 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40965#discussion_r1051402851

Comment:
`which` still seems to be required, as the build fails with this error without it:
```
config.status: error: in `/builddir/apparmor-3.1.2/libraries/libapparmor':
config.status: error: Something went wrong bootstrapping makefile fragments
    for automatic dependency tracking.  If GNU make was not used, consider
    re-running the configure script with MAKE="gmake" (or whatever is
    necessary).  You can also try re-running configure with the
    '--disable-dependency-tracking' option to at least be able to build
    the package (albeit without support for automatic dependency tracking).
See `config.log' for more details
```
Opening `masterdir/builddir/apparmor-3.1.2/libraries/libapparmor/config.log` and searching for `which` then brings me to this:
```
config.status:1302: cd src       && sed -e '/# am--include-marker/d' Makefile         | make -f - am--depfiles
make: which: No such file or directory
../../../common//Make.rules:40: *** awk utility required for build but not available.  Stop.
config.status:1307: $? = 2
config.status:1302: cd testsuite       && sed -e '/# am--include-marker/d' Makefile         | make -f - am--depfiles
make: which: No such file or directory
../../../common/Make.rules:40: *** awk utility required for build but not available.  Stop.
config.status:1307: $? = 2
config.status:1311: error: in `/builddir/apparmor-3.1.2/libraries/libapparmor':
config.status:1313: error: Something went wrong bootstrapping makefile fragments
    for automatic dependency tracking.  If GNU make was not used, consider
    re-running the configure script with MAKE="gmake" (or whatever is
    necessary).  You can also try re-running configure with the
    '--disable-dependency-tracking' option to at least be able to build
    the package (albeit without support for automatic dependency tracking).
See `config.log' for more details
```

Re: [PR REVIEW] apparmor: update to 3.1.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40965#discussion_r1051403440

Comment:
and for runtime?

Re: [PR REVIEW] apparmor: update to 3.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40965#discussion_r1051677108

Comment:
Removing `which` from runtime deps seems to work. `which` is pulled in anyway by `base-system` though, so it's not like it matters whether it's specified as a runtime dep or not, is that right?

Re: [PR REVIEW] apparmor: update to 3.1.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40965#discussion_r1051681650

Comment:
That's true, all base-* packages depend on which, but I would still explicitly depend on it exactly where it's necessary.

Re: [PR REVIEW] apparmor: update to 3.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/40965#discussion_r1051684241

Comment:
I searched and found https://gitlab.com/apparmor/apparmor/-/merge_requests/784, included in AppArmor 3.1.1, so I guess `which` is not a required runtime dependency anymore. I'll update the PR accordingly.

Re: [PR PATCH] [Updated] apparmor: update to 3.1.2.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages apparmor-3.1.2
https://github.com/void-linux/void-packages/pull/40965

apparmor: update to 3.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

**NOTE**: after I installed AppArmor 3.1.2 on my system and rebooted the machine for testing, I had some weird issues (was not able to connect to internet either through Wi-Fi or USB tethering, mouse cursor did not appear in Sway anymore), but after fiddling around with some stuff which may or may not have helped (e.g. `xbps-reconfigure -fa` ) and rebooting a couple times, the problems were fixed. My machine did have its plug pulled out by mistake and as a result power off abruptly before I started testing AppArmor 3.1.2, which may have been the cause of the problems, but I wanted to note this just in case. Everything is working perfectly  It would probably be a good idea for somebody else to test this update too, just in case the issues were not simply a fluke.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apparmor-3.1.2-40965.patch --]
[-- Type: text/x-diff, Size: 7747 bytes --]

From 727088aee0810e3c10b2088e8d262b63269fe709 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 7 Dec 2022 22:14:36 +0000
Subject: [PATCH] apparmor: update to 3.1.2.

---
 .../apparmor/patches/fix_logprofconf.patch    | 12 +--
 srcpkgs/apparmor/patches/python-3.10.patch    | 84 -------------------
 .../apparmor/patches/python-distutils.patch   | 13 ---
 srcpkgs/apparmor/template                     | 13 +--
 4 files changed, 9 insertions(+), 113 deletions(-)
 delete mode 100644 srcpkgs/apparmor/patches/python-3.10.patch
 delete mode 100644 srcpkgs/apparmor/patches/python-distutils.patch

diff --git a/srcpkgs/apparmor/patches/fix_logprofconf.patch b/srcpkgs/apparmor/patches/fix_logprofconf.patch
index 62de9909717e..6a98bddc9af5 100644
--- a/srcpkgs/apparmor/patches/fix_logprofconf.patch
+++ b/srcpkgs/apparmor/patches/fix_logprofconf.patch
@@ -61,15 +61,5 @@ modify logprof.conf for Void Linux
 +  /usr/bin/genprof = u
 +  /usr/bin/logprof = u
  
-   # these ones shouln't have their own profiles
+   # these ones shouldn't have their own profiles
    /bin/awk      = icn
-@@ -112,6 +113,9 @@
-   /usr/bin/python3.5    = icn
-   /usr/bin/python3.6    = icn
-   /usr/bin/python3.7    = icn
-+  /usr/bin/python3.8    = icn
-+  /usr/bin/python3.9    = icn
-+  /usr/bin/python3.10    = icn
-   /usr/bin/tr   = icn
- 
- [required_hats]
diff --git a/srcpkgs/apparmor/patches/python-3.10.patch b/srcpkgs/apparmor/patches/python-3.10.patch
deleted file mode 100644
index 90d176d3b8c2..000000000000
--- a/srcpkgs/apparmor/patches/python-3.10.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ea7b201ba48b87469297d58751c57b03ceb82320 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Wed, 11 Aug 2021 21:37:40 +0200
-Subject: [PATCH] Update abstractions/python and profiles for python 3.10
-
-Fixes: https://gitlab.com/apparmor/apparmor/-/issues/187
----
- profiles/apparmor.d/abstractions/python        | 18 +++++++++---------
- profiles/apparmor.d/lsb_release                |  2 +-
- .../profiles/extras/usr.bin.chromium-browser   |  4 ++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/profiles/apparmor.d/abstractions/python b/profiles/apparmor.d/abstractions/python
-index 1b5cc9d0d..727030bdf 100644
---- a/profiles/apparmor.d/abstractions/python
-+++ b/profiles/apparmor.d/abstractions/python
-@@ -12,18 +12,18 @@
- 
-   abi <abi/3.0>,
- 
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{pyc,so}           mr,
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{egg,py,pth}       r,
--  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/{site,dist}-packages/ r,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{pyc,so}           mr,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/**.{egg,py,pth}       r,
-+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
-   /usr/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
- 
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{pyc,so}           mr,
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{egg,py,pth}       r,
--  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/{site,dist}-packages/ r,
--  /usr/local/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{pyc,so}           mr,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/**.{egg,py,pth}       r,
-+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9],3.1[0-9]}/{site,dist}-packages/ r,
-+  /usr/local/lib{,32,64}/python3.{1,}[0-9]/lib-dynload/*.so            mr,
- 
-   # Site-wide configuration
--  /etc/python{2.[4-7],3.[0-9]}/** r,
-+  /etc/python{2.[4-7],3.[0-9],3.1[0-9]}/** r,
- 
-   # shared python paths
-   /usr/share/{pyshared,pycentral,python-support}/**      r,
-@@ -36,7 +36,7 @@
-   /usr/lib/wx/python/*.pth r,
- 
-   # python build configuration and headers
--  /usr/include/python{2.[4-7],3.[0-9]}*/pyconfig.h r,
-+  /usr/include/python{2.[4-7],3.[0-9],3.1[0-9]}*/pyconfig.h r,
- 
-   # Include additions to the abstraction
-   include if exists <abstractions/python.d>
-diff --git a/profiles/apparmor.d/lsb_release b/profiles/apparmor.d/lsb_release
-index 33a1c71db..ad8b998fc 100644
---- a/profiles/apparmor.d/lsb_release
-+++ b/profiles/apparmor.d/lsb_release
-@@ -18,7 +18,7 @@ profile lsb_release {
-   /dev/tty rw,
- 
-   /usr/bin/lsb_release r,
--  /usr/bin/python3.[0-9] mr,
-+  /usr/bin/python3.{1,}[0-9] mr,
- 
-   /etc/debian_version r,
-   /etc/default/apport r,
-diff --git a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-index 2df5338db..b47b6f721 100644
---- a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-+++ b/profiles/apparmor/profiles/extras/usr.bin.chromium-browser
-@@ -267,9 +267,9 @@ profile chromium_browser /usr/lib/@{chromium}/@{chromium} flags=(attach_disconne
-     /usr/share/distro-info/** r,
-     /var/lib/dpkg/** r,
- 
--    /usr/local/lib/python3.[0-9]/dist-packages/ r,
-+    /usr/local/lib/python3.{1,}[0-9]/dist-packages/ r,
-     /usr/bin/ r,
--    /usr/bin/python3.[0-9] mr,
-+    /usr/bin/python3.{1,}[0-9] mr,
-   }
- 
-   profile sandbox {
--- 
-GitLab
-
diff --git a/srcpkgs/apparmor/patches/python-distutils.patch b/srcpkgs/apparmor/patches/python-distutils.patch
deleted file mode 100644
index 9c22c7f11649..000000000000
--- a/srcpkgs/apparmor/patches/python-distutils.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-distutils is deprecated in python 3.10, which means it imports but prints warnings
-
---- a/libraries/libapparmor/m4/ac_python_devel.m4
-+++ b/libraries/libapparmor/m4/ac_python_devel.m4
-@@ -69,7 +69,7 @@
-         # Check if you have distutils, else fail
-         #
-         AC_MSG_CHECKING([for the distutils Python package])
--        ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-+        ac_distutils_result=`$PYTHON -W ignore -c "import distutils" 2>&1`
-         if test -z "$ac_distutils_result"; then
-                 AC_MSG_RESULT([yes])
-         else
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index d3d2922f968f..a8ae25a00398 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,15 +1,16 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.0.3
-revision=4
+version=3.1.2
+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"
-hostmakedepends="bison flex autoconf automake libtool gettext swig python3 which"
+hostmakedepends="bison flex autoconf automake libtool gettext swig python3 which
+ python3-setuptools"
 makedepends="perl python3-devel"
 depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
- python3-psutil python3-dbus iproute2 which"
+ python3-psutil python3-dbus iproute2"
 checkdepends="dejagnu"
 short_desc="Mandatory access control to restrict programs"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -17,7 +18,7 @@ license="GPL-2.0-only"
 homepage="https://gitlab.com/apparmor/apparmor"
 changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_${version}"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=51b1db60e962dd01856a1ec6a9d43b11ed4350dcc5738ef901097c999bcbf50e
+checksum=e7c7c4bc3a05a074322f9a19232c925b37e9a23dffa66d764dc27ebb82f0462c
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -63,6 +64,8 @@ post_install() {
 
 	# we installed a custom conflicting profile
 	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
+
+	vinstall utils/aa-notify.desktop 644 usr/share/applications
 }
 
 libapparmor_package() {

Re: [PR PATCH] [Merged]: apparmor: update to 3.1.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1863 bytes --]

There's a merged pull request on the void-packages repository

apparmor: update to 3.1.2.
https://github.com/void-linux/void-packages/pull/40965

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

**NOTE**: after I installed AppArmor 3.1.2 on my system and rebooted the machine for testing, I had some weird issues (was not able to connect to internet either through Wi-Fi or USB tethering, mouse cursor did not appear in Sway anymore), but after fiddling around with some stuff which may or may not have helped (e.g. `xbps-reconfigure -fa` ) and rebooting a couple times, the problems were fixed. My machine did have its plug pulled out by mistake and as a result power off abruptly before I started testing AppArmor 3.1.2, which may have been the cause of the problems, but I wanted to note this just in case. Everything is working perfectly  It would probably be a good idea for somebody else to test this update too, just in case the issues were not simply a fluke.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->