apparmor

mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 07:15:18 +00:00

Author	SHA1	Message	Date
Steve Beattie	ea127f13cd	common/Version: bump version for 3.1.1 release Signed-off-by: Steve Beattie <steve.beattie@canonical.com>	2022-08-26 23:35:24 -07:00
Christian Boltz	480cb56553	Merge profiles: permit php-fpm pid files directly under run/ The upstream php-fpm.conf file carries the following pid file example path: [global] ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none ;pid = run/php-fpm.pid Add this path to profiles/apparmor.d/php-fpm, alongside the current nested "@{run}/php{,-fpm}/php*-fpm.pid" wildcard. Fixes: https://gitlab.com/apparmor/apparmor/-/issues/267 Suggested-by: Ali Abdallah <ali.abdallah@suse.com> Signed-off-by: David Disseldorp <ddiss@suse.de> Closes #267 MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/914 Approved-by: Christian Boltz <apparmor@cboltz.de> Merged-by: Christian Boltz <apparmor@cboltz.de> (cherry picked from commit `d024100efe`) `d8533ec8` profiles: permit php-fpm pid files directly under run/	2022-08-26 10:36:11 +00:00
Georgia Garcia	075c69a4eb	Merge [3.1] libapparmor: fix mistaken SO version bump In commit `7c7224004` ("Prepare for AppArmor 3.1 release"), as preperation for the AppArmor 3.1.0 release, the SO versioning information was adjusted, using a more significant bump to give prior AppArmor releases room to address bugs in libapparmor without ending up with conflicting SO versions. Unfortunately, that process was untested and because AA_LIB_AGE was not incremented by the same amount as AA_LIB_CURRENT, this resulted in an accidental major SO versions bump with the library SO version being: libapparmor.so.4.9.0 This commit increments AA_LIB_AGE by the same amount, resulting in a library versioned as: libapparmor.so.1.12.0 and adds a note to mention that AA_LIB_AGE needs to be incremented in the same way as AA_LIB_CURRENT. This fix is intended to address this for the 3.1 branch; I'd like to find a better approach for the development branch that can be used in future AppArmor primary releases. In general, thanks to symbol versioning (see `libraries/libapparmor/src/libapparmor.map`) we should not need to ever bump the SO version except in an extreme case. Fixes: `7c7224004` ("Prepare for AppArmor 3.1 release") Signed-off-by: Steve Beattie <steve.beattie@canonical.com> Bug: https://gitlab.com/apparmor/apparmor/-/issues/266 MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/913 Approved-by: Georgia Garcia <georgia.garcia@canonical.com> Merged-by: Georgia Garcia <georgia.garcia@canonical.com>	2022-08-25 20:10:30 +00:00
Steve Beattie	f9dbaa38ec	[3.1] libapparmor: fix mistaken SO version bump In commit `7c7224004` ("Prepare for AppArmor 3.1 release"), as preperation for the AppArmor 3.1.0 release, the SO versioning information was adjusted, using a more significant bump to give prior AppArmor releases room to address bugs in libapparmor without ending up with conflicting SO versions. Unfortunately, that process was untested and because AA_LIB_AGE was not incremented by the same amount as AA_LIB_CURRENT, this resulted in an accidental major SO versions bump with the library SO version being: libapparmor.so.4.9.0 This commit increments AA_LIB_AGE by the same amount, resulting in a library versioned as: libapparmor.so.1.12.0 and adds a note to mention that AA_LIB_AGE needs to be incremented in the same way as AA_LIB_CURRENT. This fix is intended to address this for the 3.1 branch; I'd like to find a better approach for the development branch that can be used in future AppArmor primary releases. In general, thanks to symbol versioning (see `libraries/libapparmor/src/libapparmor.map`) we should not need to ever bump the SO version except in an extreme case. Fixes: `7c7224004` ("Prepare for AppArmor 3.1 release") Signed-off-by: Steve Beattie <steve.beattie@canonical.com> Bug: https://gitlab.com/apparmor/apparmor/-/issues/266	2022-08-25 11:55:42 -07:00

3 changed files with 5 additions and 3 deletions

2

common/Version

View File

`@@ -1 +1 @@`
	`3.1.0`	`3.1.1`

									
										5

libraries/libapparmor/src/Makefile.am
									
												View File
												
					@@ -16,7 +16,8 @@ INCLUDES = $(all_includes)

					#        problems in the unlikely event where an interface has to break.

					#        problems in the unlikely event where an interface has to break.

					#    - set AA_LIB_REVISION to 0.

					#    - set AA_LIB_REVISION to 0.

					# 4. If any interfaces have been added since the last public release, then

					# 4. If any interfaces have been added since the last public release, then

					#    - increment AA_LIB_AGE.

					#    - increment AA_LIB_AGE by the same amount that AA_LIB_CURRENT was

					#      incremented.

					# 5. If any interfaces have been removed or changed since the last public

					# 5. If any interfaces have been removed or changed since the last public

					#    release, then

					#    release, then

					#    - set AA_LIB_AGE to 0.

					#    - set AA_LIB_AGE to 0.

					@@ -31,7 +32,7 @@ INCLUDES = $(all_includes)

					#

					#

					AA_LIB_CURRENT = 13

					AA_LIB_CURRENT = 13

					AA_LIB_REVISION = 0

					AA_LIB_REVISION = 0

					AA_LIB_AGE = 9

					AA_LIB_AGE = 12

					SUFFIXES = .pc.in .pc

					SUFFIXES = .pc.in .pc

1

profiles/apparmor.d/php-fpm

View File

   # we need to be able to create all sockets
   @{run}/php{,-fpm}/php*-fpm.pid rw,
+  @{run}/php*-fpm.pid rw,
   @{run}/php{,-fpm}/php*-fpm.sock rwlk,
   # to reload

Compare commits

4 Commits

v4.0.1 ... v3.1.1

2

common/Version

View File

5

libraries/libapparmor/src/Makefile.am

View File

1

profiles/apparmor.d/php-fpm

View File

Compare commits

4 Commits v4.0.1 ... v3.1.1

2 common/Version Unescape Escape View File

5 libraries/libapparmor/src/Makefile.am Unescape Escape View File

1 profiles/apparmor.d/php-fpm Unescape Escape View File

4 Commits

v4.0.1 ... v3.1.1

2

common/Version

View File

5

libraries/libapparmor/src/Makefile.am

View File

1

profiles/apparmor.d/php-fpm

View File