commit 9590dc77106a77aec2906089a1efe733a941c063
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Aug 5 23:46:05 2024 +0200
Official fix
func.patch | 45 ++++++++++++++++++++++++++++++---------------
libapparmor.spec | 2 +-
2 files changed, 31 insertions(+), 16 deletions(-)
---
diff --git a/libapparmor.spec b/libapparmor.spec
index 1a32fac..e92ff74 100644
--- a/libapparmor.spec
+++ b/libapparmor.spec
@@ -6,7 +6,7 @@ Summary: Library to provide key AppArmor symbols
Summary(pl.UTF-8): Biblioteka udostępniająca kluczowe symbole AppArmor
Name: libapparmor
Version: 4.0.2
-Release: 2
+Release: 3
Epoch: 1
License: LGPL v2.1
Group: Libraries
diff --git a/func.patch b/func.patch
index 9075982..09b526b 100644
--- a/func.patch
+++ b/func.patch
@@ -1,17 +1,32 @@
---- apparmor-4.0.2/libraries/libapparmor/src/libapparmor.map~ 2024-07-24
01:02:50.000000000 +0200
-+++ apparmor-4.0.2/libraries/libapparmor/src/libapparmor.map 2024-08-05
15:12:47.676625569 +0200
-@@ -131,6 +131,14 @@ APPARMOR_3.1 {
+From 2eae692b05a06d238784a52cc9adb9857d1b7e6c Mon Sep 17 00:00:00 2001
+From: Georgia Garcia <[email protected]>
+Date: Mon, 5 Aug 2024 10:27:37 -0300
+Subject: [PATCH] libapparmor: fix undefined reference to aa_split_overlay_str
+
+The linkage of aa-load with the dynamic libapparmor fails with:
+aa_load.c:273: undefined reference to `aa_split_overlay_str'
+
+That is because when aa_split_overlay_str was added to libapparmor,
+the function was not added to the library map.
+
+Fixes: 50054ff0 ("add aa_split_overlay_str")
+Signed-off-by: Georgia Garcia <[email protected]>
+---
+ libraries/libapparmor/src/libapparmor.map | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/libapparmor/src/libapparmor.map
b/libraries/libapparmor/src/libapparmor.map
+index 08cd2fadc..436522a55 100644
+--- a/libraries/libapparmor/src/libapparmor.map
++++ b/libraries/libapparmor/src/libapparmor.map
+@@ -127,6 +127,7 @@ APPARMOR_3.0 {
+ APPARMOR_3.1 {
+ global:
+ aa_features_check;
++ aa_split_overlay_str;
+ local:
*;
} APPARMOR_3.0;
-
-+APPARMOR_4.0.2 {
-+ global:
-+ aa_split_overlay_str;
-+ local:
-+ *;
-+} APPARMOR_3.1;
-+
-+
- PRIVATE {
- global:
- _aa_is_blacklisted;
+--
+GitLab
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libapparmor.git/commitdiff/9590dc77106a77aec2906089a1efe733a941c063
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
