Prepoare for AppArmor 3.0.7 release

- update version file Signed-off-by: John Johansen <john.johansen@canonical.com>
Merge Fix setuptools version detection in buildpath.py
2025-09-01 23:05:11 +00:00 · 2022-08-09 01:56:58 -07:00 · 2022-08-03 17:22:25 +00:00 · 2022-08-01 01:22:42 -07:00 · 2022-07-26 23:23:49 -07:00 · 2022-07-25 17:36:05 -03:00
7 changed files with 13 additions and 14 deletions
--- a/common/Version
+++ b/common/Version
@@ -1 +1 @@
-3.0.5
+3.0.7
--- a/libraries/libapparmor/swig/python/test/buildpath.py
+++ b/libraries/libapparmor/swig/python/test/buildpath.py
@@ -1,9 +1,12 @@
 #!/usr/bin/python3
-# the build path has changed in setuptools 61.2
+# the build path has changed in setuptools 62.1:
+# https://github.com/pypa/setuptools/commit/1c23f5e1e4b18b50081cbabb2dea22bf345f5894
 import sys
 import sysconfig
 import setuptools
-if tuple(map(int,setuptools.__version__.split("."))) >= (61, 2):
+
+
+if tuple(map(int, setuptools.__version__.split("."))) >= (62, 1):
    identifier = sys.implementation.cache_tag
 else:
    identifier = "%d.%d" % sys.version_info[:2]
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -60,7 +60,7 @@ WARNINGS = -Wall
 CXX_WARNINGS = ${WARNINGS} ${EXTRA_WARNINGS}
 CPP_WARNINGS =
 ifndef CFLAGS
-CFLAGS	= -g -O2 -pipe -flto-partition=none
+CFLAGS	= -g -O2 -pipe

 ifdef DEBUG
 CFLAGS += -pg -D DEBUG
@@ -70,6 +70,8 @@ CFLAGS = -g -pg -fprofile-arcs -ftest-coverage
 endif
 endif #CFLAGS

+CFLAGS	+= -flto-partition=none
+
 EXTRA_CXXFLAGS = ${CFLAGS} ${CPPFLAGS} ${CXX_WARNINGS} -std=gnu++0x
 EXTRA_CFLAGS = ${EXTRA_CXXFLAGS} ${CPP_WARNINGS}

--- a/parser/tst/dirtest.sh
+++ b/parser/tst/dirtest.sh
@@ -31,8 +31,9 @@ do_tst() {
 	shift 2
 	#global tmpdir

-	${APPARMOR_PARSER} "$@" > "$tmpdir/out" 2>/dev/null
+	${APPARMOR_PARSER} "$@" > "$tmpdir/out.unsorted" 2>/dev/null
 	rc=$?
+	LC_ALL=C sort "$tmpdir/out.unsorted" > "$tmpdir/out"
 	if [ $rc -ne 0 ] && [ "$expected" != "fail" ] ; then
 		echo "failed: expected \"$expected\" but parser returned error"
 		return 1
--- a/parser/tst/dirtest/dirtest.out
+++ b/parser/tst/dirtest/dirtest.out
@@ -1,3 +1,3 @@
-good_target
 a_profile
 b_profile
+good_target
--- a/profiles/Makefile
+++ b/profiles/Makefile
@@ -41,7 +41,7 @@ ifdef USE_SYSTEM
    LOGPROF?=aa-logprof
 else
    # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am
-    PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")
+    PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) ../libraries/libapparmor/swig/python/test/buildpath.py)
    LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/
    LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH)
    PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH)
--- a/profiles/apparmor.d/abstractions/exo-open
+++ b/profiles/apparmor.d/abstractions/exo-open
@@ -51,13 +51,6 @@

  /{,usr/}bin/which rix,

-  # Deny DBus
-
-  # for GTK error message dialog, not required exo-open to work.
-  deny dbus send
-    bus=session
-    path=/org/gtk/vfs/mounttracker,
-
  # System files

  /etc/xdg/{,xdg-*/}xfce4/helpers.rc r,
Author	SHA1	Message	Date
John Johansen	0ead606d9e	Prepoare for AppArmor 3.0.7 release - update version file Signed-off-by: John Johansen <john.johansen@canonical.com>	2022-08-09 01:56:58 -07:00
Georgia Garcia	20c28f25ce	Merge Fix setuptools version detection in buildpath.py libraries/libapparmor/swig/python/test/buildpath.py: The changes introduced in `cc7f549665` targetted a wrong setuptools version (61.2). The change in build directory naming has been introduced with 62.0. Fixes #259 Fixes #39 Closes #39 and #259 MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/904 Approved-by: Georgia Garcia <georgia.garcia@canonical.com> Merged-by: Georgia Garcia <georgia.garcia@canonical.com> (cherry picked from commit `a555ccd9f4`) `fda39098` Fix setuptools version detection in buildpath.py `1ff0c2c7` Use basepath.py in profiles Makefile	2022-08-03 17:22:25 +00:00
John Johansen	702c282325	Prepare for AppArmor 3.0.6 release - update version file Signed-off-by: John Johansen <john.johansen@canonical.com>	2022-08-01 01:22:42 -07:00
John Johansen	822db765c6	Merge abstraction/exo-open: Remove dbus deny rule Abstractions should not generally include deny rules as this can unduly constrain profiles which include them due to the precedent matching rules between deny vs allow rules. Also as per the comment, this is not required for exo-open to work, so simply omit it from the abstraction for now. Finally, in Ubuntu, the evince profile includes the exo-open abstraction and this deny rule causes evince to fail to initialise correctly as it then assumes it cannot use gvfs. Signed-off-by: Alex Murray <alex.murray@canonical.com> MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/884 Approved-by: John Johansen <john@jjmx.net> Merged-by: John Johansen <john@jjmx.net> (cherry picked from commit `d7e3f33aa8`) Signed-off-by: John Johansen <john.johansen@canonical.com>	2022-07-26 23:23:49 -07:00
Georgia Garcia	e34149546d	parser: fix LTO build The previous fix for LTO builds in `b6d3daa7` did not take into consideration that LTO support could be added through CFLAGS,in which case the fix would not be applied. This patch applied the fix -flto-partition=none even if CFLAGS is already defined. Signed-off-by: Georgia Garcia <georgia.garcia@canonical.com> Closes #214 MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/901 Acked-by: John Johansen <john@jjmx.net> Merged-by: Georgia Garcia <georgia.garcia@canonical.com> (cherry picked from commit `0afc2cbb84`)	2022-07-25 17:36:05 -03:00
Christian Boltz	8668d4a456	Merge dirtest.sh: don't rely on apparmor_parser -N's output sort order to be deterministic I've seen this test fail because "apparmor_parser -N" returned the expected lines, but in a different order than what's expected (dirtest.out). To fix this, sort both the expected and actual output. MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/900 Approved-by: Jon Tourville <jon.tourville@canonical.com> Approved-by: Christian Boltz <apparmor@cboltz.de> Merged-by: Christian Boltz <apparmor@cboltz.de> (cherry picked from commit `1f3a817c11`) `c0815d0e` dirtest.sh: don't rely on apparmor_parser -N's output sort order to be deterministic	2022-07-25 20:09:30 +00:00
@@ -1 +1 @@
 .0.5
 .0.7