[26498] in Source-Commits
/svn/athena r25594 - trunk/debathena/config/pam-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Jun 29 23:35:53 2012
Date: Fri, 29 Jun 2012 23:35:52 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206300335.q5U3ZqxX012199@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-29 23:35:51 -0400 (Fri, 29 Jun 2012)
New Revision: 25594
Added:
trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config
Modified:
trunk/debathena/config/pam-config/debian/changelog
trunk/debathena/config/pam-config/debian/debathena-pam-config.postinst
trunk/debathena/config/pam-config/debian/debathena-pam-config.prerm
trunk/debathena/config/pam-config/debian/rules
trunk/debathena/config/pam-config/debian/transform_common-session.debathena
Log:
In pam-config:
* Set XDG_CACHE_HOME to something on local disk (Trac: #1109 and #1162)
Modified: trunk/debathena/config/pam-config/debian/changelog
===================================================================
--- trunk/debathena/config/pam-config/debian/changelog 2012-06-29 22:25:03 UTC (rev 25593)
+++ trunk/debathena/config/pam-config/debian/changelog 2012-06-30 03:35:51 UTC (rev 25594)
@@ -1,3 +1,9 @@
+debathena-pam-config (1.20) unstable; urgency=low
+
+ * Set XDG_CACHE_HOME to something on local disk (Trac: #1109 and #1162)
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 29 Jun 2012 23:34:52 -0400
+
debathena-pam-config (1.19) unstable; urgency=low
* Explain that Kerberos errors can be caused by @ signs (Trac: #612)
Modified: trunk/debathena/config/pam-config/debian/debathena-pam-config.postinst
===================================================================
--- trunk/debathena/config/pam-config/debian/debathena-pam-config.postinst 2012-06-29 22:25:03 UTC (rev 25593)
+++ trunk/debathena/config/pam-config/debian/debathena-pam-config.postinst 2012-06-30 03:35:51 UTC (rev 25594)
@@ -33,7 +33,7 @@
pam-auth-update --package $force
# pam-auth-update is broken. (?) Sigh.
perl -i -lne 'print unless (/^(krb5 | krb524 | athena-locker
- | debathena-home-type | athena-session-tmpdir-mktemp | afs-session)$/x)' \
+ | debathena-home-type | athena-session-tmpdir-mktemp | xdg-cache-home-mktemp | afs-session)$/x)' \
/var/lib/pam/seen
pam-auth-update --package
fi
Modified: trunk/debathena/config/pam-config/debian/debathena-pam-config.prerm
===================================================================
--- trunk/debathena/config/pam-config/debian/debathena-pam-config.prerm 2012-06-29 22:25:03 UTC (rev 25593)
+++ trunk/debathena/config/pam-config/debian/debathena-pam-config.prerm 2012-06-30 03:35:51 UTC (rev 25594)
@@ -5,6 +5,7 @@
if hash pam-auth-update 2>/dev/null; then
pam-auth-update --package --remove krb5
pam-auth-update --package --remove athena-session-tmpdir-mktemp
+ pam-auth-update --package --remove xdg-cache-home-mktemp
fi
fi
Modified: trunk/debathena/config/pam-config/debian/rules
===================================================================
--- trunk/debathena/config/pam-config/debian/rules 2012-06-29 22:25:03 UTC (rev 25593)
+++ trunk/debathena/config/pam-config/debian/rules 2012-06-30 03:35:51 UTC (rev 25594)
@@ -51,6 +51,8 @@
install/debathena-pam-config::
install -D -m 644 debian/athena-session-tmpdir-mktemp.pam-config \
$(DEB_DESTDIR)/usr/share/pam-configs/athena-session-tmpdir-mktemp
+ install -D -m 644 debian/xdg-cache-home-mktemp.pam-config \
+ $(DEB_DESTDIR)/usr/share/pam-configs/xdg-cache-home-mktemp
install -D -m 644 debian/libpam-krb5.pam-config \
$(DEB_DESTDIR)/usr/share/pam-configs/krb5.debathena
install -D -m 644 debian/libpam-afs-session.pam-config \
Modified: trunk/debathena/config/pam-config/debian/transform_common-session.debathena
===================================================================
--- trunk/debathena/config/pam-config/debian/transform_common-session.debathena 2012-06-29 22:25:03 UTC (rev 25593)
+++ trunk/debathena/config/pam-config/debian/transform_common-session.debathena 2012-06-30 03:35:51 UTC (rev 25594)
@@ -1,3 +1,3 @@
#!/usr/bin/perl -0p
-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_afs_session.so aklog_homedir\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;
+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_afs_session.so aklog_homedir\n$1optional$2pam_debathena_home_type.so\n$1optional$2pam_mktemp.so var=ATHENA_SESSION_TMPDIR prefix=/var/run/athena-sessions/session dir\n$1optional$2pam_mktemp.so var=XDG_CACHE_HOME prefix=/var/run/athena-sessions/xdgcache dir\n|m or die;
Added: trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config
===================================================================
--- trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config (rev 0)
+++ trunk/debathena/config/pam-config/debian/xdg-cache-home-mktemp.pam-config 2012-06-30 03:35:51 UTC (rev 25594)
@@ -0,0 +1,6 @@
+Name: Athena: create local XDG_CACHE_HOME securely
+Default: yes
+Priority: 17
+Session-Type: Additional
+Session:
+ optional pam_mktemp.so var=XDG_CACHE_HOME prefix=/var/run/athena-sessions/xdgcache dir
