Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2022-02-11 23:06:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Fri Feb 11 23:06:37 2022 rev:164 rq:953284 version:3.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2022-01-29 21:02:01.414697630 +0100 +++ /work/SRC/openSUSE:Factory/.apparmor.new.1956/apparmor.changes 2022-02-11 23:06:49.090507312 +0100 @@ -1,0 +2,20 @@ +Thu Feb 10 16:55:38 UTC 2022 - Christian Boltz <suse-b...@cboltz.de> + +- 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 + +------------------------------------------------------------------- Old: ---- aa-notify-more-arch-mr809.diff add-samba-bgqd.diff apparmor-3.0.3.tar.gz apparmor-3.0.3.tar.gz.asc openssl-engdef-mr818.diff profiles-python-3.10-mr783.diff ruby-3.1-build-fix.diff update-samba-abstractions-ldb2.diff New: ---- apparmor-3.0.4.tar.gz apparmor-3.0.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.GJ7fuy/_old 2022-02-11 23:06:49.870509478 +0100 +++ /var/tmp/diff_new_pack.GJ7fuy/_new 2022-02-11 23:06:49.874509488 +0100 @@ -45,7 +45,7 @@ %define JAR_FILE changeHatValve.jar Name: apparmor -Version: 3.0.3 +Version: 3.0.4 Release: 0 Summary: AppArmor userlevel parser utility License: GPL-2.0-or-later @@ -78,26 +78,6 @@ # make <apache2.d> include in apache extra profile optional to make openQA happy (boo#1178527) Patch6: apache-extra-profile-include-if-exists.diff -# update abstractions/python and profiles for python 3.10 (submitted upstream 2021-08-11 https://gitlab.com/apparmor/apparmor/-/merge_requests/783) -Patch7: profiles-python-3.10-mr783.diff - -# add samba-bgqd profile (accepted upstream 2021-10-15 https://gitlab.com/apparmor/apparmor/-/merge_requests/807) -# updated for boo#1192336 (merged upstream 2021-12-20 https://gitlab.com/apparmor/apparmor/-/merge_requests/819 in 3.0 and master) -Patch8: add-samba-bgqd.diff - -# aa-notify: Add support for reading s390x and aarch64 wtmp file (boo#1181155) (merged upstream 2021-11-08 in master and 3.0 branch - https://gitlab.com/apparmor/apparmor/-/merge_requests/809) -Patch9: aa-notify-more-arch-mr809.diff - -# allow reading /etc/ssl/engdef.d/ and /etc/ssl/engines.d/ in abstractions/openssl (submitted upstream 2021-12-19 - https://gitlab.com/apparmor/apparmor/-/merge_requests/818) -Patch10: openssl-engdef-mr818.diff - -# add update-samba-abstractions-ldb2.diff to cater for changes to ldb -# packaging to allow parallel installation with libldb bsc#1192684 (submitted upstream 2022-01-17 - https://gitlab.com/apparmor/apparmor/-/merge_requests/821) -Patch11: update-samba-abstractions-ldb2.diff - -# fix build with ruby 3.1 (boo#1194221, from upstream https://gitlab.com/apparmor/apparmor/-/merge_requests/827) -Patch12: ruby-3.1-build-fix.diff - PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor @@ -360,12 +340,6 @@ %patch3 -p1 %patch4 %patch5 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 %build %define _lto_cflags %{nil} ++++++ libapparmor.spec ++++++ --- /var/tmp/diff_new_pack.GJ7fuy/_old 2022-02-11 23:06:49.902509567 +0100 +++ /var/tmp/diff_new_pack.GJ7fuy/_new 2022-02-11 23:06:49.906509578 +0100 @@ -18,7 +18,7 @@ Name: libapparmor -Version: 3.0.3 +Version: 3.0.4 Release: 0 Summary: Utility library for AppArmor License: LGPL-2.1-or-later ++++++ apparmor-3.0.3.tar.gz -> apparmor-3.0.4.tar.gz ++++++ /work/SRC/openSUSE:Factory/apparmor/apparmor-3.0.3.tar.gz /work/SRC/openSUSE:Factory/.apparmor.new.1956/apparmor-3.0.4.tar.gz differ: char 5, line 1 ++++++ apparmor-samba-include-permissions-for-shares.diff ++++++ --- /var/tmp/diff_new_pack.GJ7fuy/_old 2022-02-11 23:06:49.974509766 +0100 +++ /var/tmp/diff_new_pack.GJ7fuy/_new 2022-02-11 23:06:49.978509777 +0100 @@ -20,7 +20,7 @@ === modified file 'profiles/apparmor.d/usr.sbin.smbd' --- profiles/apparmor.d/usr.sbin.smbd 2011-08-27 18:50:42 +0000 +++ profiles/apparmor.d/usr.sbin.smbd 2011-10-19 09:37:04 +0000 -@@ -56,6 +56,10 @@ +@@ -59,6 +59,10 @@ @{HOMEDIRS}/** lrwk, /var/lib/samba/usershares/{,**} lrwk, ++++++ ruby-2_0-mkmf-destdir.patch ++++++ --- /var/tmp/diff_new_pack.GJ7fuy/_old 2022-02-11 23:06:50.010509866 +0100 +++ /var/tmp/diff_new_pack.GJ7fuy/_new 2022-02-11 23:06:50.014509878 +0100 @@ -1,10 +1,11 @@ -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile ../orig-apparmor-2.8.1/libraries/libapparmor/swig/ruby/extconf.rb ./libraries/libapparmor/swig/ruby/extconf.rb ---- ../orig-apparmor-2.8.1/libraries/libapparmor/swig/ruby/extconf.rb 2009-05-12 23:56:56.000000000 +0200 -+++ ./libraries/libapparmor/swig/ruby/extconf.rb 2013-06-04 14:52:01.677579537 +0200 -@@ -28,7 +28,14 @@ +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.new') do |line| + IO.foreach('Makefile') do |line| - out.puts line.gsub(/-Wl,-R'[^']*'/, '') + l = line.gsub(/-Wl,-R'[^']*'/, '') + # oldincludedir = $(DESTDIR)/usr/include
