From 16ecf588393e10e13ae36209560177acb6a36857624b22b2fd993d85e367a940 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 20 Sep 2021 06:13:45 +0000 Subject: [PATCH] Plasma 5.23 Beta. Tested on TW Live, seems to work. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/pam_kwallet?expand=0&rev=211 --- kwallet-pam-5.22.5.tar.xz | 3 --- kwallet-pam-5.22.5.tar.xz.sig | 11 ----------- kwallet-pam-5.22.90.tar.xz | 3 +++ kwallet-pam-5.22.90.tar.xz.sig | 11 +++++++++++ pam_kwallet.changes | 19 ++++++++++++++++++ pam_kwallet.spec | 36 +++++++++++++++++++++++++--------- 6 files changed, 60 insertions(+), 23 deletions(-) delete mode 100644 kwallet-pam-5.22.5.tar.xz delete mode 100644 kwallet-pam-5.22.5.tar.xz.sig create mode 100644 kwallet-pam-5.22.90.tar.xz create mode 100644 kwallet-pam-5.22.90.tar.xz.sig diff --git a/kwallet-pam-5.22.5.tar.xz b/kwallet-pam-5.22.5.tar.xz deleted file mode 100644 index 0f2f22a..0000000 --- a/kwallet-pam-5.22.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8a2a7408e8eefa2b3cc1aa22d130f90ae4bd67c716f290f295a05d5de14320f -size 19960 diff --git a/kwallet-pam-5.22.5.tar.xz.sig b/kwallet-pam-5.22.5.tar.xz.sig deleted file mode 100644 index 691e2fb..0000000 --- a/kwallet-pam-5.22.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmEuFR4ACgkQ7JTRj38F -mX5/6QgAggLxBgLNumMDNP71NIPrtqEl/yU3LYj0RWqQ0B+pMYMSlLTJYV4AkFX3 -k1Ha+vjgX3yUx88UAKop7HcBRfjsUiz6+1hZ/jNEYHuyfrTjMxahyNVxztj7Kkyo -BNKqXrFhQf3sbgdH9lZ/eZkJWtxidMhVVj4XjxXOdbUwdeUeXXVLpxHDEV/5Hev9 -O3/r4e4uQFoPE8YzrkKnZ0sYRmRc75ggk2/PseJNbJPHJ4t6jS5l7l9Zr9jn5R/f -9nG5cpJHy+KF1j0z0IkVlVzdPEa0p0DFQDrcCTyLiCNmJtBKayCsiw9/b6SCQg+G -EN+WV72siSf8BSydb3zwImymzMEhjA== -=1O6Y ------END PGP SIGNATURE----- diff --git a/kwallet-pam-5.22.90.tar.xz b/kwallet-pam-5.22.90.tar.xz new file mode 100644 index 0000000..7812671 --- /dev/null +++ b/kwallet-pam-5.22.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6e656ff09458d819ab67e46d9fd143fe801edfe1d7b7366d5e28c2593ca1952 +size 20116 diff --git a/kwallet-pam-5.22.90.tar.xz.sig b/kwallet-pam-5.22.90.tar.xz.sig new file mode 100644 index 0000000..e7427eb --- /dev/null +++ b/kwallet-pam-5.22.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmFDAw4ACgkQ7JTRj38F +mX7IXwf9F50YxIKbXBmIpeArW6kNtgeg4bGCmVFfRxw47ferkbQLdXGobcT8lprO +qFTXxIL7o9eESkZrC9WJw2/ulXJcKAjqS/53tPdvUt24Rde5PdIzTPKFSyamm4rj +/voKb0Ps6S6LfygCAL4OVcFZrIi7ai/LZztshYCXLmGyY8DvvYYN+klKzegefzQe +BF/7/IhvAjlUzFZHBD8yhBFyns4hHAsFQLYrhUDTorwcd9ip4ofrrPs44znJ7O3L +25drHtz+7AikHjtCkM4eq+VDvYPDZDSaINCjTOKUb9iN2tGDD+Uz4BUf0OqAMC/f +cu1Bc3JToqFiNC+y1epYNfAULYYLpw== +=r9mo +-----END PGP SIGNATURE----- diff --git a/pam_kwallet.changes b/pam_kwallet.changes index 75a1833..ecd1759 100644 --- a/pam_kwallet.changes +++ b/pam_kwallet.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Sep 16 13:05:05 UTC 2021 - Fabian Vogt + +- Update to 5.22.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.22.90 +- Changes since 5.22.5: + * Explicitly set KDE_COMPILERSETTINGS_LEVEL + * Don't set KF5_MIN_VERISON twice + * fix variable substitution + * Add explicit systemd service for kwallet pam (kde#433223) + * Handle sockaddr_un properly + * Free fullSocket in the process which allocated it, not the child + * Remove unused variable + * Separate parameters from constants + * Remove obsolete COPYING file + * Convert license headers to SPDX + ------------------------------------------------------------------- Sun Sep 12 09:46:53 UTC 2021 - Fabian Vogt diff --git a/pam_kwallet.spec b/pam_kwallet.spec index 0373f22..0a8afbc 100644 --- a/pam_kwallet.spec +++ b/pam_kwallet.spec @@ -17,17 +17,16 @@ %bcond_without lang - Name: pam_kwallet -Version: 5.22.5 +Version: 5.22.90 Release: 0 Summary: A PAM Module for KWallet signing License: GPL-2.0-or-later AND LGPL-2.1-only AND GPL-3.0-only Group: System/GUI/KDE URL: http://www.kde.org/ -Source: https://download.kde.org/stable/plasma/%{version}/kwallet-pam-%{version}.tar.xz +Source: https://download.kde.org/unstable/plasma/%{version}/kwallet-pam-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/kwallet-pam-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/plasma/%{version}/kwallet-pam-%{version}.tar.xz.sig Source2: plasma.keyring %endif Source3: baselibs.conf @@ -67,13 +66,19 @@ module. %setup -q -n kwallet-pam-%{version} %build - %cmake_kf5 -d build -- -DLIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} -DCMAKE_INSTALL_PREFIX=/ + # Before usrmerge, the PAM module goes into /lib*/security/ + %{cmake_kf5 -d build -- \ + %if !0%{?usrmerged} + -DKDE_INSTALL_LIBDIR=/%{_lib} \ + %endif + -DLIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} + } + %cmake_build %install %kf5_makeinstall -C build -%if 0%{?suse_version} >= 1330 # Due to boo#728586 it is necessary to duplicate this in the 32bit variant. # So you need to edit baselibs.conf if you change this. %post @@ -83,15 +88,28 @@ module. if [ "$1" = "0" ]; then %{_sbindir}/pam-config -d --kwallet5 || : fi -%endif + +%post common + %systemd_user_post plasma-kwallet-pam.service + +%preun common + %systemd_user_preun plasma-kwallet-pam.service + +%postun common + %systemd_user_postun plasma-kwallet-pam.service %files -%license COPYING* +%license LICENSES/* +%if 0%{?usrmerged} +%{_libdir}/security/pam_kwallet5.so +%else /%{_lib}/security/pam_kwallet5.so +%endif %files common -%license COPYING* +%license LICENSES/* %config %{_kf5_configdir}/autostart/pam_kwallet_init.desktop %{_kf5_libexecdir}/pam_kwallet_init +%{_userunitdir}/plasma-kwallet-pam.service %changelog