Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2021-06-12 20:05:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Sat Jun 12 20:05:46 2021 rev:83 rq:899121 version:21.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2021-05-16 23:39:34.802175587 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new.32437/akonadi-server.changes 2021-06-12 20:05:56.768708840 +0200 @@ -1,0 +2,16 @@ +Tue Jun 8 12:38:47 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.04.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.04.2 +- No code change since 21.04.1 + +------------------------------------------------------------------- +Thu Jun 3 18:22:09 UTC 2021 - Christian Boltz <suse-b...@cboltz.de> + +- Install AppArmor profiles (as -apparmor subpackage) +- add akonadi-apparmor-opensuse.diff to adjust the profiles to + openSUSE paths, and to add 'abi' rules to the profiles + +------------------------------------------------------------------- Old: ---- akonadi-21.04.1.tar.xz akonadi-21.04.1.tar.xz.sig New: ---- akonadi-21.04.2.tar.xz akonadi-21.04.2.tar.xz.sig akonadi-apparmor-opensuse.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.iACHSp/_old 2021-06-12 20:05:57.368709884 +0200 +++ /var/tmp/diff_new_pack.iACHSp/_new 2021-06-12 20:05:57.372709892 +0200 @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 21.04.1 +Version: 21.04.2 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later @@ -34,6 +34,10 @@ Source2: applications.keyring %endif Source99: akonadi-server-rpmlintrc +# PATCH-FIX-OPENSUSE akonadi-apparmor-opensuse.diff - adjust AppArmor profiles to work on openSUSE +Patch: akonadi-apparmor-opensuse.diff +BuildRequires: apparmor-abstractions +BuildRequires: apparmor-rpm-macros BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: libQt5Sql-private-headers-devel @@ -161,13 +165,20 @@ This package contains development files of Akonadi, the KDE PIM storage service. +%package apparmor +Summary: AppArmor profiles for Akonadi +Requires: apparmor-abstractions + +%description apparmor +This package contains AppArmor profiles for Akonadi. + %lang_package %prep %autosetup -p1 -n %{rname}-%{version} %build - %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} -DINSTALL_APPARMOR=FALSE + %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir} %cmake_build %install @@ -190,6 +201,9 @@ %post -n libKF5AkonadiXml5 -p /sbin/ldconfig %postun -n libKF5AkonadiXml5 -p /sbin/ldconfig +%post apparmor +%apparmor_reload %{_sysconfdir}/apparmor.d/mariadbd_akonadi %{_sysconfdir}/apparmor.d/mysqld_akonadi %{_sysconfdir}/apparmor.d/postgresql_akonadi %{_sysconfdir}/apparmor.d/usr.bin.akonadiserver + %files %license LICENSES/* %doc AUTHORS @@ -263,6 +277,12 @@ %dir %{_kf5_sharedir}/kdevappwizard/ %{_kf5_sharedir}/kdevappwizard/templates/ +%files apparmor +%config(noreplace) %{_sysconfdir}/apparmor.d/mariadbd_akonadi +%config(noreplace) %{_sysconfdir}/apparmor.d/mysqld_akonadi +%config(noreplace) %{_sysconfdir}/apparmor.d/postgresql_akonadi +%config(noreplace) %{_sysconfdir}/apparmor.d/usr.bin.akonadiserver + %if %{with lang} %files lang -f %{name}.lang %license LICENSES/* ++++++ akonadi-21.04.1.tar.xz -> akonadi-21.04.2.tar.xz ++++++ ++++ 9792 lines of diff (skipped) ++++++ akonadi-apparmor-opensuse.diff ++++++ Subject: Adjust Akonadi AppArmor profiles for openSUSE and AppArmor 3.0 From: Christian Boltz <suse-b...@cboltz.de> - add paths to match the openSUSE file location - add 'abi' rules to enable and enforce all AppArmor features Index: b/apparmor/mariadbd_akonadi =================================================================== --- a/apparmor/mariadbd_akonadi 2021-04-22 18:21:40.000000000 +0200 +++ b/apparmor/mariadbd_akonadi 2021-06-05 18:47:31.029159467 +0200 @@ -1,3 +1,5 @@ +abi <abi/3.0>, + #include <tunables/global> @{xdg_data_home}=@{HOME}/.local/share Index: b/apparmor/mysqld_akonadi =================================================================== --- a/apparmor/mysqld_akonadi 2021-04-22 18:21:40.000000000 +0200 +++ b/apparmor/mysqld_akonadi 2021-06-05 18:47:36.609147822 +0200 @@ -1,3 +1,5 @@ +abi <abi/3.0>, + #include <tunables/global> @{xdg_data_home}=@{HOME}/.local/share Index: b/apparmor/postgresql_akonadi =================================================================== --- a/apparmor/postgresql_akonadi 2021-04-22 18:21:40.000000000 +0200 +++ b/apparmor/postgresql_akonadi 2021-06-05 18:47:38.149144609 +0200 @@ -1,3 +1,5 @@ +abi <abi/3.0>, + #include <tunables/global> @{xdg_data_home}=@{HOME}/.local/share Index: b/apparmor/usr.bin.akonadiserver =================================================================== --- a/apparmor/usr.bin.akonadiserver 2021-04-22 18:21:40.000000000 +0200 +++ b/apparmor/usr.bin.akonadiserver 2021-06-05 18:47:44.697130942 +0200 @@ -1,3 +1,5 @@ +abi <abi/3.0>, + #include <tunables/global> @{xdg_data_home}=@{HOME}/.local/share @@ -37,6 +39,7 @@ /etc/xdg/** r, /usr/bin/akonadiserver mr, /usr/lib/x86_64-linux-gnu/libexec/drkonqi PUx, + /usr/lib{,64}/libexec/drkonqi PUx, /usr/bin/mariadb-admin PUx -> mariadbd_akonadi, /usr/bin/mariadb-check PUx -> mariadbd_akonadi, /usr/bin/mariadb-install-db PUx -> mariaddbd_akonadi, @@ -49,10 +52,12 @@ /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_ctl PUx -> postgresql_akonadi, /{usr/,usr/lib/postgresql/*/}bin/pg_upgrade PUx -> postgresql_akonadi, /usr/sbin/mysqld PUx -> mysqld_akonadi, + /usr/share/icu/[0-9]*.[0-9]*/*.dat r, /usr/share/mime/mime.cache r, /usr/share/mime/packages/ r, /usr/share/mime/types r, - /usr/share/qt/translations/* r, + /usr/share/qt5/qtlogging.ini r, + /usr/share/qt{,5}/translations/* r, /usr/share/mysql/** r, @{PROC}/sys/kernel/core_pattern r, @{PROC}/sys/kernel/random/boot_id r,
