openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package apparmor

--- apparmor.changes.orig
+++ apparmor.changes
@@ -1,7 +1,44 @@
 -------------------------------------------------------------------
-Fri Apr  5 15:16:04 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+Sun Apr 21 15:37:49 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
 
-- Use full URLs for source tarball and signature.
+- add tools-fix-redefinition.diff: fix redefinition of _ in tools
+
+-------------------------------------------------------------------
+Sun Apr 14 16:03:12 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- Update to AppArmor 4.0.1
+  - drop make-python-setuptools-happy.diff - no longer needed
+
+-------------------------------------------------------------------
+Wed Apr 10 21:35:06 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- Update to AppArmor 4.0 beta4
+  - Update make-python-setuptools-happy.diff for beta4
+
+-------------------------------------------------------------------
+Wed Mar 20 12:45:46 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- Update to AppArmor 4.0 beta3
+  - Drop upstreamed dovecot-unix_chkpwd.diff
+  - Update make-python-setuptools-happy.diff for beta3
+- No longer package (unused) /var/lib/apparmor/
+
+-------------------------------------------------------------------
+Thu Mar  7 18:35:02 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- Update to AppArmor 4.0 beta2
+- Drop upstreamed patches:
+  - mount-rule-typo.diff
+  - test-mount-useful-message.diff
+  - mount-obs-filesystems.diff
+- Update make-python-setuptools-happy.diff for beta2
+
+-------------------------------------------------------------------
+Sun Mar  3 16:59:17 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- Drop /etc/apparmor.d/cache symlink (was the default cache dir up
+  to 2.12) as preparation to get rid of /var/lib/apparmor/ (old
+  cache location)
 
 -------------------------------------------------------------------
 Fri Mar  1 20:54:12 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
@@ -11,6 +48,20 @@ Fri Mar  1 20:54:12 UTC 2024 - Christian
   This also fixes boo#1220708 (missing daemon-reload).
 
 -------------------------------------------------------------------
+Fri Mar  1 13:07:10 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- Update to AppArmor 4.0 beta1
+- Drop upstreamed smbd-unix_chkpwd.diff and
+  apparmor-abstractions-openssl-allow-version-specific-en.patch
+- Add mount-rule-typo.diff - that typo fix fixes a test failure
+- Add test-mount-useful-message.diff to get a useful error message
+  if test-mount.py fails
+- Add mount-obs-filesystems.diff to include '9p' (found in OBS
+  /proc/filesystems) in list of known filesystems
+- Update make-python-setuptools-happy.diff to beta1
+- add BR: autoconf-archive which is now needed for building libapparmor
+
+-------------------------------------------------------------------
 Tue Feb 27 14:26:58 UTC 2024 - Noel Power <nopower@suse.com>
 
 - Add smbd-unix_chkpwd.diff to allow smbd to execute
