[23439] in Source-Commits
/svn/athena r23092 - in trunk/debathena/debathena/evolution-wrapper: . debian
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Wed Jul 16 16:01:19 2008
Date: Wed, 16 Jul 2008 16:00:46 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200807162000.QAA23636@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-07-16 16:00:45 -0400 (Wed, 16 Jul 2008)
New Revision: 23092
Modified:
trunk/debathena/debathena/evolution-wrapper/debian/changelog
trunk/debathena/debathena/evolution-wrapper/debian/control
trunk/debathena/debathena/evolution-wrapper/debian/control.in
trunk/debathena/debathena/evolution-wrapper/evolution.debathena
Log:
In evolution-wrapper:
* Don't assume krb4 support in the wrapper; use it if we have it.
* Recommend debathena-evolution-data-server instead of requiring.
Modified: trunk/debathena/debathena/evolution-wrapper/debian/changelog
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/debian/changelog 2008-07-16 19:31:16 UTC (rev 23091)
+++ trunk/debathena/debathena/evolution-wrapper/debian/changelog 2008-07-16 20:00:45 UTC (rev 23092)
@@ -1,3 +1,10 @@
+debathena-evolution-wrapper (10.0.4) unstable; urgency=low
+
+ * Don't assume krb4 support in the wrapper; use it if we have it.
+ * Recommend debathena-evolution-data-server instead of requiring.
+
+ -- Greg Hudson <ghudson@mit.edu> Wed, 16 Jul 2008 15:26:04 -0400
+
debathena-evolution-wrapper (10.0.3) unstable; urgency=low
* Actually make debathena-evolution-wrapper architecture-independent
Modified: trunk/debathena/debathena/evolution-wrapper/debian/control
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/debian/control 2008-07-16 19:31:16 UTC (rev 23091)
+++ trunk/debathena/debathena/evolution-wrapper/debian/control 2008-07-16 20:00:45 UTC (rev 23092)
@@ -7,8 +7,8 @@
Package: debathena-evolution-wrapper
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, evolution,
- debathena-evolution-data-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, evolution
+Recommends: debathena-evolution-data-server
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Wrapper to configure Evolution for Debathena
Modified: trunk/debathena/debathena/evolution-wrapper/debian/control.in
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/debian/control.in 2008-07-16 19:31:16 UTC (rev 23091)
+++ trunk/debathena/debathena/evolution-wrapper/debian/control.in 2008-07-16 20:00:45 UTC (rev 23092)
@@ -7,8 +7,8 @@
Package: debathena-evolution-wrapper
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome2-gconf-perl,
- debathena-evolution-data-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome2-gconf-perl
+Recommends: debathena-evolution-data-server
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Wrapper to configure Evolution for Debathena
Modified: trunk/debathena/debathena/evolution-wrapper/evolution.debathena
===================================================================
--- trunk/debathena/debathena/evolution-wrapper/evolution.debathena 2008-07-16 19:31:16 UTC (rev 23091)
+++ trunk/debathena/debathena/evolution-wrapper/evolution.debathena 2008-07-16 20:00:45 UTC (rev 23092)
@@ -49,6 +49,14 @@
# Pre-configuration.
$client->set_string("/apps/evolution/calendar/display/timezone",
"America/New_York");
+
+ # To configure the accounts we need to know if we have krb4 support.
+ my $provides = `dpkg-query -Wf '\${Provides}' evolution-data-server`;
+ my $krb4 = "";
+ if ($provides =~ /debathena-evolution-data-server/) {
+ $krb4 = ";auth=KERBEROS_V4";
+ }
+
($_, $_, $_, $_, $_, $_, my $gecos) = getpwuid($<);
my @fields = split(",", $gecos);
my $name = $fields[0];
@@ -61,7 +69,7 @@
$a .= "<addr-spec>$user\@mit.edu</addr-spec>";
$a .= '</identity>';
$a .= '<source save-passwd="false">';
- $a .= "<url>imap://$user;auth=KERBEROS_V4\@$server/;use_ssl=always</url>";
+ $a .= "<url>imap://$user$krb4\@$server/;use_ssl=always</url>";
$a .= '</source>';
$a .= '<transport save-passwd="false">';
$a .= "<url>smtp://$user;auth=GSSAPI\@outgoing.mit.edu/;use_ssl=always";
