Hello community, here is the log from the commit of package apparmor for openSUSE:Factory checked in at 2020-10-20 16:03:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apparmor (Old) and /work/SRC/openSUSE:Factory/.apparmor.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apparmor" Tue Oct 20 16:03:54 2020 rev:144 rq:842315 version:2.13.5 Changes: -------- --- /work/SRC/openSUSE:Factory/apparmor/apparmor.changes 2020-10-15 13:44:14.613149314 +0200 +++ /work/SRC/openSUSE:Factory/.apparmor.new.3486/apparmor.changes 2020-10-20 16:11:35.702043449 +0200 @@ -1,0 +2,16 @@ +Sat Oct 17 15:46:01 UTC 2020 - Christian Boltz <[email protected]> + +- update to AppArmor 2.13.5 + - add missing permissions to several profiles and abstractions + - bugfixes in parser and tools + - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_2.13.5 + for the detailed upstream changelog +- remove upstream(ed) patches + - changes-since-2.13.4.diff + - abstractions-X-xauth-mr582.diff + - sevdb-caps-mr589.diff + - libvirt-leaseshelper.patch + - cap_checkpoint_restore.diff +- add libapparmor-so-number.diff to fix libapparmor so version (!658) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/apparmor/libapparmor.changes 2020-03-16 10:16:26.435540857 +0100 +++ /work/SRC/openSUSE:Factory/.apparmor.new.3486/libapparmor.changes 2020-10-20 16:11:46.306048470 +0200 @@ -1,0 +2,9 @@ +Sat Oct 17 15:45:32 UTC 2020 - Christian Boltz <[email protected]> + +- update to AppArmor 2.13.5 + - fix two potential build failures + - see https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_2.13.5 + for the detailed upstream changelog +- add libapparmor-so-number.diff to fix libapparmor so version (!658) + +------------------------------------------------------------------- Old: ---- abstractions-X-xauth-mr582.diff apparmor-2.13.4.tar.gz apparmor-2.13.4.tar.gz.asc cap_checkpoint_restore.diff changes-since-2.13.4.diff libvirt-leaseshelper.patch sevdb-caps-mr589.diff New: ---- apparmor-2.13.5.tar.gz apparmor-2.13.5.tar.gz.asc libapparmor-so-number.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor.spec ++++++ --- /var/tmp/diff_new_pack.hjkqjT/_old 2020-10-20 16:11:51.286050828 +0200 +++ /var/tmp/diff_new_pack.hjkqjT/_new 2020-10-20 16:11:51.290050830 +0200 @@ -2,7 +2,7 @@ # spec file for package apparmor # # Copyright (c) 2020 SUSE LLC -# Copyright (c) 2011-2019 Christian Boltz +# Copyright (c) 2011-2020 Christian Boltz # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,7 @@ %define apache_module_path %(/usr/sbin/apxs2 -q LIBEXECDIR) Name: apparmor -Version: 2.13.4 +Version: 2.13.5 Release: 0 Summary: AppArmor userlevel parser utility License: GPL-2.0-or-later @@ -65,24 +65,11 @@ # workaround for boo#1119937 / lp#1784499 - allow network access for reading files on NFS (proper solution needs kernel fix) Patch5: apparmor-lessopen-nfs-workaround.diff -# changes and fixes since the 2.13.4 Release (v2.13.4 (= df0ac742)..5f61bd4c -Patch9: changes-since-2.13.4.diff - # update abstractions/base and nameservice for /usr/etc (submitted upstream 2020-01-25 https://gitlab.com/apparmor/apparmor/merge_requests/447, only merged to master, not 2.13.x) Patch10: ./usr-etc-abstractions-base-nameservice.diff -# allow /{,var/}run/user/*/xauth_* r, in abstractions/X (submitted upstream 2020-07-20 https://gitlab.com/apparmor/apparmor/-/merge_requests/581 (master), https://gitlab.com/apparmor/apparmor/-/merge_requests/582 (2.11..2.13)) -Patch11: abstractions-X-xauth-mr582.diff - -# add CAP_BPF and CAP_PERFMON to severity.db (merged upstream 2020-08-07 https://gitlab.com/apparmor/apparmor/-/merge_requests/589 (2.11..master)) -Patch12: sevdb-caps-mr589.diff - -# add /usr/libexec as a path for libvirt_leaseshelper script, jsc#SLE-14253 -# needs to go upstream -Patch13: libvirt-leaseshelper.patch - -# add CAP_CHECKPOINT_RESTORE to severity.db (https://gitlab.com/apparmor/apparmor/-/merge_requests/656, submitted upstream 2020-10-14 for 2.10..master) -Patch14: cap_checkpoint_restore.diff +# fix libapparmor so version (submitted upstream 2020-10-17 https://gitlab.com/apparmor/apparmor/-/merge_requests/658) +Patch11: libapparmor-so-number.diff PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -372,7 +359,6 @@ %patch3 -p1 %patch4 %patch5 -%patch9 -p1 %if 0%{?suse_version} > 1500 # /usr/etc/ changes in abstractions, apply only to Tumbleweed, but not to Leap 15.x @@ -380,9 +366,6 @@ %endif %patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 %build %define _lto_cflags %{nil} ++++++ libapparmor.spec ++++++ --- /var/tmp/diff_new_pack.hjkqjT/_old 2020-10-20 16:11:51.318050844 +0200 +++ /var/tmp/diff_new_pack.hjkqjT/_new 2020-10-20 16:11:51.322050845 +0200 @@ -18,7 +18,7 @@ Name: libapparmor -Version: 2.13.4 +Version: 2.13.5 Release: 0 Summary: Utility library for AppArmor License: LGPL-2.1-or-later @@ -32,6 +32,9 @@ BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build +# fix libapparmor so version (submitted upstream 2020-10-17 https://gitlab.com/apparmor/apparmor/-/merge_requests/658 +Patch1: libapparmor-so-number.diff + %description This package provides the libapparmor library, which contains the change_hat(2) symbol, used for sub-process confinement by AppArmor, as @@ -67,6 +70,7 @@ %prep %setup -q -n apparmor-%{version} +%patch1 -p1 %build %define _lto_cflags %{nil} ++++++ apparmor-2.13.4.tar.gz -> apparmor-2.13.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/apparmor/apparmor-2.13.4.tar.gz /work/SRC/openSUSE:Factory/.apparmor.new.3486/apparmor-2.13.5.tar.gz differ: char 5, line 1 ++++++ libapparmor-so-number.diff ++++++ commit 145136f6041aba4fffbbf8d1a5df368998b81ca1 Author: Christian Boltz <[email protected]> Date: Sat Oct 17 17:30:39 2020 +0200 Fix 2.13 libapparmor so version ab0f4ab2ed7e734827b143cd32dace4444875e9b increased AA_LIB_REVISION and AA_LIB_AGE, with the result that 2.13.5 builds libapparmor.so.0.7.3, while 2.13.4 had libapparmor-1.6.2 This patch reverts the AA_LIB_AGE increase to fix the so name so that we'll get libapparmor-1.6.3. Note: If you want to apply this fix on top of the 2.13.5 tarball, you'll need to also apply the patch to Makefile.in. diff --git a/libraries/libapparmor/src/Makefile.am b/libraries/libapparmor/src/Makefile.am index b59b2d1c..6d9c6296 100644 --- a/libraries/libapparmor/src/Makefile.am +++ b/libraries/libapparmor/src/Makefile.am @@ -28,7 +28,7 @@ INCLUDES = $(all_includes) # AA_LIB_CURRENT = 7 AA_LIB_REVISION = 3 -AA_LIB_AGE = 7 +AA_LIB_AGE = 6 SUFFIXES = .pc.in .pc diff --git a/libraries/libapparmor/src/Makefile.am b/libraries/libapparmor/src/Makefile.am index b59b2d1c..6d9c6296 100644 --- a/libraries/libapparmor/src/Makefile.in +++ b/libraries/libapparmor/src/Makefile.in @@ -587,7 +587,7 @@ INCLUDES = $(all_includes) # AA_LIB_CURRENT = 7 AA_LIB_REVISION = 3 -AA_LIB_AGE = 7 +AA_LIB_AGE = 6 SUFFIXES = .pc.in .pc BUILT_SOURCES = grammar.h scanner.h af_protos.h AM_LFLAGS = -v
