From 95f4ecedd41206e678e2ddec24f8382ba2287dd1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Mar 2024 02:13:53 +0100 Subject: gentoo auto-resync : 31:03:2024 - 02:13:53 --- kde-plasma/kscreenlocker/Manifest | 9 +-- kde-plasma/kscreenlocker/files/kde-fingerprint.pam | 13 ++++ kde-plasma/kscreenlocker/files/kde-r1.pam | 9 +++ kde-plasma/kscreenlocker/files/kde-smartcard.pam | 13 ++++ .../kscreenlocker/files/kde6-fingerprint.pam | 13 ---- kde-plasma/kscreenlocker/files/kde6-smartcard.pam | 13 ---- kde-plasma/kscreenlocker/files/kde6.pam | 9 --- .../kscreenlocker-6.0.3-fix-lockscreen-race.patch | 47 +++++++++++++ .../kscreenlocker/kscreenlocker-6.0.3-r1.ebuild | 82 ++++++++++++++++++++++ .../kscreenlocker/kscreenlocker-6.0.3.ebuild | 81 --------------------- 10 files changed, 169 insertions(+), 120 deletions(-) create mode 100644 kde-plasma/kscreenlocker/files/kde-fingerprint.pam create mode 100644 kde-plasma/kscreenlocker/files/kde-r1.pam create mode 100644 kde-plasma/kscreenlocker/files/kde-smartcard.pam delete mode 100644 kde-plasma/kscreenlocker/files/kde6-fingerprint.pam delete mode 100644 kde-plasma/kscreenlocker/files/kde6-smartcard.pam delete mode 100644 kde-plasma/kscreenlocker/files/kde6.pam create mode 100644 kde-plasma/kscreenlocker/files/kscreenlocker-6.0.3-fix-lockscreen-race.patch create mode 100644 kde-plasma/kscreenlocker/kscreenlocker-6.0.3-r1.ebuild delete mode 100644 kde-plasma/kscreenlocker/kscreenlocker-6.0.3.ebuild (limited to 'kde-plasma/kscreenlocker') diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest index 985546350ff3..92b628b5cfa6 100644 --- a/kde-plasma/kscreenlocker/Manifest +++ b/kde-plasma/kscreenlocker/Manifest @@ -1,10 +1,11 @@ +AUX kde-fingerprint.pam 342 BLAKE2B 5d97e74febeba1fabfe4f1100a029a6de0ef384c3de1d5c0f8955e848747b2ee1649573b6275d4a37fd359f3416f7d32686b0589c70eee76ac13ba4f2572d1c4 SHA512 bc06a368102a9f9acc62b272ac8e02d115c8cb88f2ddbe118635cbf76f5610adb02aa3311bb09d4810b6f5d68e93f389a686062cf91d5b2d49f236f8fb5de0d0 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb +AUX kde-r1.pam 162 BLAKE2B 737f0d766f91111460f49a08d02de36683ada6f6d17e874f59e63153ee512cfcc2de8d9e28cb3531d23c847584d24d9105b24e73e3e72149fb130d3e60ef0cde SHA512 212b9e89137b5191742d8b76a815c12fb99d4b7b05886ccd02066db879474a059636f01f27554abdecb4952624e32db7310dd7ec6d4e4e2b649e9141108c228a +AUX kde-smartcard.pam 365 BLAKE2B bc84ba04c913c6116f8b482bd2d898f2e15a428aaa73af67a4003f56632883b484d9e1aaa962456baa7723022e700b39917b96577b69e54a9b731fb03aec752a SHA512 aa71785128d12058dc202b07ad0982e33242aae200acb7376ef581267b08b79df022fd5e57eece6d6c01690c8ddcac467f60df64c386f444cf3dae8f48c23925 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776 -AUX kde6-fingerprint.pam 342 BLAKE2B fcd6d28ccbf10c7f313ec22f5fda2942e96941c776b5797b46aa2a756a90fa588a5a03fe9a6db51283ada2ce62c81b4969cc022b29d7021441bf8a8fef52f21f SHA512 63d9d22f77b774f8c181e36362cdea8b6c5106ee6f279233333f7f1c9625f2507166bd205c87fe39c8e4ef3fc6627ea2b7b88422dde006c02eea7a00dc444c2d -AUX kde6-smartcard.pam 365 BLAKE2B cab0def79d385af15cb9eb7b7e4df4f70a84e769d5da423331c109e31a5f94c795d753b5c2e947f9e8da6e561698a904a5c1fdcb94793610b19a50db9d2e5d04 SHA512 5964ff924417d1fc22b313da8a1da22516b5fa934cb85b6798253509c2f53ec68b1ee51fb705484c7da941ecb7e4a15af303e9613cdb670180caaf22be89a4bc -AUX kde6.pam 162 BLAKE2B 737f0d766f91111460f49a08d02de36683ada6f6d17e874f59e63153ee512cfcc2de8d9e28cb3531d23c847584d24d9105b24e73e3e72149fb130d3e60ef0cde SHA512 212b9e89137b5191742d8b76a815c12fb99d4b7b05886ccd02066db879474a059636f01f27554abdecb4952624e32db7310dd7ec6d4e4e2b649e9141108c228a +AUX kscreenlocker-6.0.3-fix-lockscreen-race.patch 1724 BLAKE2B 328accf7d22bd8220b264d2fa657bc868f54aeb02034822746485f8d6c55502ebb7f891ed335c28ad74cd3b00a5213507a660a85ca9404f467dd02c990b4de3d SHA512 c0bc91c0dced7f60139a594ba0ac9aeda4652a101b98b769bc6e81d02a845da3bc69bb6cb1df9d363979fa4c03d7c984c29914222de85d53d9c86fe41b2ebace DIST kscreenlocker-5.27.11.tar.xz 160796 BLAKE2B 6ab6060ee7ce2b01a0a29f6d0aebbaba052fabaa6c229e92603b52d32ea473c438b8647cc2f2bdbf48edfa98c05aa7e22ce0b75964d9a8ab6d914c32254fdfcb SHA512 cfaaa6242253f6c511f645bb7f9023328a5d5bb58616284f85db949da969e04303f4e0e28283a08ed0fb02845840be67a76785d4b4596ef057ec7069cda92a3a DIST kscreenlocker-6.0.3.tar.xz 164472 BLAKE2B 42078471727ff669af3d929a425d7df8b4f929d4b228c9966e2b1f09485d155937961c99fb76aa838c15e31d98c10b655416297c290bec559ab3cb825f8817ab SHA512 9f4aac85e958fdbca268e14fc60b766968d0b0ae7a657a9b07270177e6c48820910a086bb8ee03d77d09018b7e7a08580e6f2a16ea561e77d540178d4214e21b EBUILD kscreenlocker-5.27.11.ebuild 2061 BLAKE2B 7e76232c2f9af8e914a307b6f4eb541f20d64972e02c64c0965bc6dff4cc3dc7038dd06f6e26be1d9936992916ea752a5b7865086f4f46bfe7b97694b3c54e92 SHA512 705595b760b43962a4e479d3f2902eb612773cf34f76f1f52960b41f0c87f584dcccd19592caf36f2ee2c98a464cb7d029aec6bce43cc293d6d6503f6212b557 -EBUILD kscreenlocker-6.0.3.ebuild 1895 BLAKE2B 576c1060c32214e32335f200194b0ef845ada5a6230df830fa8e6c7a280276af9c3122dcd4baf13c51ff081e1a48aa4a30871f5ba3189b0dac426efb2717963a SHA512 b83132d5b762cb68060d0ae0d2cdef778a9a5b80ce51ad868782d10648ee3fe84346a3328d9f5623f6c0afd080e88b1b637e53ea32434732624fcf45aa2b37f8 +EBUILD kscreenlocker-6.0.3-r1.ebuild 1984 BLAKE2B 2ac2ad264596e0c802fb8bc78bab313153938e3b2cecc27e2892eac0587f8fff12c335325f7283ee8bf9ccba6438d39fcb5be3c5531bd6319cb97f7f3d96be7d SHA512 482f618290fbefc8277992c16eab0405ba06cb75facc7e00544662dbb3b23629f6a9dc716d7dc8b6e8d74363538b17c7a7feb47c13d81d59297516c985bdcd44 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/kscreenlocker/files/kde-fingerprint.pam b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam new file mode 100644 index 000000000000..6ca0ba1f09e6 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam @@ -0,0 +1,13 @@ +#%PAM-1.0 + +auth required pam_shells.so +auth required pam_nologin.so +auth required pam_faillock.so preauth +-auth required pam_fprintd.so +auth required pam_env.so + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde-r1.pam b/kde-plasma/kscreenlocker/files/kde-r1.pam new file mode 100644 index 000000000000..ce9e84d58840 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-r1.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 + +auth include system-local-login + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde-smartcard.pam b/kde-plasma/kscreenlocker/files/kde-smartcard.pam new file mode 100644 index 000000000000..694fc1e905b0 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-smartcard.pam @@ -0,0 +1,13 @@ +#%PAM-1.0 + +auth required pam_shells.so +auth required pam_nologin.so +auth required pam_faillock.so preauth +-auth required pam_pkcs11.so wait_for_card card_only +auth required pam_env.so + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde6-fingerprint.pam b/kde-plasma/kscreenlocker/files/kde6-fingerprint.pam deleted file mode 100644 index 38267de65e32..000000000000 --- a/kde-plasma/kscreenlocker/files/kde6-fingerprint.pam +++ /dev/null @@ -1,13 +0,0 @@ -#%PAM-1.0 - -auth required pam_shells.so -auth required pam_nologin.so -auth required pam_faillock.so preauth -auth required pam_fprintd.so -auth required pam_env.so - -account include system-local-login - -password include system-local-login - -session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde6-smartcard.pam b/kde-plasma/kscreenlocker/files/kde6-smartcard.pam deleted file mode 100644 index f887c7823432..000000000000 --- a/kde-plasma/kscreenlocker/files/kde6-smartcard.pam +++ /dev/null @@ -1,13 +0,0 @@ -#%PAM-1.0 - -auth required pam_shells.so -auth required pam_nologin.so -auth required pam_faillock.so preauth -auth required pam_pkcs11.so wait_for_card card_only -auth required pam_env.so - -account include system-local-login - -password include system-local-login - -session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde6.pam b/kde-plasma/kscreenlocker/files/kde6.pam deleted file mode 100644 index ce9e84d58840..000000000000 --- a/kde-plasma/kscreenlocker/files/kde6.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 - -auth include system-local-login - -account include system-local-login - -password include system-local-login - -session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-6.0.3-fix-lockscreen-race.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-6.0.3-fix-lockscreen-race.patch new file mode 100644 index 000000000000..45976e0e1a14 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kscreenlocker-6.0.3-fix-lockscreen-race.patch @@ -0,0 +1,47 @@ +From 3105518ec3bc3ac88374e2c3b204f23feda91b5b Mon Sep 17 00:00:00 2001 +From: Dmitriy Konev +Date: Sun, 18 Jun 2023 16:42:56 +0300 +Subject: [PATCH] Prevent finishing greeter by unhandled signals + +We have time gap between main() start and KSignalHandler registration +in which signals will close greeter + +First this bug tried to fix in commit c63287ca1250d60f61c4429cbeb0215f5c3bebde +but placing KSignalHandler registration at start of main() is bad idea +because it broke mechanism for handling signals at all +and this behaviour was fixed in commit 448df7517021b9c2e68de161008ebc180363abed +by moving handlers bellow +for this reason we have this time gap +--- + greeter/main.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/greeter/main.cpp b/greeter/main.cpp +index bf95cd1e..0693646e 100644 +--- a/greeter/main.cpp ++++ b/greeter/main.cpp +@@ -57,6 +57,12 @@ static void signalHandler(int signum) + + int main(int argc, char *argv[]) + { ++ sigset_t blockedSignals; ++ sigemptyset(&blockedSignals); ++ sigaddset(&blockedSignals, SIGTERM); ++ sigaddset(&blockedSignals, SIGUSR1); ++ pthread_sigmask(SIG_BLOCK, &blockedSignals, NULL); ++ + LayerShellQt::Shell::useLayerShell(); + + // disable ptrace on the greeter +@@ -101,6 +107,8 @@ int main(int argc, char *argv[]) + // only connect signal handler once we can actual handle the signal properly + QObject::connect(KSignalHandler::self(), &KSignalHandler::signalReceived, &app, &signalHandler); + ++ pthread_sigmask(SIG_UNBLOCK, &blockedSignals, NULL); ++ + app.setQuitOnLastWindowClosed(false); + app.setQuitLockEnabled(false); + QCoreApplication::setApplicationName(QStringLiteral("kscreenlocker_greet")); +-- +GitLab + diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.0.3-r1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.0.3-r1.ebuild new file mode 100644 index 000000000000..ba8ff49e64d2 --- /dev/null +++ b/kde-plasma/kscreenlocker/kscreenlocker-6.0.3-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org pam + +DESCRIPTION="Library and components for secure lock screen architecture" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" + +# qtbase slot up: GuiPrivate use in greeter +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + sys-libs/pam + x11-libs/libX11 + x11-libs/libXi + x11-libs/libxcb + x11-libs/xcb-util-keysyms +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 +" +BDEPEND=" + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:6 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +PATCHES=( "${FILESDIR}/${P}-fix-lockscreen-race.patch" ) + +src_prepare() { + ecm_src_prepare + use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests +} + +src_test() { + # requires running environment + local myctestargs=( + -E x11LockerTest + ) + ecm_src_test +} + +src_install() { + ecm_src_install + + newpamd "${FILESDIR}/kde-r1.pam" kde + newpamd "${FILESDIR}/kde-fingerprint.pam" kde-fingerprint + newpamd "${FILESDIR}/kde-smartcard.pam" kde-smartcard +} diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.0.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.0.3.ebuild deleted file mode 100644 index b65bf54f7c03..000000000000 --- a/kde-plasma/kscreenlocker/kscreenlocker-6.0.3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=6.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.6.2 -inherit ecm plasma.kde.org pam - -DESCRIPTION="Library and components for secure lock screen architecture" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64" -IUSE="" - -RESTRICT="test" - -# qtbase slot up: GuiPrivate use in greeter -COMMON_DEPEND=" - dev-libs/wayland - >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6[qml] - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kidletime-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 - sys-libs/pam - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxcb - x11-libs/xcb-util-keysyms -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 -" -BDEPEND=" - dev-util/wayland-scanner - >=kde-frameworks/kcmutils-${KFMIN}:6 -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" - -src_prepare() { - ecm_src_prepare - use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests -} - -src_test() { - # requires running environment - local myctestargs=( - -E x11LockerTest - ) - ecm_src_test -} - -src_install() { - ecm_src_install - - local config - for config in kde6{,-fingerprint,-smartcard} ; do - newpamd "${FILESDIR}/${config}.pam" ${config/6} - done -} -- cgit v1.2.3