7ae734d682
- update to AppArmor 3.0.4
- various fixes in profiles, abstractions, apparmor_parser and utils
(some of them were already included as patches)
- add support for mctp address family
- see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.0.4
for the full upstream changelog
- remove upstream(ed) patches:
- aa-notify-more-arch-mr809.diff
- ruby-3.1-build-fix.diff
- add-samba-bgqd.diff
- openssl-engdef-mr818.diff
- profiles-python-3.10-mr783.diff
- update-samba-abstractions-ldb2.diff
- refresh patches:
- apparmor-samba-include-permissions-for-shares.diff
- ruby-2_0-mkmf-destdir.patch
AppArmor 3.0.4 also includes a fix for the issue with 'mctp' found via
https://build.opensuse.org/request/show/951354
so you might want to pick this SR into Staging:O
OBS-URL: https://build.opensuse.org/request/show/953283
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=316
21 lines
985 B
Diff
21 lines
985 B
Diff
Index: libraries/libapparmor/swig/ruby/extconf.rb
|
|
===================================================================
|
|
--- a/libraries/libapparmor/swig/ruby/extconf.rb.orig 2022-02-10 17:54:05.008544807 +0100
|
|
+++ b/libraries/libapparmor/swig/ruby/extconf.rb 2022-02-10 17:54:21.792506325 +0100
|
|
@@ -20,7 +20,14 @@ if find_library('apparmor', 'parse_recor
|
|
# hack 2: strip all rpath references
|
|
open('Makefile.ruby', 'w') do |out|
|
|
IO.foreach('Makefile') do |line|
|
|
- out.puts line.gsub(/-Wl,-R'[^']*'/, '')
|
|
+ l = line.gsub(/-Wl,-R'[^']*'/, '')
|
|
+ # oldincludedir = $(DESTDIR)/usr/include
|
|
+ # -> oldincludedir = /usr/include
|
|
+ l = l.gsub(/(oldincludedir)\s+=\s+\$\(DESTDIR\)(.*)/) { |m| "#{$1} = #{$2}" }
|
|
+ # hdrdir = $(includedir)/$(RUBY_VERSION_NAME)
|
|
+ # -> hdrdir = $(oldincludedir)/$(RUBY_VERSION_NAME)
|
|
+ l = l.gsub(/(hdrdir)\s+=\s+\$\(includedir\)(.*)/) { |m| "#{$1} = $(oldincludedir)#{$2}" }
|
|
+ out.puts l
|
|
end
|
|
end
|
|
else
|