@@ -33,6 +84,14 @@ Tue Feb 20 02:41:09 UTC 2024 - David Dis
   (bsc#1220084)
 
 -------------------------------------------------------------------
+Sun Feb 18 18:03:05 UTC 2024 - Christian Boltz <suse-beta@cboltz.de>
+
+- Update to AppArmor 4.0 alpha4
+- Python setuptools no longer like "~" in the version.
+  Add make-python-setuptools-happy.diff to make them happy.
+- delete "unconfined" profiles for now
+
+-------------------------------------------------------------------
 Thu Feb  8 05:20:26 UTC 2024 - David Disseldorp <ddiss@suse.com>
 
 - Add apparmor-abstractions-openssl-allow-version-specific-en.patch to
@@ -75,12 +134,29 @@ Mon Sep 25 14:07:39 UTC 2023 - David Dis
   (bsc#1215596)
 
 -------------------------------------------------------------------
+Mon Sep 18 17:17:39 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 4.0 alpha3
+
+-------------------------------------------------------------------
+Tue Aug 15 08:32:59 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 4.0 alpha2
+- mark local/* as %ghost so that these dummy files don't get installed
+  (but existing files will be kept)
+
+-------------------------------------------------------------------
 Tue Jul 25 09:28:33 UTC 2023 - David Disseldorp <ddiss@suse.com>
 
 - Add pam_apparmor README, referenced from online cha-apparmor-pam.html
   documentation (bsc#1213472)
 
 -------------------------------------------------------------------
+Sun Jul 16 22:12:40 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 4.0 alpha1
+
+-------------------------------------------------------------------
 Thu Jun 22 11:16:52 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
 
 - update to AppArmor 3.1.6 (jsc#PED-5600)
--- apparmor.spec.orig
+++ apparmor.spec
@@ -53,16 +53,19 @@
 #define JNI_SO libJNIChangeHat.so
 %define JAR_FILE changeHatValve.jar
 
+%define tarversion v4.0.1
+%define pyeggversion 4.0.1
+
 Name:           apparmor
-Version:        3.1.7
+Version:        4.0.1
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Security
 URL:            https://launchpad.net/apparmor
-Source0:        https://launchpad.net/apparmor/3.1/%{version}/+download/apparmor-%{version}.tar.gz
-Source1:        https://launchpad.net/apparmor/3.1/%{version}/+download/apparmor-%{version}.tar.gz.asc
-Source2:        %{name}.keyring
+Source0:        apparmor-%{tarversion}.tar.gz
+#Source1:        apparmor-%{version}.tar.gz.asc
+#Source2:        %{name}.keyring
 
 Source5:        update-trans.sh
 Source6:        baselibs.conf
@@ -74,10 +77,12 @@ Patch1:         apparmor-enable-profile-
 
 # include autogenerated profile sniplet for samba shares (bnc#688040) - include rule upstreamed in 3.0.5 (MR 838), now "just" creates the local/ sniplet
 # (technically only needed in Leap 15.x, the samba script in Tumbleweed also works if the local/ sniplet doesn't exist - but dropping the local/ sniplet will move existing autogenerated sniplets to *.rpmsave)
+# TODO: re-check now that local/* are %ghost'ed
 Patch2:         apparmor-samba-include-permissions-for-shares.diff
 
 # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, kkaempf@suse.de
-Patch3:         ruby-2_0-mkmf-destdir.patch
+# [cb 2023-07-16] doesn't change a single bit in the resulting RPMs (tested with 3.1.6)
+	#Patch3:         ruby-2_0-mkmf-destdir.patch
 
 # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21)
 Patch4:         apparmor-lessopen-profile.patch
@@ -92,23 +97,20 @@ Patch6:         apache-extra-profile-inc
 # add path for precompiled cache (only done/applied if precompiled_cache is enabled)
 Patch7:         apparmor-enable-precompiled-cache.diff
 
-# allow dovecot-auth to execute unix_chkpwd, and add a profile for unix_chkpwd. This is needed for PAM 1.6 (boo#1219139)
-Patch9:         dovecot-unix_chkpwd.diff
-
-# abstractions/openssl: allow version specific engdef & engines paths (boo#1219571)
-Patch10:        apparmor-abstractions-openssl-allow-version-specific-en.patch
-
-# allow smbd to execute unix_chkpwd (boo#1220032)
-# https://gitlab.com/apparmor/apparmor/-/merge_requests/1159
-Patch11:        smbd-unix_chkpwd.diff
+# fix redefinition of _ in tools (submitted upstream 2024-04-21 https://gitlab.com/apparmor/apparmor/-/merge_requests/1218)
+Patch50:        tools-fix-redefinition.diff
 
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  autoconf
+BuildRequires:  autoconf-archive
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  iproute2
+BuildRequires:  libtool
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
 BuildRequires:  python3
@@ -355,23 +357,21 @@ SubDomain.
 %lang_package -n apparmor-parser
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{tarversion}
 
 # very loose profile that doesn't even match the apache2 binary path in openSUSE. Move it away instead of confusing people (boo#872984)
 mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/profiles/extras/
 
 %patch -P 1
 %patch -P 2
-%patch -P 3 -p1
+	#patch -P 3 -p1
 %patch -P 4
-%patch -P 5
+#patch -P 5  no longer needed
 %patch -P 6
 %if %{with precompiled_cache}
 %patch -P 7
 %endif
-%patch -P 9 -p1
-%patch -P 10 -p1
-%patch -P 11 -p1
+%patch -P 50 -p1
 
 %build
 export SUSE_ASNEEDED=0
@@ -379,6 +379,7 @@ export SUSE_ASNEEDED=0
 # libapparmor:
 (
   cd ./libraries/libapparmor
+  sh ./autogen.sh
   %configure \
 %if %{with perl}
   --with-perl \
@@ -429,6 +430,20 @@ make -C profiles
 parser/apparmor_parser --config-file $(pwd)/parser/parser.conf --write-cache -QT  -L $(pwd)/profiles/cache -I profiles/apparmor.d/ profiles/apparmor.d/
 %endif
 
+# create filelist of previously shipped local/* files
+# (adding them as %ghost prevents modified files from being moved to *.rpmsave)
+for oldlocal in \
+    bin.ping lsb_release nvidia_modprobe php-fpm samba-bgqd samba-dcerpcd samba-rpcd samba-rpcd-classic samba-rpcd-spoolss sbin.klogd sbin.syslogd sbin.syslog-ng \
+    usr.bin.lessopen.sh usr.lib.dovecot.anvil usr.lib.dovecot.auth usr.lib.dovecot.config usr.lib.dovecot.deliver usr.lib.dovecot.dict usr.lib.dovecot.director \
+    usr.lib.dovecot.doveadm-server usr.lib.dovecot.dovecot-auth usr.lib.dovecot.dovecot-lda usr.lib.dovecot.imap usr.lib.dovecot.imap-login usr.lib.dovecot.lmtp \
+    usr.lib.dovecot.log usr.lib.dovecot.managesieve usr.lib.dovecot.managesieve-login usr.lib.dovecot.pop3 usr.lib.dovecot.pop3-login usr.lib.dovecot.replicator \
+    usr.lib.dovecot.script-login usr.lib.dovecot.ssl-params usr.lib.dovecot.stats usr.sbin.apache2 usr.sbin.avahi-daemon usr.sbin.dnsmasq usr.sbin.dovecot \
+    usr.sbin.identd usr.sbin.mdnsd usr.sbin.nmbd usr.sbin.nscd usr.sbin.ntpd usr.sbin.smbd usr.sbin.smbd-shares usr.sbin.smbldap-useradd  usr.sbin.traceroute \
+    usr.sbin.winbindd zgrep
+do
+    echo "%ghost /etc/apparmor.d/local/$oldlocal"
+done > oldlocal.files
+
 %check
 make check -C libraries/libapparmor
 make check -C parser
@@ -479,10 +494,6 @@ test -f %{buildroot}/usr/share/apparmor/
 %endif
 
 %makeinstall SBINDIR="%{buildroot}%{sbindir}" APPARMOR_BIN_PREFIX="%{buildroot}%{apparmor_bin_prefix}" -C parser
-# default cache dir (up to 2.12) is /etc/apparmor.d/cache - not the best location.
-# Use /var/lib/apparmor/cache and make /etc/apparmor.d/cache a symlink to it
-mkdir -p %{buildroot}%{_localstatedir}/lib/apparmor/cache
-( cd %{buildroot}/%{_sysconfdir}/apparmor.d/ && ln -s ../../%{_localstatedir}/lib/apparmor/cache cache )
 # default cache dir (starting with 2.13) is /etc/apparmor.d/cache.d - also not the best location
 # Use /var/cache/apparmor and make /etc/apparmor.d/cache.d a symlink to it
 mkdir -p %{buildroot}%{_localstatedir}/cache/apparmor
@@ -535,7 +546,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %doc parser/*.[1-9].html
 %doc utils/vim/apparmor.vim.5.html
 %doc common/apparmor.css
-%doc parser/techdoc.pdf
+#doc parser/techdoc.pdf
 # apparmor.vim is included in the vim package. Ideally it should be in a -devel package, but that's overmuch for one file
 %dir %{_datadir}/apparmor
 %{_datadir}/apparmor/apparmor.vim
@@ -548,6 +559,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %{_bindir}/aa-enabled
 %{_bindir}/aa-exec
 %{_bindir}/aa-features-abi
+%{_sbindir}/aa-load
 %{_sbindir}/aa-status
 %{_sbindir}/apparmor_status
 %{_sbindir}/status
@@ -555,12 +567,10 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %{_sbindir}/exec
 %dir %attr(-, root, root) %{_sysconfdir}/apparmor
 %dir %{_sysconfdir}/apparmor.d
-%{_sysconfdir}/apparmor.d/cache
 %{_sysconfdir}/apparmor.d/cache.d
 %{sbindir}/rcapparmor
 %{_unitdir}/apparmor.service
 %config(noreplace) %{_sysconfdir}/apparmor/parser.conf
-%{_localstatedir}/lib/apparmor
 %{_localstatedir}/cache/apparmor
 %dir %attr(-, root, root) %{apparmor_bin_prefix}
 %{apparmor_bin_prefix}/rc.apparmor.functions
@@ -590,6 +600,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %dir %{_sysconfdir}/apparmor.d/
 %dir %{_sysconfdir}/apparmor.d/abi
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/3.0
+%config(noreplace) %{_sysconfdir}/apparmor.d/abi/4.0
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-outoftree-network
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-vanilla
 %dir %{_sysconfdir}/apparmor.d/abstractions
@@ -599,23 +610,118 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %dir %{_sysconfdir}/apparmor.d/tunables
 %config(noreplace) %{_sysconfdir}/apparmor.d/tunables/*
 
-%files profiles
+%files profiles -f oldlocal.files
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/apparmor.d/apache2.d
 %config(noreplace) %{_sysconfdir}/apparmor.d/apache2.d/phpsysinfo
 %config(noreplace) %{_sysconfdir}/apparmor.d/bin.*
 %config(noreplace) %{_sysconfdir}/apparmor.d/sbin.*
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.*
+
+%config(noreplace) %{_sysconfdir}/apparmor.d/1password
+%config(noreplace) %{_sysconfdir}/apparmor.d/Discord
+%config(noreplace) %{_sysconfdir}/apparmor.d/MongoDB_Compass
+%config(noreplace) %{_sysconfdir}/apparmor.d/QtWebEngineProcess
+%config(noreplace) %{_sysconfdir}/apparmor.d/brave
+%config(noreplace) %{_sysconfdir}/apparmor.d/buildah
+%config(noreplace) %{_sysconfdir}/apparmor.d/busybox
+%config(noreplace) %{_sysconfdir}/apparmor.d/cam
+%config(noreplace) %{_sysconfdir}/apparmor.d/ch-checkns
+%config(noreplace) %{_sysconfdir}/apparmor.d/ch-run
+%config(noreplace) %{_sysconfdir}/apparmor.d/chrome
+%config(noreplace) %{_sysconfdir}/apparmor.d/code
+%config(noreplace) %{_sysconfdir}/apparmor.d/crun
+%config(noreplace) %{_sysconfdir}/apparmor.d/devhelp
+%config(noreplace) %{_sysconfdir}/apparmor.d/element-desktop
+%config(noreplace) %{_sysconfdir}/apparmor.d/epiphany
+%config(noreplace) %{_sysconfdir}/apparmor.d/evolution
+%config(noreplace) %{_sysconfdir}/apparmor.d/firefox
+%config(noreplace) %{_sysconfdir}/apparmor.d/flatpak
+%config(noreplace) %{_sysconfdir}/apparmor.d/foliate
+%config(noreplace) %{_sysconfdir}/apparmor.d/geary
+%config(noreplace) %{_sysconfdir}/apparmor.d/github-desktop
+%config(noreplace) %{_sysconfdir}/apparmor.d/goldendict
+%config(noreplace) %{_sysconfdir}/apparmor.d/ipa_verify
+%config(noreplace) %{_sysconfdir}/apparmor.d/kchmviewer
+%config(noreplace) %{_sysconfdir}/apparmor.d/keybase
+%config(noreplace) %{_sysconfdir}/apparmor.d/lc-compliance
+%config(noreplace) %{_sysconfdir}/apparmor.d/libcamerify
+%config(noreplace) %{_sysconfdir}/apparmor.d/linux-sandbox
+%config(noreplace) %{_sysconfdir}/apparmor.d/loupe
 %config(noreplace) %{_sysconfdir}/apparmor.d/lsb_release
+%config(noreplace) %{_sysconfdir}/apparmor.d/lxc-attach
+%config(noreplace) %{_sysconfdir}/apparmor.d/lxc-create
+%config(noreplace) %{_sysconfdir}/apparmor.d/lxc-destroy
+%config(noreplace) %{_sysconfdir}/apparmor.d/lxc-execute
+%config(noreplace) %{_sysconfdir}/apparmor.d/lxc-stop
+%config(noreplace) %{_sysconfdir}/apparmor.d/lxc-unshare
+%config(noreplace) %{_sysconfdir}/apparmor.d/lxc-usernsexec
+%config(noreplace) %{_sysconfdir}/apparmor.d/mmdebstrap
+%config(noreplace) %{_sysconfdir}/apparmor.d/msedge
+%config(noreplace) %{_sysconfdir}/apparmor.d/nautilus
+%config(noreplace) %{_sysconfdir}/apparmor.d/notepadqq
 %config(noreplace) %{_sysconfdir}/apparmor.d/nvidia_modprobe
+%config(noreplace) %{_sysconfdir}/apparmor.d/obsidian
+%config(noreplace) %{_sysconfdir}/apparmor.d/opam
+%config(noreplace) %{_sysconfdir}/apparmor.d/opera
+%config(noreplace) %{_sysconfdir}/apparmor.d/pageedit
+%config(noreplace) %{_sysconfdir}/apparmor.d/plasmashell
 %config(noreplace) %{_sysconfdir}/apparmor.d/php-fpm
+%config(noreplace) %{_sysconfdir}/apparmor.d/podman
+%config(noreplace) %{_sysconfdir}/apparmor.d/polypane
+%config(noreplace) %{_sysconfdir}/apparmor.d/privacybrowser
+%config(noreplace) %{_sysconfdir}/apparmor.d/qcam
+%config(noreplace) %{_sysconfdir}/apparmor.d/qmapshack
+%config(noreplace) %{_sysconfdir}/apparmor.d/qutebrowser
+%config(noreplace) %{_sysconfdir}/apparmor.d/rootlesskit
+%config(noreplace) %{_sysconfdir}/apparmor.d/rpm
+%config(noreplace) %{_sysconfdir}/apparmor.d/rssguard
+%config(noreplace) %{_sysconfdir}/apparmor.d/runc
 %config(noreplace) %{_sysconfdir}/apparmor.d/samba-bgqd
 %config(noreplace) %{_sysconfdir}/apparmor.d/samba-dcerpcd
 %config(noreplace) %{_sysconfdir}/apparmor.d/samba-rpcd
 %config(noreplace) %{_sysconfdir}/apparmor.d/samba-rpcd-*
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-abort
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-adduser
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-apt
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-checkpackages
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-clean
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-createchroot
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-destroychroot
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-distupgrade
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-hold
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-shell
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-unhold
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-update
+%config(noreplace) %{_sysconfdir}/apparmor.d/sbuild-upgrade
+%config(noreplace) %{_sysconfdir}/apparmor.d/scide
+%config(noreplace) %{_sysconfdir}/apparmor.d/signal-desktop
+%config(noreplace) %{_sysconfdir}/apparmor.d/slack
+%config(noreplace) %{_sysconfdir}/apparmor.d/slirp4netns
+%config(noreplace) %{_sysconfdir}/apparmor.d/steam
+%config(noreplace) %{_sysconfdir}/apparmor.d/stress-ng
+%config(noreplace) %{_sysconfdir}/apparmor.d/surfshark
+%config(noreplace) %{_sysconfdir}/apparmor.d/systemd-coredump
+%config(noreplace) %{_sysconfdir}/apparmor.d/thunderbird
+%config(noreplace) %{_sysconfdir}/apparmor.d/toybox
+%config(noreplace) %{_sysconfdir}/apparmor.d/transmission
+%config(noreplace) %{_sysconfdir}/apparmor.d/trinity
+%config(noreplace) %{_sysconfdir}/apparmor.d/tup
+%config(noreplace) %{_sysconfdir}/apparmor.d/tuxedo-control-center
 %config(noreplace) %{_sysconfdir}/apparmor.d/unix-chkpwd
+%config(noreplace) %{_sysconfdir}/apparmor.d/unprivileged_userns
+%config(noreplace) %{_sysconfdir}/apparmor.d/userbindmount
+%config(noreplace) %{_sysconfdir}/apparmor.d/uwsgi-core
+%config(noreplace) %{_sysconfdir}/apparmor.d/vdens
+%config(noreplace) %{_sysconfdir}/apparmor.d/virtiofsd
+%config(noreplace) %{_sysconfdir}/apparmor.d/vivaldi-bin
+%config(noreplace) %{_sysconfdir}/apparmor.d/vpnns
+%config(noreplace) %{_sysconfdir}/apparmor.d/wpcom
 %config(noreplace) %{_sysconfdir}/apparmor.d/zgrep
-%config(noreplace) %{_sysconfdir}/apparmor.d/local/*
+
+%config(noreplace) %{_sysconfdir}/apparmor.d/local/README
+
 %dir /usr/share/apparmor/
 %if %{with precompiled_cache}
 /usr/share/apparmor/cache/
@@ -697,7 +803,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 
 %files -n python3-apparmor
 %defattr(-,root,root)
-%{python3_sitearch}/LibAppArmor-%{version}-py*.egg-info
+%{python3_sitearch}/LibAppArmor-%{pyeggversion}-py*.egg-info
 %dir %{python3_sitearch}/LibAppArmor
 %dir %{python3_sitearch}/LibAppArmor/__pycache__
 %{python3_sitearch}/LibAppArmor/_LibAppArmor.cpython-*.so
@@ -706,7 +812,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %{python3_sitearch}/LibAppArmor/__init__.py
 %{python3_sitearch}/LibAppArmor/LibAppArmor.py
 %{python3_sitelib}/apparmor/
-%{python3_sitelib}/apparmor-%{version}-py*.egg-info
+%{python3_sitelib}/apparmor-%{pyeggversion}-py*.egg-info
 %endif
 
 %if %{with ruby}
@@ -758,11 +864,27 @@ rm -f /var/cache/apparmor/* 2>/dev/null
 #restart_on_update apparmor - but non-broken (bnc#853019)
 systemctl is-active -q apparmor && systemctl reload apparmor ||:
 
+%post profiles
+# delete old cache (location up to 2.12)
+rm -f /var/lib/apparmor/cache/* 2>/dev/null
+
+# cleanup old, unchanged local/* files
+for oldlocal in \
+    bin.ping lsb_release nvidia_modprobe php-fpm samba-bgqd samba-dcerpcd samba-rpcd samba-rpcd-classic samba-rpcd-spoolss sbin.klogd sbin.syslogd sbin.syslog-ng \
+    usr.bin.lessopen.sh usr.lib.dovecot.anvil usr.lib.dovecot.auth usr.lib.dovecot.config usr.lib.dovecot.deliver usr.lib.dovecot.dict usr.lib.dovecot.director \
+    usr.lib.dovecot.doveadm-server usr.lib.dovecot.dovecot-auth usr.lib.dovecot.dovecot-lda usr.lib.dovecot.imap usr.lib.dovecot.imap-login usr.lib.dovecot.lmtp \
+    usr.lib.dovecot.log usr.lib.dovecot.managesieve usr.lib.dovecot.managesieve-login usr.lib.dovecot.pop3 usr.lib.dovecot.pop3-login usr.lib.dovecot.replicator \
+    usr.lib.dovecot.script-login usr.lib.dovecot.ssl-params usr.lib.dovecot.stats usr.sbin.apache2 usr.sbin.avahi-daemon usr.sbin.dnsmasq usr.sbin.dovecot \
+    usr.sbin.identd usr.sbin.mdnsd usr.sbin.nmbd usr.sbin.nscd usr.sbin.ntpd usr.sbin.smbd usr.sbin.smbd-shares usr.sbin.smbldap-useradd  usr.sbin.traceroute \
+    usr.sbin.winbindd zgrep
+do
+    if [ -f "/etc/apparmor.d/local/$oldlocal" ] && [ "$(cat /etc/apparmor.d/local/$oldlocal)" == "# Site-specific additions and overrides for '$oldlocal'" ] ; then
+        rm "/etc/apparmor.d/local/$oldlocal" || :
+    fi
+done
+
 %posttrans profiles
 # workaround for bnc#904620#c8 / lp#1392042
-# old cache location up to 2.12
-rm -f /var/lib/apparmor/cache/* 2>/dev/null
-# cache location starting with 2.13
 rm -f /var/cache/apparmor/* 2>/dev/null
 #restart_on_update apparmor - but non-broken (bnc#853019)
 systemctl is-active -q apparmor && systemctl reload apparmor ||:
--- libapparmor.spec.orig
+++ libapparmor.spec
@@ -17,18 +17,24 @@
 #
 
 
+%define tarversion v4.0.1
+
 Name:           libapparmor
-Version:        3.1.7
+Version:        4.0.1
 Release:        0
 Summary:        Utility library for AppArmor
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://launchpad.net/apparmor
-Source0:        https://launchpad.net/apparmor/3.1/%{version}/+download/apparmor-%{version}.tar.gz
-Source1:        https://launchpad.net/apparmor/3.1/%{version}/+download/apparmor-%{version}.tar.gz.asc
+Source0:        apparmor-%{tarversion}.tar.gz
+#Source1:        apparmor-%{version}.tar.gz.asc
+BuildRequires:  autoconf
+BuildRequires:  autoconf-archive
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -63,11 +69,12 @@ These libraries are needed for developin
 AppArmor API.
 
 %prep
-%setup -q -n apparmor-%{version}
+%setup -q -n apparmor-%{tarversion}
 
 %build
 (
   cd ./libraries/libapparmor
+  sh ./autogen.sh
   %configure \
   --without-perl \
   --without-python \

Places

File project.diff of Package apparmor

Places