[23214] in Source-Commits
/svn/athena r22875 - trunk/debathena/config/pam-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 21:25:52 2008
Date: Sun, 6 Apr 2008 21:25:20 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070125.VAA04318@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 21:25:19 -0400 (Sun, 06 Apr 2008)
New Revision: 22875
Added:
trunk/debathena/config/pam-config/debian/transform_common-account.debathena
trunk/debathena/config/pam-config/debian/transform_common-auth.debathena
trunk/debathena/config/pam-config/debian/transform_common-password.debathena
trunk/debathena/config/pam-config/debian/transform_common-session.debathena
trunk/debathena/config/pam-config/debian/transform_gdm.debathena
trunk/debathena/config/pam-config/debian/transform_login.debathena
trunk/debathena/config/pam-config/debian/transform_ssh.debathena
Modified:
trunk/debathena/config/pam-config/debian/changelog
trunk/debathena/config/pam-config/debian/control
trunk/debathena/config/pam-config/debian/control.in
trunk/debathena/config/pam-config/debian/debathena-pam-config.install
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 01:13:56 UTC (rev 22874)
+++ trunk/debathena/config/pam-config/debian/changelog 2008-04-07 01:25:19 UTC (rev 22875)
@@ -1,3 +1,9 @@
+debathena-pam-config (1.4) unstable; urgency=low
+
+ * Convert (partially) to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 20:51:08 -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/control
===================================================================
--- trunk/debathena/config/pam-config/debian/control 2008-04-07 01:13:56 UTC (rev 22874)
+++ trunk/debathena/config/pam-config/debian/control 2008-04-07 01:25:19 UTC (rev 22875)
@@ -2,12 +2,14 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common (>= 3.5~), debathena-config-build-common, libpam-runtime, gdm, debathena-ssh-server, lsb-release
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, libpam-runtime, gdm, debathena-ssh-server, lsb-release
Standards-Version: 3.7.2
Package: debathena-pam-config
Architecture: all
Depends: debathena-kerberos-config, libpam-runtime, libpam-krb5, libpam-krb524, libpam-athena-locker, ${misc:Depends}, libpam-debathena-home-type, debathena-dotfiles, debathena-nsswitch-config (>= 1.3~), libpam-mktemp
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: PAM configuration for Debian-Athena
This package configures PAM to use the Athena Kerberos realm to
manage authentication, get AFS tokens on login, etc.
Modified: trunk/debathena/config/pam-config/debian/control.in
===================================================================
--- trunk/debathena/config/pam-config/debian/control.in 2008-04-07 01:13:56 UTC (rev 22874)
+++ trunk/debathena/config/pam-config/debian/control.in 2008-04-07 01:25:19 UTC (rev 22875)
@@ -8,6 +8,8 @@
Package: debathena-pam-config
Architecture: all
Depends: debathena-kerberos-config, libpam-runtime, libpam-krb5, libpam-krb524, libpam-athena-locker, ${misc:Depends}, libpam-debathena-home-type, debathena-dotfiles, debathena-nsswitch-config (>= 1.3~), libpam-mktemp
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: PAM configuration for Debian-Athena
This package configures PAM to use the Athena Kerberos realm to
manage authentication, get AFS tokens on login, etc.
Modified: trunk/debathena/config/pam-config/debian/debathena-pam-config.install
===================================================================
--- trunk/debathena/config/pam-config/debian/debathena-pam-config.install 2008-04-07 01:13:56 UTC (rev 22874)
+++ trunk/debathena/config/pam-config/debian/debathena-pam-config.install 2008-04-07 01:25:19 UTC (rev 22875)
@@ -1,8 +1 @@
-debian/common-account.debathena etc/pam.d
-debian/common-auth.debathena etc/pam.d
-debian/common-password.debathena etc/pam.d
-debian/common-session.debathena etc/pam.d
-debian/gdm.debathena etc/pam.d
-debian/ssh.debathena etc/pam.d
-debian/login.debathena etc/pam.d
debian/access.conf.debathena etc/security
Modified: trunk/debathena/config/pam-config/debian/rules
===================================================================
--- trunk/debathena/config/pam-config/debian/rules 2008-04-07 01:13:56 UTC (rev 22874)
+++ trunk/debathena/config/pam-config/debian/rules 2008-04-07 01:25:19 UTC (rev 22875)
@@ -5,41 +5,24 @@
pam_krb5_passwd_opts = use_authtok
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-pam-config += \
+DEB_DIVERT_EXTENSION = .debathena
+
+DEB_REPLACE_FILES_debathena-pam-config += \
$(patsubst %,/etc/pam.d/common-%.debathena,$(pam_types)) \
/etc/pam.d/gdm.debathena \
/etc/pam.d/ssh.debathena \
- /etc/pam.d/login.debathena \
+ /etc/pam.d/login.debathena
+
+DEB_DIVERT_FILES_debathena-pam-config += \
/etc/security/access.conf.debathena
+
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-check-conffiles.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
-common-build-indep:: $(patsubst %,debian/common-%.debathena,$(pam_types)) debian/gdm.debathena debian/login.debathena debian/ssh.debathena debian/access.conf.debathena
+common-build-indep:: debian/access.conf.debathena
-debian/common-account.debathena: /usr/share/pam/common-account
- perl -0pe 's/^(account[ \t]+)required( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$$1sufficient$$3$$4\n$$1required$$2$$3pam_krb5.so\n/m or die' $< > $@
-
-debian/common-auth.debathena: /usr/share/pam/common-auth
- perl -0pe 's/^(auth[ \t]+)required( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$$1sufficient$$3$$4\n$$1required$$2$$3pam_krb5.so use_first_pass\n/m or die' $< > $@
-
-debian/common-session.debathena: /usr/share/pam/common-session
- perl -0pe 's/^(session[ \t]+)required([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$$1required$$2$$3\n$$1optional$$2pam_krb5.so\n$$1optional$$2pam_krb524.so\n$$1optional$$2pam_athena_locker.so\n$$1optional$$2pam_debathena_home_type.so\n$$1optional$$2pam_mktemp.so var=ATHENA_SESSION_TMPDIR prefix=\/var\/run\/athena-sessions\/session dir\n/m or die' $< > $@
-
-debian/common-password.debathena: /usr/share/pam/common-password
- perl -0pe 's/^(password[ \t]+)required( ? ?)([ \t]+)(pam_unix\.so([ \t]+.*)?)\n/$$1sufficient$$3$$4\n$$1required$$2$$3pam_krb5.so use_first_pass\n/m or die' $< > $@
-
-debian/gdm.debathena: $(call debathena_check_conffiles,/etc/pam.d/gdm)
- perl -0pe 's/^(\@include common-account)/account\trequired\tpam_access.so\n$$1/m or die' $< > $@
-
-debian/ssh.debathena: $(call debathena_check_conffiles,/etc/pam.d/ssh)
- perl -0pe '(s/^\#[\t ]+(account[ \t]+required[ \t]+pam_access.so)/$$1/m or s/^(?=\@include[ \t]+common-account)/account required pam_access.so\n/m) and s/^(\@include[ \t]+common-session)/$$1\nsession optional pam_mktemp.so var=XAUTHORITY prefix=\/var\/run\/athena-sessions\/xauth/m or die' $< > $@
-
-debian/login.debathena: $(call debathena_check_conffiles,/etc/pam.d/login)
- perl -0pe 's/^\#[\t ]+(account[ \t]+required[ \t]+pam_access.so)/$$1/m or die' $< > $@
-
LSB_ID = $(shell lsb_release --short --id)
-debian/access.conf.debathena: $(call debathena_check_conffiles,/etc/security/access.conf)
+debian/access.conf.debathena: $(call debian_check_files,/etc/security/access.conf)
ifeq ($(LSB_ID), Debian)
(cat $<; sed 's/root admin /root /' debian/access.conf.append) > $@
else
@@ -51,4 +34,4 @@
endif
clean::
- rm -f $(patsubst %,debian/common-%.debathena,$(pam_types)) debian/gdm.debathena debian/login.debathena debian/ssh.debathena debian/access.conf.debathena
+ rm -f debian/access.conf.debathena
Added: trunk/debathena/config/pam-config/debian/transform_common-account.debathena
Property changes on: trunk/debathena/config/pam-config/debian/transform_common-account.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/pam-config/debian/transform_common-auth.debathena
Property changes on: trunk/debathena/config/pam-config/debian/transform_common-auth.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/pam-config/debian/transform_common-password.debathena
Property changes on: trunk/debathena/config/pam-config/debian/transform_common-password.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/pam-config/debian/transform_common-session.debathena
Property changes on: trunk/debathena/config/pam-config/debian/transform_common-session.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/pam-config/debian/transform_gdm.debathena
Property changes on: trunk/debathena/config/pam-config/debian/transform_gdm.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/pam-config/debian/transform_login.debathena
Property changes on: trunk/debathena/config/pam-config/debian/transform_login.debathena
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/config/pam-config/debian/transform_ssh.debathena
Property changes on: trunk/debathena/config/pam-config/debian/transform_ssh.debathena
___________________________________________________________________
Name: svn:executable
+ *
