[neon/kde/kscreenlocker/Neon/unstable] debian: seem like dh_installpam doesn't work

Carlos De Maine null at kde.org
Sun Nov 5 09:26:30 GMT 2023


Git commit 437cc131c34729ed3c49883dee48c0f0223fdf13 by Carlos De Maine.
Committed on 05/11/2023 at 10:26.
Pushed by carlosdem into branch 'Neon/unstable'.

seem like dh_installpam doesn't work

D  +0    -1    debian/compat
M  +2    -2    debian/control
M  +1    -0    debian/libkscreenlocker6.install
R  +0    -0    debian/pam.d/kde [from: debian/kscreenlocker.kde.pam - 100% similarity]
R  +0    -0    debian/pam.d/kde-fingerprint [from: debian/kscreenlocker.kde-fingerprint.pam - 100% similarity]
R  +2    -2    debian/pam.d/kde-smartcard [from: debian/kscreenlocker.kde-smartcard.pam - 090% similarity]
M  +2    -4    debian/rules

https://invent.kde.org/neon/kde/kscreenlocker/-/commit/437cc131c34729ed3c49883dee48c0f0223fdf13

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index d030550..d1f3a85 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11~),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kcmutils-dev,
                kf6-kcrash-dev,
diff --git a/debian/libkscreenlocker6.install b/debian/libkscreenlocker6.install
index ab1cc17..84fc2a3 100644
--- a/debian/libkscreenlocker6.install
+++ b/debian/libkscreenlocker6.install
@@ -2,3 +2,4 @@ usr/lib/*/libKScreenLocker.so.6
 usr/lib/*/libKScreenLocker.so.5.*
 usr/lib/*/libexec/
 usr/share/qlogging-categories6/kscreenlocker.categories
+../pam.d/* usr/lib/pam.d/
diff --git a/debian/kscreenlocker.kde.pam b/debian/pam.d/kde
similarity index 100%
rename from debian/kscreenlocker.kde.pam
rename to debian/pam.d/kde
diff --git a/debian/kscreenlocker.kde-fingerprint.pam b/debian/pam.d/kde-fingerprint
similarity index 100%
rename from debian/kscreenlocker.kde-fingerprint.pam
rename to debian/pam.d/kde-fingerprint
diff --git a/debian/kscreenlocker.kde-smartcard.pam b/debian/pam.d/kde-smartcard
similarity index 90%
rename from debian/kscreenlocker.kde-smartcard.pam
rename to debian/pam.d/kde-smartcard
index 01332f6..6c9da19 100644
--- a/debian/kscreenlocker.kde-smartcard.pam
+++ b/debian/pam.d/kde-smartcard
@@ -1,9 +1,9 @@
 #%PAM-1.0
 auth    [success=ok user_unknown=ignore default=bad] pam_succeed_if.so user != root quiet_success
-auth    required        pam_sss.so allow_missing_name require_cert_auth
+auth    sufficient      pam_sss.so allow_missing_name try_cert_auth
+auth    sufficient      pam_pkcs11.so nullok debug try_first_pass
 auth    requisite       pam_nologin.so
 auth    optional        pam_kwallet5.so
-
 @include common-account
 # SELinux needs to be the first session rule. This ensures that any
 # lingering context has been cleared. Without this it is possible
diff --git a/debian/rules b/debian/rules
index 1d62f8d..e89be4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,5 @@
 %:
 	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_installpam:
-	dh_installpam --name=kde
-	dh_installpam --name=kde-fingerprint
-	dh_installpam --name=kde-smartcard
\ No newline at end of file
+override_dh_auto_test:
+	:


More information about the Neon-commits mailing list