[23221] in Source-Commits
/svn/athena r22882 - trunk/debathena/config/pam-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 22:33:15 2008
Date: Sun, 6 Apr 2008 22:32:47 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070232.WAA05444@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-06 22:32:46 -0400 (Sun, 06 Apr 2008)
New Revision: 22882
Modified:
trunk/debathena/config/pam-config/debian/changelog
trunk/debathena/config/pam-config/debian/rules
Log:
Modified: trunk/debathena/config/pam-config/debian/changelog
===================================================================
--- trunk/debathena/config/pam-config/debian/changelog 2008-04-07 02:31:35 UTC (rev 22881)
+++ trunk/debathena/config/pam-config/debian/changelog 2008-04-07 02:32:46 UTC (rev 22882)
@@ -1,9 +1,13 @@
debathena-pam-config (1.4) unstable; urgency=low
- * Convert (partially) to the new config-package-dev interface
+ [ Shreevatsa R ]
+ * Convert (mostly) to the new config-package-dev interface
- -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 20:51:08 -0400
+ [ Tim Abbott ]
+ * Handle /etc/pam.d/ssh => /etc/pam.d/sshd rename in Debian upstream.
+ -- Tim Abbott <tabbott@mit.edu> Sun, 06 Apr 2008 22:17:16 -0400
+
debathena-pam-config (1.3debathena5) unstable; urgency=low
* Make access.conf.append mimic Athena workstations more closely.
Modified: trunk/debathena/config/pam-config/debian/rules
===================================================================
--- trunk/debathena/config/pam-config/debian/rules 2008-04-07 02:31:35 UTC (rev 22881)
+++ trunk/debathena/config/pam-config/debian/rules 2008-04-07 02:32:46 UTC (rev 22882)
@@ -7,10 +7,17 @@
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
DEB_DIVERT_EXTENSION = .debathena
+ifneq ($(wildcard /etc/pam.d/sshd),)
+ PAM_SSHD = /etc/pam.d/sshd.debathena
+ DEB_TRANSFORM_SCRIPT_$(PAM_SSHD) = debian/transform_ssh.debathena
+else
+ PAM_SSHD = /etc/pam.d/ssh.debathena
+endif
+
DEB_REPLACE_FILES_debathena-pam-config += \
$(patsubst %,/etc/pam.d/common-%.debathena,$(pam_types)) \
/etc/pam.d/gdm.debathena \
- /etc/pam.d/ssh.debathena \
+ $(PAM_SSHD) \
/etc/pam.d/login.debathena
DEB_DIVERT_FILES_debathena-pam-config += \
@@ -19,6 +26,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/replace-files.mk
+ifneq ($(wildcard /etc/pam.d/sshd),)
+debian-divert/debathena-pam-config::
+ (echo "if [ \"\$$1\" = configure ] && [ -n \"\$$2\" ]; then"; \
+ echo " undivert_unlink /etc/pam.d/ssh"; \
+ echo "fi") >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
+endif
+
common-build-indep:: debian/access.conf.debathena
LSB_ID = $(shell lsb_release --short --id)
