[24442] in Source-Commits
/svn/athena r24033 - in trunk/debathena/config: alpine-config/debian mutt-config/debian thunderbird-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Wed Sep 30 17:10:44 2009
Date: Wed, 30 Sep 2009 17:10:16 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200909302110.n8ULAGCY023612@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-09-30 17:10:16 -0400 (Wed, 30 Sep 2009)
New Revision: 24033
Modified:
trunk/debathena/config/alpine-config/debian/changelog
trunk/debathena/config/alpine-config/debian/control.in
trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena
trunk/debathena/config/mutt-config/debian/changelog
trunk/debathena/config/mutt-config/debian/debathena-mutt-folder
trunk/debathena/config/thunderbird-config/debian/changelog
trunk/debathena/config/thunderbird-config/debian/debathena.cfg
trunk/debathena/config/thunderbird-config/debian/thunderbird.debathena
Log:
In alpine-config, mutt-config, and thunderbird-config, use
user.mail.mit.edu and GSSAPI instead of Hesiod and krb4.
Modified: trunk/debathena/config/alpine-config/debian/changelog
===================================================================
--- trunk/debathena/config/alpine-config/debian/changelog 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/alpine-config/debian/changelog 2009-09-30 21:10:16 UTC (rev 24033)
@@ -1,3 +1,11 @@
+debathena-alpine-config (1.11.4) unstable; urgency=low
+
+ * Switch to using $USER.mail.mit.edu instead of Hesiod, eliminating the
+ need for a Debathenified alpine.
+ * TODO: Figure out what to do about alpine-1.00-creatdir.patch
+
+ -- Evan Broder <broder@mit.edu> Tue, 29 Sep 2009 12:09:58 -0400
+
debathena-alpine-config (1.11.3) unstable; urgency=low
* Suppress a Hesiod error when running alpine on a non-Athena account.
Modified: trunk/debathena/config/alpine-config/debian/control.in
===================================================================
--- trunk/debathena/config/alpine-config/debian/control.in 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/alpine-config/debian/control.in 2009-09-30 21:10:16 UTC (rev 24033)
@@ -7,7 +7,7 @@
Package: debathena-alpine-config
Architecture: all
-Depends: ${misc:Depends}, debathena-alpine, debathena-msmtp-config, debianutils (>= 2.0)
+Depends: ${misc:Depends}, debathena-msmtp-config, debianutils (>= 2.0)
Conflicts: pine
Replaces: pine
Description: Alpine configuration for Debathena
Modified: trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena
===================================================================
--- trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena 2009-09-30 21:10:16 UTC (rev 24033)
@@ -1,7 +1,7 @@
#!/usr/bin/perl -0p
s%^(user-domain=).*$%${1}mit.edu%m or die;
s%^(nntp-server=).*$%${1}news.mit.edu%m or die;
-s%^(inbox-path=).*$%${1}{mit.edu/hesiod/ssl/imap/user=\${ATHENA_USER:-\$USER}}INBOX%m or die;
+s%^(inbox-path=).*$%${1}{\${ATHENA_USER:-\$USER}.mail.mit.edu/ssl/imap/user=\${ATHENA_USER:-\$USER}}INBOX%m or die;
s%^(feature-list=).*$%${1}enable-mail-check-cue,\n\tsave-will-quote-leading-froms,\n\tenable-full-header-cmd%m or die;
s%^(bugs-fullname=).*$%${1}Athena Bugs%m or die;
s%^(bugs-address=).*$%${1}bugs\@mit.edu%m or die;
@@ -10,7 +10,7 @@
s%^(local-fullname=).*$%${1}Athena Consultants%m or die;
s%^(local-address=).*$%${1}olc-mail\@mit.edu%m or die;
s%^(url-viewers=).*$%${1}/usr/bin/sensible-browser%m or die;
-s%^(folder-collections=).*$%${1}"MIT Mail" {mit.edu/hesiod/ssl/imap/user=\${ATHENA_USER:-\$USER}}INBOX.[],\n\t"Old MH Mail" #mh/[],\n\t"Local Pine Mail" ~/mail/[]%m or die;
+s%^(folder-collections=).*$%${1}"MIT Mail" {\${ATHENA_USER:-\$USER}.mail.mit.edu/ssl/imap/user=\${ATHENA_USER:-\$USER}}INBOX.[],\n\t"Old MH Mail" #mh/[],\n\t"Local Pine Mail" ~/mail/[]%m or die;
s%^(sendmail-path=).*$%${1}/usr/lib/debathena-msmtp -t%m or die;
s%^(rsh-open-timeout=).*$%${1}0%m or die;
s%^(ssh-open-timeout=).*$%${1}0%m or die;
Modified: trunk/debathena/config/mutt-config/debian/changelog
===================================================================
--- trunk/debathena/config/mutt-config/debian/changelog 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/mutt-config/debian/changelog 2009-09-30 21:10:16 UTC (rev 24033)
@@ -1,3 +1,11 @@
+debathena-mutt-config (1.3) unstable; urgency=low
+
+ * Instead of using Hesiod, use user.mail.mit.edu. We can also switch to
+ using SSL connections universally, since SSL + GSSAPI seems to work
+ better than SSL + krb4.
+
+ -- Evan Broder <broder@mit.edu> Tue, 29 Sep 2009 12:13:42 -0400
+
debathena-mutt-config (1.2) unstable; urgency=low
* Use SSL for connections to Exchange (I'd use it universally, but SSL
Modified: trunk/debathena/config/mutt-config/debian/debathena-mutt-folder
===================================================================
--- trunk/debathena/config/mutt-config/debian/debathena-mutt-folder 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/mutt-config/debian/debathena-mutt-folder 2009-09-30 21:10:16 UTC (rev 24033)
@@ -1,8 +1,3 @@
#!/bin/sh
user=${ATHENA_USER:-$USER}
-pobox="$(hesinfo "$user" pobox | awk '{print $2}')"
-ssl=
-case "$pobox" in
- *EXCHANGE*) ssl=s ;;
-esac
-echo "imap${ssl}://$user@$pobox/"
+echo "imaps://$user@$user.mail.mit.edu/"
Modified: trunk/debathena/config/thunderbird-config/debian/changelog
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/changelog 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/thunderbird-config/debian/changelog 2009-09-30 21:10:16 UTC (rev 24033)
@@ -1,3 +1,9 @@
+debathena-thunderbird-config (1.3) unstable; urgency=low
+
+ * Change Thunderbird to use user.mail.mit.edu instead of Hesiod.
+
+ -- Evan Broder <broder@mit.edu> Tue, 29 Sep 2009 12:16:42 -0400
+
debathena-thunderbird-config (1.2) unstable; urgency=low
* Whitelist the AFS ACL on the Thunderbird profile instead of
Modified: trunk/debathena/config/thunderbird-config/debian/debathena.cfg
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/debathena.cfg 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/thunderbird-config/debian/debathena.cfg 2009-09-30 21:10:16 UTC (rev 24033)
@@ -26,10 +26,10 @@
try
{
// Kerberos Authentication
- // defaultPref("network.negotiate-auth.trusted-uris", "imap://po*.mit.edu,imaps://po*.mit.edu");
- // defaultPref("network.negotiate-auth.using-native-gsslib", true);
- // defaultPref("network.negotiate-auth.allow-proxies", true);
- // defaultPref("network.auth.use-sspi", false);
+ defaultPref("network.negotiate-auth.trusted-uris", "imaps://po*.mit.edu");
+ defaultPref("network.negotiate-auth.using-native-gsslib", true);
+ defaultPref("network.negotiate-auth.allow-proxies", true);
+ defaultPref("network.auth.use-sspi", false);
var username = getenv("ATHENA_USER");
if(username == "")
@@ -48,13 +48,8 @@
throw "Failed to retrieve full name";
}
- var pobox = getenv("POBOX");
- if(pobox == null || username == '')
- {
- throw "Failed to retrieve the PO box";
- }
+ var pobox = username+'.mail.mit.edu'
-
// Construct additional user settings
email = username+'@mit.edu';
imapURI='imap://'+username+'@mit.edu';
Modified: trunk/debathena/config/thunderbird-config/debian/thunderbird.debathena
===================================================================
--- trunk/debathena/config/thunderbird-config/debian/thunderbird.debathena 2009-09-29 19:15:49 UTC (rev 24032)
+++ trunk/debathena/config/thunderbird-config/debian/thunderbird.debathena 2009-09-30 21:10:16 UTC (rev 24033)
@@ -13,7 +13,6 @@
fi
fi
: ${NAME:=$(getent passwd "$USER" | cut -d: -f5 | cut -d, -f1)}
-: ${POBOX:=$(hesinfo "${ATHENA_USER:-USER}" pobox | awk '{print $2}')}
-export NAME POBOX
+export NAME
exec "$0.debathena-orig" "$@"
