From 4836935ef7900633ae9c81b8118fb547e6670efc89605b08bc14d9f8cddd9760 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 30 Nov 2021 07:58:12 +0000 Subject: [PATCH] KDE Release 21.12 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=292 --- akonadi-21.08.3.tar.xz | 3 - akonadi-21.08.3.tar.xz.sig | 16 ---- akonadi-21.11.90.tar.xz | 3 + akonadi-21.11.90.tar.xz.sig | 16 ++++ akonadi-apparmor-opensuse.diff | 139 --------------------------------- akonadi-server.changes | 16 ++++ akonadi-server.spec | 8 +- 7 files changed, 38 insertions(+), 163 deletions(-) delete mode 100644 akonadi-21.08.3.tar.xz delete mode 100644 akonadi-21.08.3.tar.xz.sig create mode 100644 akonadi-21.11.90.tar.xz create mode 100644 akonadi-21.11.90.tar.xz.sig delete mode 100644 akonadi-apparmor-opensuse.diff diff --git a/akonadi-21.08.3.tar.xz b/akonadi-21.08.3.tar.xz deleted file mode 100644 index a75c747..0000000 --- a/akonadi-21.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a6f214b08a651a006972dd78d8f2c8746f21d2f266e2ee6b140ce13ed7f14fb -size 1607984 diff --git a/akonadi-21.08.3.tar.xz.sig b/akonadi-21.08.3.tar.xz.sig deleted file mode 100644 index 2bcaa82..0000000 --- a/akonadi-21.08.3.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmGAg28ACgkQu0YzUNbv -Me+eCw//ehXtRZAD7TLH2mjYiMMDJFb5tpb0FMAB0tB9XZBwWqWBkbBZ9APnCZ/o -AerPZdAOTly5rj1dhIk9rZnHGiQJ8a2HZh3oR4dKPDdhquQllK5AydbzyJ60TPYK -UerB+FWZx5c/7uCVlOT023KTCVynwP4flfUoWtcycfd+Xa6uNNDkZIjIhlKYmgdC -Yp5NpVN1dX8cx60mFHJeLX5QMsZ67FyUikimSGQlIB0sg5tzZgca+GhCn33AhZFK -7tlfj16UoUCr/wqkLOmQmzluZ82EkKULM5BlnBWu7Pifpz31d7OqRBbKottx/frn -JznCCznXCXMMWGxvZE9bZEGgcYKjMxhev08JluukiJcFAd7LUPzJDCDTKoIgLcIn -ScjTySaR4pzsfj1Ld8rwTlRh8ZnKZSQ/LD2wW27Q2CbxmC7XGsigTD6QiFF3zdIp -ZdFTRjg4KnIYiTtlKENCYgvHnO9jgw4QskIcl9Q8woXRQokrDu52tYjwarovu8Kf -sqwDOv+ssmBL2u/PJXhf+6uBJ91t8yuuxpTa/GCH0oFvYfgvr0EYONTUZhpllVu3 -7HPcob238B/Kal+3xIyuXeadMCDqURLe11Nd6gdBx0zFLuLbTj6RkpFYw/yz/y37 -NOIzblrvwzkGaZLh8H+SBDfJV7Oe6CXq38Op1FqO4nvXWjzDZcY= -=Coe3 ------END PGP SIGNATURE----- diff --git a/akonadi-21.11.90.tar.xz b/akonadi-21.11.90.tar.xz new file mode 100644 index 0000000..0393842 --- /dev/null +++ b/akonadi-21.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1edc7154a0360abbfe511b87cd8e4fe871a8da1ef31a39a0f0c097d0145bb8f5 +size 1611312 diff --git a/akonadi-21.11.90.tar.xz.sig b/akonadi-21.11.90.tar.xz.sig new file mode 100644 index 0000000..68c4240 --- /dev/null +++ b/akonadi-21.11.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmGgJ3YACgkQu0YzUNbv +Me8kdw/+Nxf0zmtLAsImSAHwGDHuLmMO+eEP3Kd3RHJ64tuoAyb8g/GEXqz8pBpV +t5vWFc11cI5v04qess/0gD31b1DcV0LlEFgaYJDmkfw8snpB5SStRIvoM4UwuWTr +k/2Or/RHjijqSp1e+VefGlsgngHeaSR5UfbWHrxNt9lDQh6CeNT2wWCwEPtT9rzY +97VzGYx1pOzs6r7Nan6/LZQW52ZXCZQ44vD5kBT2Vma5GUbV90ldPSqcdc8GIzC3 +7VUQclM5V4s8CAJ1PFSTHdiOwoclEVrbKeYznIVeGoSs7LFOI6i91d8rmRo7lMPx +b8UamQMQrtFWW8slxCgOyETjSRYJcO0rJPLx8uQRWR60V3uiVv5Q3c6dW2+HTCXS +QN+xvOGGVbcV9m6+TPGynW43eu7t18ub0aPnZfede/RZu3M74T9q+z2xJpZdIzQ7 +lJ9rwToe9o8K714j8jfVYnwbdsfbdLuLwoqiZmYO3/+ZrP5gySsinDyHZYcz5/Tj +k1LgrTLNg7PG8dn7qt7TEDHKG2HOkJJHMOBvsevG65f6qL86fm6SWRn8CCcezkIP +Dxa6/zSGMosaD7/+/Bw5i0Enyy1S+3kQBbAqZPozuprGgVS0JqGElytOebSW2fLd +f0CaCWIPU5XS8AHHne8sfartM8FMxN/pVIxyjiJw+FcGklzwPiE= +=ZM9Y +-----END PGP SIGNATURE----- diff --git a/akonadi-apparmor-opensuse.diff b/akonadi-apparmor-opensuse.diff deleted file mode 100644 index 44cafad..0000000 --- a/akonadi-apparmor-opensuse.diff +++ /dev/null @@ -1,139 +0,0 @@ -Subject: Adjust Akonadi AppArmor profiles for openSUSE and AppArmor 3.0 - -From: Christian Boltz - -* add paths to match the openSUSE file location -* use @{postgresqlpath} for the various postgresql paths (and add - /usr/lib/postgresql*[0-9]/ for openSUSE) -* add 'abi' rules to enable and enforce all AppArmor features - - -Index: akonadi-21.04.3/apparmor/mariadbd_akonadi -=================================================================== ---- akonadi-21.04.3.orig/apparmor/mariadbd_akonadi 2021-06-08 21:02:40.000000000 +0200 -+++ akonadi-21.04.3/apparmor/mariadbd_akonadi 2021-07-11 18:47:18.489487989 +0200 -@@ -1,3 +1,5 @@ -+abi , -+ - #include - - @{xdg_data_home}=@{HOME}/.local/share -Index: akonadi-21.04.3/apparmor/mysqld_akonadi -=================================================================== ---- akonadi-21.04.3.orig/apparmor/mysqld_akonadi 2021-06-08 21:02:40.000000000 +0200 -+++ akonadi-21.04.3/apparmor/mysqld_akonadi 2021-07-11 18:47:18.489487989 +0200 -@@ -1,3 +1,5 @@ -+abi , -+ - #include - - @{xdg_data_home}=@{HOME}/.local/share -Index: akonadi-21.04.3/apparmor/postgresql_akonadi -=================================================================== ---- akonadi-21.04.3.orig/apparmor/postgresql_akonadi 2021-06-08 21:02:40.000000000 +0200 -+++ akonadi-21.04.3/apparmor/postgresql_akonadi 2021-07-11 18:47:58.253406613 +0200 -@@ -1,8 +1,12 @@ -+abi , -+ - #include - - @{xdg_data_home}=@{HOME}/.local/share - --profile postgresql_akonadi { -+@{postgresqlpath} = /usr/ /usr/lib/postgresql/*/ /usr/lib/postgresql*[0-9]/ /opt/pgsql*/ -+ -+profile postgresql_akonadi flags=(attach_disconnected) { - #include - #include - #include -@@ -15,27 +19,30 @@ profile postgresql_akonadi { - signal receive set=kill peer=/usr/bin/akonadiserver, - signal receive set=term peer=/usr/bin/akonadiserver, - -+ deny / rw, # disconnected path -+ - /etc/passwd r, - /{usr/,}bin/{b,d}ash mrix, - /{usr/,}bin/locale mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/initdb mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_ctl mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/postgres mrix, -+ @{postgresqlpath}/bin/initdb mrix, -+ @{postgresqlpath}/bin/pg_ctl mrix, -+ @{postgresqlpath}/bin/postgres mrix, - /usr/share/postgresql/** r, -+ /usr/share/postgresql*[0-9]/timezonesets/Default r, # use globbing? - owner /dev/shm/PostgreSQL.* rw, - owner @{xdg_data_home}/akonadi/** rwlk, - owner @{xdg_data_home}/akonadi/db_data/** l, - owner /{,var/}run/user/@{uid}/akonadi** rwk, - - # pg_upgrade -- /{usr/,usr/lib/postgresql/*/}bin/pg_upgrade mrix, -+ @{postgresqlpath}/bin/pg_upgrade mrix, - /opt/pgsql*/** mr, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_controldata mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_resetwal mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_dumpall mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_dump mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/vacuumdb mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/psql mrix, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_restore mrix, -+ @{postgresqlpath}/bin/pg_controldata mrix, -+ @{postgresqlpath}/bin/pg_resetwal mrix, -+ @{postgresqlpath}/bin/pg_dumpall mrix, -+ @{postgresqlpath}/bin/pg_dump mrix, -+ @{postgresqlpath}/bin/vacuumdb mrix, -+ @{postgresqlpath}/bin/psql mrix, -+ @{postgresqlpath}/bin/pg_restore mrix, - /{usr/,}bin/cp mrix, - } -Index: akonadi-21.04.3/apparmor/usr.bin.akonadiserver -=================================================================== ---- akonadi-21.04.3.orig/apparmor/usr.bin.akonadiserver 2021-06-08 21:02:40.000000000 +0200 -+++ akonadi-21.04.3/apparmor/usr.bin.akonadiserver 2021-07-11 18:49:46.837184405 +0200 -@@ -1,9 +1,13 @@ -+abi , -+ - #include - - @{xdg_data_home}=@{HOME}/.local/share - - @{xdg_config_home}=@{HOME}/.config - -+@{postgresqlpath} = /usr/ /usr/lib/postgresql/*/ /usr/lib/postgresql*[0-9]/ /opt/pgsql*/ -+ - /usr/bin/akonadiserver { - #include - #include -@@ -37,6 +41,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, -@@ -45,14 +50,18 @@ - /usr/bin/mysqladmin PUx -> mysqld_akonadi, - /usr/bin/mysqlcheck PUx -> mysqld_akonadi, - /usr/{,s}bin/mysqld PUx -> mysqld_akonadi, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/initdb PUx -> postgresql_akonadi, -- /{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_ctl PUx -> postgresql_akonadi, -- /{usr/,usr/lib/postgresql/*/}bin/pg_upgrade PUx -> postgresql_akonadi, -+ @{postgresqlpath}/bin/initdb PUx -> postgresql_akonadi, -+ @{postgresqlpath}/bin/pg_ctl PUx -> postgresql_akonadi, -+ @{postgresqlpath}/bin/pg_upgrade PUx -> postgresql_akonadi, -+ /usr/local/share/mime/mime.cache r, -+ /usr/local/share/mime/types r, - /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, diff --git a/akonadi-server.changes b/akonadi-server.changes index b82f432..f609f12 100644 --- a/akonadi-server.changes +++ b/akonadi-server.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Nov 27 10:10:09 UTC 2021 - Christophe Giboudeaux + +- Update to 21.11.90 + * New feature release +- No code change since 21.11.80 + +------------------------------------------------------------------- +Sat Nov 13 17:54:03 UTC 2021 - Christophe Giboudeaux + +- Update to 21.11.80 + * New feature release +- Too many changes to list here. +- Drop upstream patch: + * akonadi-apparmor-opensuse.diff + ------------------------------------------------------------------- Tue Nov 2 21:33:06 UTC 2021 - Christophe Giboudeaux diff --git a/akonadi-server.spec b/akonadi-server.spec index 005670d..1cfa0cb 100644 --- a/akonadi-server.spec +++ b/akonadi-server.spec @@ -22,20 +22,18 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 21.08.3 +Version: 21.11.90 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://akonadi-project.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig 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}