[25775] in Source-Commits
/svn/athena r25223 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jul 11 16:29:43 2011
Date: Mon, 11 Jul 2011 16:29:37 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107112029.p6BKTbKV017302@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-11 16:29:37 -0400 (Mon, 11 Jul 2011)
New Revision: 25223
Added:
trunk/debathena/config/reactivate/debian/transform_schroot_defaults
trunk/debathena/config/reactivate/debian/transform_schroot_pam
Removed:
trunk/debathena/config/reactivate/debian/transform_schroot.debathena
Modified:
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/rules
trunk/debathena/config/reactivate/debian/snapshot-run
Log:
In reactivate:
* Workaround for schroot/libpam-afs-session stupidity (Trac: #928)
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2011-07-09 02:03:39 UTC (rev 25222)
+++ trunk/debathena/config/reactivate/debian/changelog 2011-07-11 20:29:37 UTC (rev 25223)
@@ -1,3 +1,9 @@
+debathena-reactivate (2.0.22) unstable; urgency=low
+
+ * Workaround for schroot/libpam-afs-session stupidity (Trac: #928)
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 11 Jul 2011 16:03:09 -0400
+
debathena-reactivate (2.0.21) unstable; urgency=low
* Programs that run df no longer get confused about /tmp. (Trac #656)
Modified: trunk/debathena/config/reactivate/debian/rules
===================================================================
--- trunk/debathena/config/reactivate/debian/rules 2011-07-09 02:03:39 UTC (rev 25222)
+++ trunk/debathena/config/reactivate/debian/rules 2011-07-11 20:29:37 UTC (rev 25223)
@@ -5,7 +5,8 @@
/etc/gdm/Xsession.debathena
DEB_TRANSFORM_FILES_debathena-reactivate += \
/etc/pam.d/su.debathena \
- /etc/default/schroot.debathena
+ /etc/default/schroot.debathena \
+ /etc/pam.d/schroot.debathena
DEB_REMOVE_FILES_debathena-reactivate += \
/etc/xdg/autostart/jockey-gtk.desktop \
/etc/xdg/autostart/update-notifier.desktop \
@@ -15,5 +16,10 @@
/etc/pam.d/sudo.debathena
DEB_UNDIVERT_VERSION_/etc/pam.d/sudo.debathena = 1.25.2~
+DEB_TRANSFORM_SCRIPT_/etc/default/schroot.debathena = \
+ debian/transform_schroot_defaults
+DEB_TRANSFORM_SCRIPT_/etc/pam.d/schroot.debathena = \
+ debian/transform_schroot_pam
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
Modified: trunk/debathena/config/reactivate/debian/snapshot-run
===================================================================
--- trunk/debathena/config/reactivate/debian/snapshot-run 2011-07-09 02:03:39 UTC (rev 25222)
+++ trunk/debathena/config/reactivate/debian/snapshot-run 2011-07-11 20:29:37 UTC (rev 25223)
@@ -51,6 +51,9 @@
set +e
cd
+# Workaround for stupidity, see #928 for details
+# Remove this once we're running pam-afs-session 2.4
+echo "KRB5CCNAME=$KRB5CCNAME" >| /tmp/ticketenv
schroot -c "$session" -r -p -- sudo -E -u "$USER" -- "$@"
cd /
Copied: trunk/debathena/config/reactivate/debian/transform_schroot_defaults (from rev 25222, trunk/debathena/config/reactivate/debian/transform_schroot.debathena)
===================================================================
--- trunk/debathena/config/reactivate/debian/transform_schroot_defaults (rev 0)
+++ trunk/debathena/config/reactivate/debian/transform_schroot_defaults 2011-07-11 20:29:37 UTC (rev 25223)
@@ -0,0 +1,2 @@
+#!/usr/bin/perl -0p
+s/^SESSIONS_RECOVER="recover"$/SESSIONS_RECOVER="end"/m;
Added: trunk/debathena/config/reactivate/debian/transform_schroot_pam
===================================================================
--- trunk/debathena/config/reactivate/debian/transform_schroot_pam (rev 0)
+++ trunk/debathena/config/reactivate/debian/transform_schroot_pam 2011-07-11 20:29:37 UTC (rev 25223)
@@ -0,0 +1,9 @@
+#!/usr/bin/perl -0p
+# -*- mode: fundamental; -*-
+
+print <<EOF;
+# Added by debathena-reactivate
+auth required pam_env.so readenv=1 envfile=/tmp/ticketenv
+EOF
+print;
+exit 0;
Property changes on: trunk/debathena/config/reactivate/debian/transform_schroot_pam
___________________________________________________________________
Added: svn:executable
+ *
