[PR PATCH] apparmor: update to 4.0.2.

[PR PATCH] apparmor: update to 4.0.2.

[1is7ac3]

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

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

https://github.com/1is7ac3/void-packages apparmor
https://github.com/void-linux/void-packages/pull/52534

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

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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-GLIB)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
<!--  - armv7l
  - armv6l-musl
-->


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

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

From 303b732ec3892c019efc65d3e9c60e021b185eb3 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 6 Oct 2024 18:21:53 -0300
Subject: [PATCH] apparmor: update to 4.0.2.

---
 srcpkgs/apparmor/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 0afe30b37d16ee..62ef85bd7c110e 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.7
-revision=2
+version=4.0.2
+revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
@@ -19,7 +19,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=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
+checksum=7b4de5a34913a8bcc85f0dad22ac1607717566adcf99906da0ec2d0106cd493e
 replaces="apparmor-vim>=0"
 
 # /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t';
@@ -72,7 +72,7 @@ post_install() {
 	fi
 
 	# we installed a custom conflicting profile
-	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
+	rm ${DESTDIR}/etc/apparmor.d/php-fpm
 
 	vinstall utils/aa-notify.desktop 644 usr/share/applications
 	vdoc "${FILESDIR}/README.voidlinux"

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

[1is7ac3]

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

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

https://github.com/1is7ac3/void-packages apparmor
https://github.com/void-linux/void-packages/pull/52534

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

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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-GLIB)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
<!--  - armv7l
  - armv6l-musl
-->


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

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

From cdefe5a91443cfe5e343bdd7dd8e3d6e1ac671a8 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 6 Oct 2024 18:21:53 -0300
Subject: [PATCH] apparmor: update to 4.0.2.

---
 srcpkgs/apparmor/patches/fix_path_max.patch | 8 ++++++++
 srcpkgs/apparmor/template                   | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/apparmor/patches/fix_path_max.patch

diff --git a/srcpkgs/apparmor/patches/fix_path_max.patch b/srcpkgs/apparmor/patches/fix_path_max.patch
new file mode 100644
index 00000000000000..c377c3c4e97d2a
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix_path_max.patch
@@ -0,0 +1,8 @@
+*** a/binutils/aa_load.c	2024-07-23 19:02:50.000000000 -0400
+--- b/binutils/aa_load.c	2024-10-06 20:23:30.065439516 -0300
+***************
+*** 18,19 ****
+--- 18,20 ----
+  #include <string.h>
++ #include <limits.h>
+  #include <dirent.h>
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 0afe30b37d16ee..62ef85bd7c110e 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.7
-revision=2
+version=4.0.2
+revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
@@ -19,7 +19,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=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
+checksum=7b4de5a34913a8bcc85f0dad22ac1607717566adcf99906da0ec2d0106cd493e
 replaces="apparmor-vim>=0"
 
 # /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t';
@@ -72,7 +72,7 @@ post_install() {
 	fi
 
 	# we installed a custom conflicting profile
-	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
+	rm ${DESTDIR}/etc/apparmor.d/php-fpm
 
 	vinstall utils/aa-notify.desktop 644 usr/share/applications
 	vdoc "${FILESDIR}/README.voidlinux"

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

[1is7ac3]

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

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

https://github.com/1is7ac3/void-packages apparmor
https://github.com/void-linux/void-packages/pull/52534

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

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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-GLIB)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
<!--  - armv7l
  - armv6l-musl
-->


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

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

From b4576d1a1d563048c04dd94f35865a3efa4a4e5b Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Sun, 6 Oct 2024 18:21:53 -0300
Subject: [PATCH] apparmor: update to 4.0.2.

---
 srcpkgs/apparmor/patches/fix_path_max.patch   |  8 +++++
 .../apparmor/patches/fix_uint_from_musl.patch | 36 +++++++++++++++++++
 srcpkgs/apparmor/template                     |  8 ++---
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/apparmor/patches/fix_path_max.patch
 create mode 100644 srcpkgs/apparmor/patches/fix_uint_from_musl.patch

