[PR PATCH] apparmor: update to 3.0.1

[paper42 <paper42@users.noreply.github.com>]

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

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

https://github.com/paper42/void-packages 0001-apparmor-update-to-3.0.1.patch
https://github.com/void-linux/void-packages/pull/27043

apparmor: update to 3.0.1


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

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

From 0cd4c05a1312c11412ee1df7d26cdb68ccc4a500 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Wed, 9 Dec 2020 11:26:20 +0100
Subject: [PATCH] apparmor: update to 3.0.1

---
 srcpkgs/apparmor/INSTALL.msg            |  3 ++-
 srcpkgs/apparmor/patches/fix-musl.patch | 24 ------------------------
 srcpkgs/apparmor/template               |  8 +++-----
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/apparmor/patches/fix-musl.patch

diff --git a/srcpkgs/apparmor/INSTALL.msg b/srcpkgs/apparmor/INSTALL.msg
index 488f2c40e11..e172252a706 100644
--- a/srcpkgs/apparmor/INSTALL.msg
+++ b/srcpkgs/apparmor/INSTALL.msg
@@ -1 +1,2 @@
-To configure AppArmor properly, please refer to the Void Linux Handbook: https://docs.voidlinux.org/config/security/apparmor.html
+To configure AppArmor properly, please refer to the Void Linux Handbook
+https://docs.voidlinux.org/config/security/apparmor.html
diff --git a/srcpkgs/apparmor/patches/fix-musl.patch b/srcpkgs/apparmor/patches/fix-musl.patch
deleted file mode 100644
index 484b67dfea4..00000000000
--- a/srcpkgs/apparmor/patches/fix-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/binutils/aa_status.c b/binutils/aa_status.c
-index 78b0340..56ecac3 100644
---- a/binutils/aa_status.c
-+++ b/binutils/aa_status.c
-@@ -17,6 +17,7 @@
- #include <errno.h>
- #include <ctype.h>
- #include <dirent.h>
-+#include <limits.h>
- 
- #include <sys/apparmor.h>
- #include <sys/apparmor_private.h>
-diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
-index 32892d0..dad7664 100644
---- a/libraries/libapparmor/include/sys/apparmor.h
-+++ b/libraries/libapparmor/include/sys/apparmor.h
-@@ -22,6 +22,7 @@
- #include <stdint.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index 4c260b24a1b..d64dc16d9c9 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,6 +1,6 @@
 # Template file for 'apparmor'
 pkgname=apparmor
-version=3.0.0
+version=3.0.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
@@ -15,8 +15,9 @@ short_desc="Mandatory access control to restrict programs"
 maintainer="Olivier Mauras <olivier@mauras.ch>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://gitlab.com/apparmor/apparmor"
+changelog="https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.1"
 distfiles="https://gitlab.com/apparmor/apparmor/-/archive/v${version}/apparmor-v${version}.tar.gz"
-checksum=8c440ab1848e723483a8550ed2889e18f322e9d7ee9eb4e2e712152ea61da68f
+checksum=5f9afc157c5e2610737186a31fc9bd6a1d339a2ee85ac4f2667dce59cf60f1c7
 patch_args="-Np1"
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -39,9 +40,6 @@ pre_build() {
 post_build() {
 	cd ${wrksrc}
 
-	# fix cross compilation
-	vsed -i parser/Makefile -e 's,cpp,$(CPP),'
-
 	make ${makejobs} -C binutils
 	make ${makejobs} -C utils
 	make ${makejobs} -C parser