commit: 53c0886f621f768c82b95cf1b1aa53ec0da40724 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Mar 28 21:17:39 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Apr 16 19:59:40 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=53c0886f
kde-plasma/kscreenlocker: Silence optional pam modules warnings Bug: https://bugs.gentoo.org/927032 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/{kde6-fingerprint.pam => kde-fingerprint.pam} | 2 +- kde-plasma/kscreenlocker/files/{kde6.pam => kde-r1.pam} | 0 .../kscreenlocker/files/{kde6-smartcard.pam => kde-smartcard.pam} | 2 +- kde-plasma/kscreenlocker/kscreenlocker-6.0.49.9999.ebuild | 7 +++---- kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 7 +++---- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/kde-plasma/kscreenlocker/files/kde6-fingerprint.pam b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam similarity index 88% rename from kde-plasma/kscreenlocker/files/kde6-fingerprint.pam rename to kde-plasma/kscreenlocker/files/kde-fingerprint.pam index 38267de65e..6ca0ba1f09 100644 --- a/kde-plasma/kscreenlocker/files/kde6-fingerprint.pam +++ b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam @@ -3,7 +3,7 @@ auth required pam_shells.so auth required pam_nologin.so auth required pam_faillock.so preauth -auth required pam_fprintd.so +-auth required pam_fprintd.so auth required pam_env.so account include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde6.pam b/kde-plasma/kscreenlocker/files/kde-r1.pam similarity index 100% rename from kde-plasma/kscreenlocker/files/kde6.pam rename to kde-plasma/kscreenlocker/files/kde-r1.pam diff --git a/kde-plasma/kscreenlocker/files/kde6-smartcard.pam b/kde-plasma/kscreenlocker/files/kde-smartcard.pam similarity index 83% rename from kde-plasma/kscreenlocker/files/kde6-smartcard.pam rename to kde-plasma/kscreenlocker/files/kde-smartcard.pam index f887c78234..694fc1e905 100644 --- a/kde-plasma/kscreenlocker/files/kde6-smartcard.pam +++ b/kde-plasma/kscreenlocker/files/kde-smartcard.pam @@ -3,7 +3,7 @@ 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_pkcs11.so wait_for_card card_only auth required pam_env.so account include system-local-login diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.0.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.0.49.9999.ebuild index 0d5e1f4378..d17d2585aa 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-6.0.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-6.0.49.9999.ebuild @@ -74,8 +74,7 @@ src_test() { src_install() { ecm_src_install - local config - for config in kde6{,-fingerprint,-smartcard} ; do - newpamd "${FILESDIR}/${config}.pam" ${config/6} - done + 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-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild index d00781b417..a2ebeaf4f6 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -74,8 +74,7 @@ src_test() { src_install() { ecm_src_install - local config - for config in kde6{,-fingerprint,-smartcard} ; do - newpamd "${FILESDIR}/${config}.pam" ${config/6} - done + newpamd "${FILESDIR}/kde-r1.pam" kde + newpamd "${FILESDIR}/kde-fingerprint.pam" kde-fingerprint + newpamd "${FILESDIR}/kde-smartcard.pam" kde-smartcard }
