apparmor: update to 3.1.3

drop debian patch as the file was dropped upstream.

Signed-off-by: Armin Kuster <akuster808@gmail.com>

2 files changed, 3 insertions, 61 deletions

diff --git a/recipes-mac/AppArmor/apparmor_3.0.7.bb b/recipes-mac/AppArmor/apparmor_3.1.3.bb
index e7d677e..fd649e4 100644
--- a/recipes-mac/AppArmor/apparmor_3.0.7.bb
+++ b/recipes-mac/AppArmor/apparmor_3.1.3.bb
@@ -14,15 +14,14 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fd57a4b0bc782d7b80fd431f10bbf9d0"
 DEPENDS = "bison-native apr gettext-native coreutils-native swig-native"
 
 SRC_URI = " \
-    git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.0 \
+    git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.1 \
     file://run-ptest \
     file://crosscompile_perl_bindings.patch \
     file://0001-Makefile.am-suppress-perllocal.pod.patch \
     file://0001-Makefile-fix-hardcoded-installation-directories.patch \
-    file://0001-rc.apparmor.debian-add-missing-functions.patch \
     "
 
-SRCREV = "0ead606d9e608801f45e13a34358036135470729"
+SRCREV = "e69cb5047946818e6a9df326851483bb075a5cfe"
 S = "${WORKDIR}/git"
 
 PARALLEL_MAKE = ""
@@ -95,7 +94,7 @@ do_install () {
 
     if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
         install -d ${D}${sysconfdir}/init.d
-        install -m 755 ${B}/parser/rc.apparmor.debian ${D}${sysconfdir}/init.d/apparmor
+        install -m 755 ${B}/parser/rc.apparmor.functions ${D}${sysconfdir}/init.d/apparmor
     fi
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
diff --git a/recipes-mac/AppArmor/files/0001-rc.apparmor.debian-add-missing-functions.patch b/recipes-mac/AppArmor/files/0001-rc.apparmor.debian-add-missing-functions.patch
deleted file mode 100644
index 53bdde8..0000000
--- a/recipes-mac/AppArmor/files/0001-rc.apparmor.debian-add-missing-functions.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a737c95ac0f887c365fe8f16583ea95da79de1e9 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Mon, 21 Jun 2021 16:53:39 +0800
-Subject: [PATCH] rc.apparmor.debian: add missing functions
-
-Add missing functions:
-  aa_log_action_start
-  aa_log_action_end
-  aa_log_daemon_msg
-  aa_log_end_msg
-
-Fixes:
-$ /etc/init.d/apparmor start
-/lib/apparmor/rc.apparmor.functions: line 294: aa_log_daemon_msg: command not found
-/lib/apparmor/rc.apparmor.functions: line 214: aa_log_action_start: command not found
-
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- parser/rc.apparmor.debian | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/parser/rc.apparmor.debian b/parser/rc.apparmor.debian
-index 8efd4400..f35124e8 100644
---- a/parser/rc.apparmor.debian
-+++ b/parser/rc.apparmor.debian
-@@ -70,6 +70,26 @@ aa_log_skipped_msg() {
-         echo ": Skipped."
- }
- 
-+aa_log_action_start()
-+{
-+    echo "$@"
-+}
-+
-+aa_log_action_end()
-+{
-+    printf ""
-+}
-+
-+aa_log_daemon_msg()
-+{
-+    echo "$@"
-+}
-+
-+aa_log_end_msg()
-+{
-+    printf ""
-+}
-+
- usage() {
-     echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|kill}"
- }
--- 
-2.17.1
-