commit d9225dd7e3884236611afd3f6e75eec3fe2dce4e2a1b00dd0dea681e6ffc7c96 Author: Christophe Marin Date: Wed Jul 3 06:31:35 2024 +0000 Plasma 6.1.2 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/pam_kwallet6?expand=0&rev=22 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch b/0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch new file mode 100644 index 0000000..bda4ed0 --- /dev/null +++ b/0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch @@ -0,0 +1,41 @@ +From ca7f4d4ee95f37d9de9d80b5bba7407e0d11c59a Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Thu, 14 Mar 2024 19:37:30 +0100 +Subject: [PATCH 2/2] Use GNUInstallDirs instead of KDEInstallDirs + +This installs rather generic files so it's not necessary to query Qt here. +--- + CMakeLists.txt | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +Index: kwallet-pam-%{_plasma6_version}git.20240421T181146~fa8c240/CMakeLists.txt +=================================================================== +--- kwallet-pam-%{_plasma6_version}git.20240421T181146~fa8c240.orig/CMakeLists.txt ++++ kwallet-pam-%{_plasma6_version}git.20240421T181146~fa8c240/CMakeLists.txt +@@ -12,7 +12,7 @@ find_package (ECM ${KF6_MIN_VERSION} REQ + set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ) + + include(CheckFunctionExists) +-include(KDEInstallDirs) ++include(GNUInstallDirs) + include(KDEClangFormat) + include(ECMConfiguredInstall) + include(KDEGitCommitHooks) +@@ -93,13 +93,11 @@ kde_clang_format(${ALL_CLANG_FORMAT_SOUR + + kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) + +-install(TARGETS ${library_name} DESTINATION ${KDE_INSTALL_LIBDIR}/security) ++install(TARGETS ${library_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/security) + + configure_file(pam_kwallet_init.desktop.cmake ${CMAKE_BINARY_DIR}/pam_kwallet_init.desktop) +- +-install(PROGRAMS pam_kwallet_init DESTINATION ${KDE_INSTALL_LIBEXECDIR}) +- +-install(FILES ${CMAKE_BINARY_DIR}/pam_kwallet_init.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) ++install(PROGRAMS pam_kwallet_init DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) ++install(FILES ${CMAKE_BINARY_DIR}/pam_kwallet_init.desktop DESTINATION /etc/xdg/autostart/) + + ecm_install_configured_files(INPUT plasma-kwallet-pam.service.in @ONLY DESTINATION +- ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) ++ ${CMAKE_INSTALL_PREFIX}/lib/systemd/user/) diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..cf32809 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,6 @@ +pam_kwallet6 + requires "pam_kwallet6 = " + supplements "packageand(pam_kwallet6:pam-)" + obsoletes "pam_kwallet- < " + post "%{_sbindir}/pam-config -a --kwallet5 || :" + post ":" diff --git a/kwallet-pam-6.1.2.tar.xz b/kwallet-pam-6.1.2.tar.xz new file mode 100644 index 0000000..4f76b41 --- /dev/null +++ b/kwallet-pam-6.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7541b8a10287d6aed3020ff4b9287492551f897972379bea48aea98450aebb4 +size 22520 diff --git a/kwallet-pam-6.1.2.tar.xz.sig b/kwallet-pam-6.1.2.tar.xz.sig new file mode 100644 index 0000000..a8aefec --- /dev/null +++ b/kwallet-pam-6.1.2.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmaDxJgACgkQ11dEg7tX +sY3jlw/+L+i3QR8VpJ2JTqKpGuC+arR6DQJaoUUzIEEnMA4CkMvLsRFWMftgVBKo +UpGymFN38gaz2nEcCepyh54LrBO8/rP69VmqYAndraXe2tNNpGPxN5zHx9AyaafN +Si+6nb2sFpN09b7N77dgtEGYUZafU04NM1tao9seHIxMDcZ9rbN762TVKeK1Uln6 +DK7/dqciQ/71UOWIMzqMoFIbbi9WEMDq8wTTr6SxgflpjQMlexGmjS74Yh01u11j +ciRnL7ZtlAFxV3+SUJS0Gj1o5hFxc2BTSl5WyauoUZAqXwWgVBsW0ode9U/W6aI4 +RV1iWrZcnDEO/u68GzuF1V0Q8lIJMAPL745BMzaegS+EGn5Ruttm4NyMMCF5Bjni +uxr/rBhbCL3xqOCz4qpLPBswj84iaK+NYC1Idg/l+UeNEIs9cj49bqdl1CNOi4Wp +6pX3TPhIHbzl+wgdvo7Oppq9HPOT1ruY+VGLCNsngNPcIIDpMPjFkLz7OpLeZCW8 +QT53rWxW4KvxvwHgkrEIsZzUjjzY7QT62k4b4P2eRoMsmOkX8ITKadmJsZX68IcI +ELsUB4Xv5b9plANcAeLcCAtxClpzTZ4J5sVlaRfFvlkKVldmMYibhVNEfMB7vEt0 +MXr2sTaB+O6mJJWQDVQ7t5e+egOXuSfRawFAosgQJANbK5XuPWY= +=v2tc +-----END PGP SIGNATURE----- diff --git a/pam_kwallet6.changes b/pam_kwallet6.changes new file mode 100644 index 0000000..9d38b40 --- /dev/null +++ b/pam_kwallet6.changes @@ -0,0 +1,133 @@ +------------------------------------------------------------------- +Tue Jul 2 17:34:18 UTC 2024 - Fabian Vogt + +- Update to 6.1.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.2 +- Changes since 6.1.1: + * Switch to pkgconfig to find libgcrypt (allows building with libgcrypt 1.11) (kde#489303) + * update version for new release + +------------------------------------------------------------------- +Tue Jun 25 17:13:52 UTC 2024 - Fabian Vogt + +- Update to 6.1.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.1 +- Changes since 6.1.0: + * update version for new release + +------------------------------------------------------------------- +Thu Jun 13 10:58:39 UTC 2024 - Fabian Vogt + +- Update to 6.1.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.0 +- Changes since 6.0.90: + * update version for new release + +------------------------------------------------------------------- +Sat May 25 11:18:58 UTC 2024 - Fabian Vogt + +- Update to 6.0.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.0.90 +- Changes since 6.0.5: + * update version for new release + * Add clang-format commit hook + * Move cmake_minimum_required above project + * Allow specifing KWALLETD_BIN_PATH manually +- Drop patches, now upstream: + * 0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch +- Refresh 0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch + +------------------------------------------------------------------- +Wed May 22 07:43:10 UTC 2024 - Fabian Vogt + +- Update to 6.0.5: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.5 +- Changes since 6.0.4: + * update version for new release + +------------------------------------------------------------------- +Wed Apr 17 08:13:02 UTC 2024 - Fabian Vogt + +- Update to 6.0.4: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.4 +- Changes since 6.0.3: + * update version for new release + +------------------------------------------------------------------- +Tue Mar 26 18:06:03 UTC 2024 - Fabian Vogt + +- Update to 6.0.3: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.3 +- Changes since 6.0.2: + * update version for new release + +------------------------------------------------------------------- +Thu Mar 14 22:28:42 UTC 2024 - Fabian Vogt + +- Also attempt pam-config enablement in %posttrans (boo#1221371) + +------------------------------------------------------------------- +Thu Mar 14 18:59:17 UTC 2024 - Fabian Vogt + +- Add patches to avoid depending on Qt: + * 0001-Allow-specifing-KWALLETD_BIN_PATH-manually.patch + * 0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch + +------------------------------------------------------------------- +Wed Mar 13 09:10:02 UTC 2024 - Fabian Vogt + +- Update to 6.0.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.2 +- Changes since 6.0.1: + * update version for new release + +------------------------------------------------------------------- +Wed Mar 6 08:40:30 UTC 2024 - Fabian Vogt + +- Update to 6.0.1: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.0.1 +- Changes since 6.0.0: + * update version for new release + +------------------------------------------------------------------- +Mon Mar 4 18:52:15 UTC 2024 - Christophe Marin + +- Add Provides/Obsoletes to replace Plasma 5 + +------------------------------------------------------------------- +Wed Feb 21 18:36:33 UTC 2024 - Fabian Vogt + +- Update to 6.0.0: + * New bugfix release + * Release announcement not available yet +- Changes since 5.93.0: + * update version for new release + +------------------------------------------------------------------- +Wed Jan 31 17:37:29 UTC 2024 - Fabian Vogt + +- Update to 5.93.0 (6.0 RC 2): + * New bugfix release + * See https://kde.org/announcements/megarelease/6/rc2/ for details +- No code changes since 5.92.0 + +------------------------------------------------------------------- +Mon Jan 15 21:09:08 UTC 2024 - Fabian Vogt + +- Update to 5.92.0 (6.0 RC 1) + * For more details please see: + https://kde.org/announcements/megarelease/6/rc1/ + +------------------------------------------------------------------- +Fri Aug 25 08:21:38 UTC 2023 - Christophe Marin + +- Init pam_kwallet6 diff --git a/pam_kwallet6.spec b/pam_kwallet6.spec new file mode 100644 index 0000000..d12c65e --- /dev/null +++ b/pam_kwallet6.spec @@ -0,0 +1,132 @@ +# +# spec file for package pam_kwallet6 +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define kf6_version 6.2.0 +%define qt6_version 6.6.0 + +%define rname kwallet-pam + +%bcond_without released +Name: pam_kwallet6 +Version: 6.1.2 +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 +URL: https://www.kde.org/ +Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +%if %{with released} +Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig +Source2: plasma.keyring +%endif +Source3: baselibs.conf +# PATCH-FEATURE-OPENSUSE +Patch0: 0002-Use-GNUInstallDirs-instead-of-KDEInstallDirs.patch +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: socat +BuildRequires: pkgconfig(libgcrypt) >= 1.5.0 +# PAM modules need to be available for all archs of PAM on the system, otherwise pam-config +# will not enable it. +# Technically there can be different suffixes than just -32bit, but that's the most common. +# Expressing a hard dependency the other way around in baselibs.conf is not possible. +Requires: (%{name}-32bit if pam-32bit) +Requires: pam_kwallet6-common = %{version} +Requires(post): coreutils +Requires(post): pam +Requires(post): pam-config +Requires(postun): coreutils +Requires(postun): pam +Requires(postun): pam-config +Provides: pam_kwallet = %{version} +Obsoletes: pam_kwallet < %{version} + +%description +This PAM module allows you to automatically open your kwallet +when signing into your account. + +%package common +Summary: Support files for the KWallet PAM module +Requires: kwalletd6 +Requires: socat +Provides: pam_kwallet-common = %{version} +Obsoletes: pam_kwallet-common < %{version} +BuildArch: noarch + +%description common +This package contains support files used by the KWallet PAM +module. + +%prep +%autosetup -p1 -n %{rname}-%{version} + +%build +# Before usrmerge, the PAM module goes into /lib*/security/ +%cmake_kf6 -DKWALLETD_BIN_PATH=%{_kf6_bindir}/kwalletd6 \ + -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \ +%if 0%{?suse_version} < 1550 + -DCMAKE_INSTALL_LIBDIR=/%{_lib} +%endif + +%kf6_build + +%install +%kf6_install + +# Try to enable it in %post already, but it might not work at this time. +# 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 +%{_sbindir}/pam-config -a --kwallet5 || : + +%postun +if [ "$1" = "0" ]; then + %{_sbindir}/pam-config -d --kwallet5 || : +fi + +# Enable this in posttrans to win over the old package's %postun +# and to run once the modules are installed for all archs (boo#728586). +%posttrans +%{_sbindir}/pam-config -a --kwallet5 || : + +%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 LICENSES/* +# Yes, it's still called pam_kwallet5. Not sure whether that's intentional, +# but it means PAM config doesn't need migration which is nice. +%if 0%{?suse_version} >= 1550 +%{_pam_moduledir}/pam_kwallet5.so +%else +/%{_lib}/security/pam_kwallet5.so +%endif + +%files common +%license LICENSES/* +%config %{_kf6_configdir}/autostart/pam_kwallet_init.desktop +%{_libexecdir}/pam_kwallet_init +%{_userunitdir}/plasma-kwallet-pam.service + +%changelog diff --git a/plasma.keyring b/plasma.keyring new file mode 100644 index 0000000..df40fb7 Binary files /dev/null and b/plasma.keyring differ