[23226] in Source-Commits
/svn/athena r22887 - in trunk/debathena/config/linerva-pam-config: debian files/etc/pam.d
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 23:48:50 2008
Date: Sun, 6 Apr 2008 23:48:20 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070348.XAA06205@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 23:48:20 -0400 (Sun, 06 Apr 2008)
New Revision: 22887
Added:
trunk/debathena/config/linerva-pam-config/files/etc/pam.d/login.debathena.debathena
Removed:
trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-account.debathena
trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-session.debathena
trunk/debathena/config/linerva-pam-config/files/etc/pam.d/login.debathena
trunk/debathena/config/linerva-pam-config/files/etc/pam.d/ssh.debathena
Modified:
trunk/debathena/config/linerva-pam-config/debian/changelog
trunk/debathena/config/linerva-pam-config/debian/control
trunk/debathena/config/linerva-pam-config/debian/control.in
trunk/debathena/config/linerva-pam-config/debian/rules
trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-auth.debathena
trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-password.debathena
Log:
Modified: trunk/debathena/config/linerva-pam-config/debian/changelog
===================================================================
--- trunk/debathena/config/linerva-pam-config/debian/changelog 2008-04-07 02:48:26 UTC (rev 22886)
+++ trunk/debathena/config/linerva-pam-config/debian/changelog 2008-04-07 03:48:20 UTC (rev 22887)
@@ -1,3 +1,10 @@
+debathena-linerva-pam-config (1.1) unstable; urgency=low
+
+ * Repackage with new config-package-dev interface.
+ * Build on top of debathena-pam-config rather than replacing it.
+
+ -- Tim Abbott <tabbott@mit.edu> Sun, 06 Apr 2008 23:47:39 -0400
+
debathena-linerva-pam-config (1.0) unstable; urgency=low
* New package using CDBS
Modified: trunk/debathena/config/linerva-pam-config/debian/control
===================================================================
--- trunk/debathena/config/linerva-pam-config/debian/control 2008-04-07 02:48:26 UTC (rev 22886)
+++ trunk/debathena/config/linerva-pam-config/debian/control 2008-04-07 03:48:20 UTC (rev 22887)
@@ -2,14 +2,12 @@
Section: linerva/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
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev
Standards-Version: 3.7.2
Package: debathena-linerva-pam-config
Architecture: all
-Provides: debathena-pam-config
-Depends: debathena-kerberos-config, libpam-runtime, libpam-krb5, libpam-athena-locker, libpam-krb524, libpam-xauthority
-Conflicts: debathena-pam-config
+Depends: debathena-pam-config
Description: PAM configuration for Debian-Athena Dialups
This package configures pam so that the machine uses kerberos for
authentication and gets AFS tokens on login. It modifies the common
Modified: trunk/debathena/config/linerva-pam-config/debian/control.in
===================================================================
--- trunk/debathena/config/linerva-pam-config/debian/control.in 2008-04-07 02:48:26 UTC (rev 22886)
+++ trunk/debathena/config/linerva-pam-config/debian/control.in 2008-04-07 03:48:20 UTC (rev 22887)
@@ -7,9 +7,7 @@
Package: debathena-linerva-pam-config
Architecture: all
-Provides: debathena-pam-config
-Depends: debathena-kerberos-config, libpam-runtime, libpam-krb5, libpam-athena-locker, libpam-krb524, libpam-xauthority
-Conflicts: debathena-pam-config
+Depends: debathena-pam-config
Description: PAM configuration for Debian-Athena Dialups
This package configures pam so that the machine uses kerberos for
authentication and gets AFS tokens on login. It modifies the common
Modified: trunk/debathena/config/linerva-pam-config/debian/rules
===================================================================
--- trunk/debathena/config/linerva-pam-config/debian/rules 2008-04-07 02:48:26 UTC (rev 22886)
+++ trunk/debathena/config/linerva-pam-config/debian/rules 2008-04-07 03:48:20 UTC (rev 22887)
@@ -1,14 +1,12 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-linerva-pam-config += \
- /etc/pam.d/common-account.debathena \
- /etc/pam.d/common-auth.debathena \
- /etc/pam.d/common-password.debathena \
- /etc/pam.d/common-session.debathena \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-linerva-pam-config += \
+ /etc/pam.d/common-auth.debathena.debathena \
+ /etc/pam.d/common-password.debathena.debathena \
/etc/pam.d/cron.debathena \
- /etc/pam.d/login.debathena \
- /etc/pam.d/ssh.debathena
+ /etc/pam.d/login.debathena.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
Deleted: trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-account.debathena
Modified: trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-auth.debathena
===================================================================
--- trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-auth.debathena 2008-04-07 02:48:26 UTC (rev 22886)
+++ trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-auth.debathena 2008-04-07 03:48:20 UTC (rev 22887)
@@ -1,3 +1,3 @@
#auth sufficient pam_unix.so nullok_secure debug
#auth required pam_krb5.so forwardable use_first_pass debug
-auth required pam_krb5.so forwardable debug
+auth required pam_krb5.so forwardable
Modified: trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-password.debathena
===================================================================
--- trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-password.debathena 2008-04-07 02:48:26 UTC (rev 22886)
+++ trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-password.debathena 2008-04-07 03:48:20 UTC (rev 22887)
@@ -1,3 +1,3 @@
#password sufficient pam_unix.so nullok_secure md5 debug
#password required pam_krb5.so use_first_pass use_authtok debug
-password required pam_krb5.so use_authtok debug
+password required pam_krb5.so
Deleted: trunk/debathena/config/linerva-pam-config/files/etc/pam.d/common-session.debathena
Deleted: trunk/debathena/config/linerva-pam-config/files/etc/pam.d/login.debathena
Copied: trunk/debathena/config/linerva-pam-config/files/etc/pam.d/login.debathena.debathena (from rev 22886, trunk/debathena/config/linerva-pam-config/files/etc/pam.d/login.debathena)
Deleted: trunk/debathena/config/linerva-pam-config/files/etc/pam.d/ssh.debathena
