Christophe Giboudeaux 2022-03-29 06:44:12 +00:00 committed by Git OBS Bridge
parent 99cf250b97
commit 293c16e4b3
7 changed files with 55 additions and 54 deletions

View File

@ -1,27 +0,0 @@
From 2ce37b8cbe37772dde28ee510a0050e5444edc67 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Fri, 11 Mar 2022 11:33:41 +0100
Subject: [PATCH] Apparmor: Also look in /usr/libexec
FHS 3.0 states that executables not intended to be executed by users shall be under /usr/libexec [1]
[1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html
---
apparmor/usr.bin.akonadiserver | 1 +
1 file changed, 1 insertion(+)
diff --git a/apparmor/usr.bin.akonadiserver b/apparmor/usr.bin.akonadiserver
index a8e20045b..83b654abd 100644
--- a/apparmor/usr.bin.akonadiserver
+++ b/apparmor/usr.bin.akonadiserver
@@ -42,6 +42,7 @@ abi <abi/3.0>,
/usr/bin/akonadiserver mr,
/usr/lib/x86_64-linux-gnu/libexec/drkonqi PUx,
/usr/lib{,64}/libexec/drkonqi PUx,
+ /usr/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,
--
2.35.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fe8ded706faf6ce87a48b7f164cbdd4eb71a342501eb9a0db40a87666cfda08
size 1611056

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmIdZbQACgkQu0YzUNbv
Me91HxAAh7/5hlApDJBkEzcB1pDuVuZEqdGBHqBoZCNOfmLXxSKFUv5YGyLRNpe7
KqdaBsk6ALyJMdp1EkLoRV9uuapqg+Zc3wPdIjFYtOJtg9XnG8QH9kl86QiMCygn
oubsbBMTjZSH6GkTmYslH89QZviPD0XMsCF+lay3p+av0lgKmAyfhce+NJN05j7A
365/444ugvzTJDMMG4OiwVBzz8SGPmIyoE3nkEvkwEj232UGeS91DF3hzhPpSKL+
1RQvNQ4oyM+/KeJolrcbwMJbX/clZg58R9zlfgagd/ijs+izf9lxxOPSbZIMQb8W
VYQtKP3UG95JyRDmNaqoZAJPj+iEUzSkb/RiKnZhdGdJdss4JK/UA0HwkTX5AiKK
b5GW7N80mFFWcK7idMiCErZQ2FOS/QR3uaacVpAyHNvCXQ7SspPlJCUJhNjhHy2q
k2J0kWl2kv7n30eUPZxMRVoSWNjWbdvK4LYUYKWZDb1isY/nickUjUf3rTuTBOaK
fLJnQSDlnzsB3oP6OiXTm2WcvSfvUpjnQr8Uu7Y7831iv1Sj7jTsd2Ee1OmBwITx
FMZEuHesrDg9ipAGg1FP9kppw907XWvmEB6p5HLJzQsc4SbD3cIImZvTT55oHaNZ
ABW8iDN0ARMIgaFvF+huI7UauWwN7HPe4qxdkwNpZTNl/QL7Jkg=
=J+If
-----END PGP SIGNATURE-----

3
akonadi-22.03.80.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:304093f92f1c67554529b0a011d4cc469004f795b61a84ad80b3a450f0f945a7
size 1611388

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmI0jd4ACgkQOmpNuDnq
ptcVxxAAlMKi0w566JwUVJICl4+22IKfMl1s3VJJ0wK1chv7o1/MXlKNLzT9EsAJ
j4fsFatq5AYTK6I5RIuCy2qJ34azVNDvl8/RvmbFsdjTzMEZnp0s65jDTDZ7p35a
9VRFM+jvZUrJrLY0hZnOum7i9a2TyEPW3Rz3Cz204QgukTMnlgrnv2Pci/5Iq/vs
n+svWYsUMzRrRpgBHdPAs0/E/G9za/kbJ/Xl06HdonZU1ljvL/8mrBg2oF7qGifM
QiQauHCL7O4A53Y3svRxJd8Y7yGALYJ8md/95ndhHHhxL50pYO8DbbIzjQjZR6s+
u/c1kybYAoAEGIz6W2jRp7QAWTCAQfKWGX5ht5rY1EJgoJ9VgSzRUXHN+7lsB2yH
LCrWdMPhTZ7UDffzSc7SSKITjEyib8CbTuojw5jFQ98ifCGZPGgZwpPTcT11MAr7
UzNHbq20mgvky85kNe1HusJMytJK0z3jVIh1rd3iB4yQPvC1cWTCvC6MYlDPVzfJ
oMh+FOV3E/XdBBsbRORP1ltysQFmeWvMioIGbuqY1tzPaF7pUzZYg5FosOaEVPXQ
F0Yxv6UIbh/Q36rSOWKpoAQk4uGJ/NQpwVtqB/kA4bak60kLf4PSSGTsi2aVeRen
hzBd9dSA3AEtx492DizcFLtyPfnE95Chb39T2TgzMcchYBRxQK4=
=xq4w
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Wed Mar 23 08:13:24 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 22.03.80
* New feature release
- Changes since 21.12.3:
* Apparmor: Also look in /usr/libexec
* Fix some qt6 compile error
* Fix compile without deprecated method
* Make it compile against qt6
* Fix install private includes (qt6 compile fix)
* Fix cmake variable
* Show missing header in qtc6
* Fix some qtc6 compile error
* Check executables exist in PATH before passing them to QProcess
* kaccounts-integration is Linux/FreeBSD only - so don't try to use it elsewhere
* Remove kplugindesigner dep
* Fix build with GCC 12 (standard attributes in middle of decl-specifiers)
* Fix compile error against qt6
* Change build system for building against qt6
* Remove dependence on Boost
* Update postgres paths
* Fix brackets issue
* Use capturedView directly
* Enable new CI on FreeBSD
* Switch to new GitLab CI tooling
* Fix kaccounts-integration dep
* Fix warning
* Port deprecated I18N_NOOP macro
- Drop patch, now upstream:
* akonadi-server/0001-Apparmor-Also-look-in-usr-libexec.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 11 10:38:21 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr> Fri Mar 11 10:38:21 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -22,20 +22,18 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without released %bcond_without released
Name: akonadi-server Name: akonadi-server
Version: 21.12.3 Version: 22.03.80
Release: 0 Release: 0
Summary: PIM Storage Service Summary: PIM Storage Service
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/GUI/KDE Group: System/GUI/KDE
URL: https://akonadi-project.org 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 released} %if %{with released}
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 Source2: applications.keyring
%endif %endif
Source99: akonadi-server-rpmlintrc Source99: akonadi-server-rpmlintrc
# PATCH-FIX-UPSTREAM
Patch0: 0001-Apparmor-Also-look-in-usr-libexec.patch
BuildRequires: apparmor-abstractions BuildRequires: apparmor-abstractions
BuildRequires: apparmor-rpm-macros BuildRequires: apparmor-rpm-macros
BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: extra-cmake-modules >= %{kf5_version}
@ -251,11 +249,11 @@ This package contains AppArmor profiles for Akonadi.
%{_kf5_bindir}/akonadi2xml %{_kf5_bindir}/akonadi2xml
%{_kf5_cmakedir}/KF5Akonadi %{_kf5_cmakedir}/KF5Akonadi
%{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml %{_kf5_dbusinterfacesdir}/org.freedesktop.Akonadi.*.xml
%{_kf5_includedir}/Akonadi/
%{_kf5_includedir}/AkonadiAgentBase/ %{_kf5_includedir}/AkonadiAgentBase/
%{_kf5_includedir}/AkonadiCore/ %{_kf5_includedir}/AkonadiCore/
%{_kf5_includedir}/AkonadiWidgets/ %{_kf5_includedir}/AkonadiWidgets/
%{_kf5_includedir}/AkonadiXml/ %{_kf5_includedir}/AkonadiXml/
%{_kf5_includedir}/akonadi/
%{_kf5_includedir}/akonadi_version.h %{_kf5_includedir}/akonadi_version.h
%{_kf5_libdir}/libKF5AkonadiAgentBase.so %{_kf5_libdir}/libKF5AkonadiAgentBase.so
%{_kf5_libdir}/libKF5AkonadiCore.so %{_kf5_libdir}/libKF5AkonadiCore.so
@ -267,8 +265,6 @@ This package contains AppArmor profiles for Akonadi.
%{_kf5_mkspecsdir}/qt_AkonadiWidgets.pri %{_kf5_mkspecsdir}/qt_AkonadiWidgets.pri
%{_kf5_mkspecsdir}/qt_AkonadiXml.pri %{_kf5_mkspecsdir}/qt_AkonadiXml.pri
%{_kf5_plugindir}/designer/ %{_kf5_plugindir}/designer/
%dir %{_kf5_sharedir}/kdevappwizard/
%{_kf5_sharedir}/kdevappwizard/templates/
%files apparmor %files apparmor
%config(noreplace) %{_sysconfdir}/apparmor.d/mariadbd_akonadi %config(noreplace) %{_sysconfdir}/apparmor.d/mariadbd_akonadi