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