[24469] in Source-Commits
/svn/athena r24060 - trunk/debathena/config/alpine-config/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Wed Oct 7 12:52:38 2009
X-Barracuda-Envelope-From: broder@mit.edu
Date: Wed, 7 Oct 2009 12:52:25 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200910071652.n97GqPvT009823@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-10-07 12:52:25 -0400 (Wed, 07 Oct 2009)
New Revision: 24060
Modified:
trunk/debathena/config/alpine-config/debian/alpine.debathena
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
Log:
In alpine-config:
* Revert 1.12 and 1.13 pending fixing of imaps://po10.mail.mit.edu.
Modified: trunk/debathena/config/alpine-config/debian/alpine.debathena
===================================================================
--- trunk/debathena/config/alpine-config/debian/alpine.debathena 2009-10-07 16:06:38 UTC (rev 24059)
+++ trunk/debathena/config/alpine-config/debian/alpine.debathena 2009-10-07 16:52:25 UTC (rev 24060)
@@ -5,8 +5,4 @@
*EXCHANGE*) arg=(-disable-these-authenticators=GSSAPI) ;;
esac
-if ! klist -s; then
- arg=(-disable-these-authenticators=GSSAPI)
-fi
-
exec "alpine.debathena-orig" "${arg[@]}" "$@"
Modified: trunk/debathena/config/alpine-config/debian/changelog
===================================================================
--- trunk/debathena/config/alpine-config/debian/changelog 2009-10-07 16:06:38 UTC (rev 24059)
+++ trunk/debathena/config/alpine-config/debian/changelog 2009-10-07 16:52:25 UTC (rev 24060)
@@ -1,3 +1,9 @@
+debathena-alpine-config (1.14) unstable; urgency=low
+
+ * Revert 1.12 and 1.13 pending fixing of imaps://po10.mail.mit.edu.
+
+ -- Evan Broder <broder@mit.edu> Wed, 07 Oct 2009 12:52:14 -0400
+
debathena-alpine-config (1.13) unstable; urgency=low
* Disable GSSAPI on the command line if the user doesn't have tickets.
Modified: trunk/debathena/config/alpine-config/debian/control.in
===================================================================
--- trunk/debathena/config/alpine-config/debian/control.in 2009-10-07 16:06:38 UTC (rev 24059)
+++ trunk/debathena/config/alpine-config/debian/control.in 2009-10-07 16:52:25 UTC (rev 24060)
@@ -7,7 +7,7 @@
Package: debathena-alpine-config
Architecture: all
-Depends: ${misc:Depends}, alpine, debathena-msmtp-config, debianutils (>= 2.0)
+Depends: ${misc:Depends}, debathena-alpine, 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-10-07 16:06:38 UTC (rev 24059)
+++ trunk/debathena/config/alpine-config/debian/transform_pine.conf.debathena 2009-10-07 16:52:25 UTC (rev 24060)
@@ -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}{\${ATHENA_USER:-\$USER}.mail.mit.edu/ssl/imap/user=\${ATHENA_USER:-\$USER}}INBOX%m or die;
+s%^(inbox-path=).*$%${1}{mit.edu/hesiod/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" {\${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%^(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%^(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;
