[PR PATCH] apparmor: update to 3.1.3.

[PR PATCH] apparmor: update to 3.1.3.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1234 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.3
https://github.com/void-linux/void-packages/pull/42546

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

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

@paper42

<!--
#### 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/42546.patch is attached

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

From 8eeafd3f7a05dd53059cc5a43a98e5e497194d59 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 2 Mar 2023 11:03:30 +0000
Subject: [PATCH] apparmor: update to 3.1.3.

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

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index a8ae25a00398..1ae8ad8fe1f1 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,12 +1,12 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.2
+version=3.1.3
 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 libtool gettext swig python3 which
  python3-setuptools"
 makedepends="perl python3-devel"
 depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
@@ -17,18 +17,14 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 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=e7c7c4bc3a05a074322f9a19232c925b37e9a23dffa66d764dc27ebb82f0462c
+distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
+checksum=b8ffac45d0b283afe574ddd5542142ba1a62c354df110cff862b99201f29c843
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="--with-perl --with-python"
 fi
 
-pre_configure() {
-	autoreconf -if
-}
-
 pre_build() {
 	# Replace release profiles with our own
 	cd ${wrksrc}

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

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1239 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.3
https://github.com/void-linux/void-packages/pull/42546

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

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

@paper42

<!--
#### 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/42546.patch is attached

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

From a972dac68a136fbe30e692266469e14dcc208bab Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 2 Mar 2023 11:03:30 +0000
Subject: [PATCH] apparmor: update to 3.1.3.

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

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index a8ae25a00398..e083545f5ce6 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,12 +1,12 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.2
+version=3.1.3
 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 automake libtool gettext swig python3 which
  python3-setuptools"
 makedepends="perl python3-devel"
 depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
@@ -18,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=e7c7c4bc3a05a074322f9a19232c925b37e9a23dffa66d764dc27ebb82f0462c
+checksum=d4476bc78a088c0cc56aa44d5ec82a642a08b0adea7c984d029038f7017e4666
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42546#discussion_r1123689580

Comment:
pkg-config is missing according to the configure log which causes all dependency checks to succeed even if something is missing

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42546#discussion_r1123689605

Comment:
if we use `https://launchpad.net/apparmor/3.1/3.1.2/+download/apparmor-3.1.2.tar.gz`, then we can drop autoreconf because this archive contains a pre-generated configure file. Then automake and libtool in hostmakedepends can probably be removed.

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

[mhmdanas]

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

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/42546#discussion_r1123762937

Comment:
I already tried that, but I was getting configure errors with aarch64 cross-compile (something to do with Perl). I'll take a closer look later.

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42546#discussion_r1123907326

Comment:
You can just add perl to hostmakedepends 

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

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1239 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.3
https://github.com/void-linux/void-packages/pull/42546

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

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

@paper42

<!--
#### 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/42546.patch is attached

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

From 56483b83e24c120c4e9ca34214ca5edf4d2f1686 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 2 Mar 2023 11:03:30 +0000
Subject: [PATCH] apparmor: update to 3.1.3.

---
 srcpkgs/apparmor/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index a8ae25a00398..50e2992aafbb 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,14 +1,13 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.1.2
+version=3.1.3
 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
- python3-setuptools"
-makedepends="perl python3-devel"
+hostmakedepends="bison flex gettext python3 which python3-setuptools pkg-config
+ perl"
 depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2
  python3-psutil python3-dbus iproute2"
 checkdepends="dejagnu"
@@ -17,18 +16,16 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 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=e7c7c4bc3a05a074322f9a19232c925b37e9a23dffa66d764dc27ebb82f0462c
+distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/apparmor-${version}.tar.gz"
+checksum=b8ffac45d0b283afe574ddd5542142ba1a62c354df110cff862b99201f29c843
 replaces="apparmor-vim>=0"
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="--with-perl --with-python"
+	hostmakedepends+=" swig"
+	makedepends="python3-devel"
 fi
 
-pre_configure() {
-	autoreconf -if
-}
-
 pre_build() {
 	# Replace release profiles with our own
 	cd ${wrksrc}

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

[paper42]

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

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

apparmor: update to 3.1.3.
https://github.com/void-linux/void-packages/pull/42546

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

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

@paper42

<!--
#### 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
-->