[PR PATCH] apparmor: update to 3.1.7.

[PR PATCH] apparmor: update to 3.1.7.

[piekay]

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

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

https://github.com/piekay/void-packages apparmor-update
https://github.com/void-linux/void-packages/pull/50757

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

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

<!--
#### 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, (x86_64)



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

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

From f4da01a1c7e288bc10c148276f8153ecaeecc09a Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Mon, 10 Jun 2024 01:53:14 +0200
Subject: [PATCH] apparmor: update to 3.1.7.

---
 srcpkgs/apparmor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index d3f4d35c393447..13586d0976f979 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.6
-revision=2
+version=3.1.7
+revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
@@ -17,7 +17,7 @@ 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=d5d699fd43faffd924dd51bfb5781a5a7cbabb55c1c9cb4abfb8c2840a9e8fcd
+checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

Re: apparmor: update to 3.1.7.

[piekay]

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

New comment by piekay on void-packages repository

https://github.com/void-linux/void-packages/pull/50757#issuecomment-2156908332

Comment:
Version 3.1.7 also fixes some Python syntax warnings happening during installation and when running aa-notify.

Re: apparmor: update to 3.1.7.

[piekay]

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

New comment by piekay on void-packages repository

https://github.com/void-linux/void-packages/pull/50757#issuecomment-2156913418

Comment:
After the Ci-fail I retested building the package locally and it worked, without errors.

Command used: 

> ./xbps-src -a x86_64-musl -Q pkg apparmor

Re: apparmor: update to 3.1.7.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/50757#issuecomment-2156924296

Comment:
`-a` will prevent tests from running, you want `-A x86_64-musl`

Re: apparmor: update to 3.1.7.

[piekay]

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

New comment by piekay on void-packages repository

https://github.com/void-linux/void-packages/pull/50757#issuecomment-2157049353

Comment:
Thanks, while I can now recreate the error, I currently have little idea of why this is happening. I will sleep over it and hopefully find the reason tomorrow

Re: apparmor: update to 3.1.7.

[piekay]

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

New comment by piekay on void-packages repository

https://github.com/void-linux/void-packages/pull/50757#issuecomment-2158608464

Comment:
Interesting: I can reproduce these errors with the 3.1.6_2 template

Re: apparmor: update to 3.1.7.

[piekay]

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

New comment by piekay on void-packages repository

https://github.com/void-linux/void-packages/pull/50757#issuecomment-2158623781

Comment:

[apparmor_old.log](https://github.com/user-attachments/files/15775399/apparmor_old.log)
[apparmor_new.log](https://github.com/user-attachments/files/15775402/apparmor_new.log)

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

[piekay]

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

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

https://github.com/piekay/void-packages apparmor-update
https://github.com/void-linux/void-packages/pull/50757

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

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

<!--
#### 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, (x86_64)



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

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

From 681797e7e0cdd092d3d4855eb155e7f29d916436 Mon Sep 17 00:00:00 2001
From: Piekay <github@piekay.de>
Date: Mon, 10 Jun 2024 01:53:14 +0200
Subject: [PATCH] apparmor: update to 3.1.7.

---
 .../patches/libapparmor-basename.patch        | 20 +++++++++++++++++++
 srcpkgs/apparmor/template                     |  6 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/apparmor/patches/libapparmor-basename.patch

diff --git a/srcpkgs/apparmor/patches/libapparmor-basename.patch b/srcpkgs/apparmor/patches/libapparmor-basename.patch
new file mode 100644
index 00000000000000..7977d2c2f85fc9
--- /dev/null
+++ b/srcpkgs/apparmor/patches/libapparmor-basename.patch
@@ -0,0 +1,20 @@
+--- a/libraries/libapparmor/testsuite/test_multi.c
++++ b/libraries/libapparmor/testsuite/test_multi.c
+@@ -1,5 +1,3 @@
+-#define _GNU_SOURCE /* for glibc's basename version */
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -7,6 +5,11 @@
+ 
+ #include <aalogparse.h>
+ 
++static const char *basename(const char *path)
++{
++	return strrchr(path, '/') ? strrchr(path, '/')+1 : path;
++}
++
+ int print_results(aa_log_record *record);
+ 
+ int main(int argc, char **argv)
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index d3f4d35c393447..13586d0976f979 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.6
-revision=2
+version=3.1.7
+revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
@@ -17,7 +17,7 @@ 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=d5d699fd43faffd924dd51bfb5781a5a7cbabb55c1c9cb4abfb8c2840a9e8fcd
+checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

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

[classabbyamp]

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

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

apparmor: update to 3.1.7.
https://github.com/void-linux/void-packages/pull/50757

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

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

<!--
#### 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, (x86_64)