diff --git a/srcpkgs/apparmor/patches/fix_path_max.patch b/srcpkgs/apparmor/patches/fix_path_max.patch
new file mode 100644
index 00000000000000..c377c3c4e97d2a
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix_path_max.patch
@@ -0,0 +1,8 @@
+*** a/binutils/aa_load.c	2024-07-23 19:02:50.000000000 -0400
+--- b/binutils/aa_load.c	2024-10-06 20:23:30.065439516 -0300
+***************
+*** 18,19 ****
+--- 18,20 ----
+  #include <string.h>
++ #include <limits.h>
+  #include <dirent.h>
diff --git a/srcpkgs/apparmor/patches/fix_uint_from_musl.patch b/srcpkgs/apparmor/patches/fix_uint_from_musl.patch
new file mode 100644
index 00000000000000..fc74e9762746fd
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix_uint_from_musl.patch
@@ -0,0 +1,36 @@
+*** a/parser/rule.h	2024-07-23 19:02:50.000000000 -0400
+--- b/parser/rule.h	2024-10-10 23:11:40.923677300 -0300
+*************** public:
+*** 210,218 ****
+  	int cmp(prefixes const &rhs) const {
+! 		if ((uint) audit < (uint) rhs.audit)
+  			return -1;
+! 		if ((uint) audit > (uint) rhs.audit)
+  			return 1;
+! 		if ((uint) rule_mode < (uint) rhs.rule_mode)
+  			return -1;
+! 		if ((uint) rule_mode > (uint) rhs.rule_mode)
+  			return 1;
+--- 210,218 ----
+  	int cmp(prefixes const &rhs) const {
+! 		if ((unsigned int) audit < (unsigned int) rhs.audit)
+  			return -1;
+! 		if ((unsigned int) audit > (unsigned int) rhs.audit)
+  			return 1;
+! 		if ((unsigned int) rule_mode < (unsigned int) rhs.rule_mode)
+  			return -1;
+! 		if ((unsigned int) rule_mode > (unsigned int) rhs.rule_mode)
+  			return 1;
+*************** public:
+*** 226,230 ****
+  	bool operator<(prefixes const &rhs) const {
+! 		if ((uint) audit < (uint) rhs.audit)
+  			return true;
+! 		if ((uint) rule_mode < (uint) rhs.rule_mode)
+  			return true;
+--- 226,230 ----
+  	bool operator<(prefixes const &rhs) const {
+! 		if ((unsigned int) audit < (unsigned int) rhs.audit)
+  			return true;
+! 		if ((unsigned int) rule_mode < (unsigned int) rhs.rule_mode)
+  			return true;
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 0afe30b37d16ee..62ef85bd7c110e 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.7
-revision=2
+version=4.0.2
+revision=1
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure
 conf_files="/etc/apparmor.d/local/* /etc/apparmor/*"
@@ -19,7 +19,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=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64
+checksum=7b4de5a34913a8bcc85f0dad22ac1607717566adcf99906da0ec2d0106cd493e
 replaces="apparmor-vim>=0"
 
 # /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t';
@@ -72,7 +72,7 @@ post_install() {
 	fi
 
 	# we installed a custom conflicting profile
-	rm ${DESTDIR}/etc/apparmor.d/{,local/}php-fpm
+	rm ${DESTDIR}/etc/apparmor.d/php-fpm
 
 	vinstall utils/aa-notify.desktop 644 usr/share/applications
 	vdoc "${FILESDIR}/README.voidlinux"

Re: [PR PATCH] [Closed]: apparmor: update to 4.0.2.

[classabbyamp]

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

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

apparmor: update to 4.0.2.
https://github.com/void-linux/void-packages/pull/52534

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

#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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-GLIB)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64
<!--  - armv7l
  - armv6l-musl
-->

Re: apparmor: update to 4.0.2.

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/52534#issuecomment-2417606652

Comment:
upstream calls this a development release, not stable: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace

reverted: ceb659ce 641346923c6