[23238] in Source-Commits
/svn/athena r22899 - trunk/debathena/config/msmtp-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Wed Apr 16 18:03:11 2008
Date: Wed, 16 Apr 2008 18:02:39 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804162202.SAA25966@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-16 18:02:39 -0400 (Wed, 16 Apr 2008)
New Revision: 22899
Modified:
trunk/debathena/config/msmtp-config/debian/changelog
trunk/debathena/config/msmtp-config/debian/control
trunk/debathena/config/msmtp-config/debian/control.in
trunk/debathena/config/msmtp-config/debian/debathena-msmtp
trunk/debathena/config/msmtp-config/debian/rules
Log:
Modified: trunk/debathena/config/msmtp-config/debian/changelog
===================================================================
--- trunk/debathena/config/msmtp-config/debian/changelog 2008-04-16 21:59:16 UTC (rev 22898)
+++ trunk/debathena/config/msmtp-config/debian/changelog 2008-04-16 22:02:39 UTC (rev 22899)
@@ -1,3 +1,12 @@
+debathena-msmtp-config (1.1) unstable; urgency=low
+
+ * New debathena-msmtp script without -t and --debug and with better
+ handling of missing tickets.
+ * Include a debathena-msmtp-sendmail package that configures the
+ machine to use debathena-msmtp as its sendmail solution.
+
+ -- Tim Abbott <tabbott@mit.edu> Wed, 16 Apr 2008 16:06:04 -0400
+
debathena-msmtp-config (1.0debathena2) unstable; urgency=low
* Section debathena/net.
Modified: trunk/debathena/config/msmtp-config/debian/control
===================================================================
--- trunk/debathena/config/msmtp-config/debian/control 2008-04-16 21:59:16 UTC (rev 22898)
+++ trunk/debathena/config/msmtp-config/debian/control 2008-04-16 22:02:39 UTC (rev 22899)
@@ -8,6 +8,16 @@
Package: debathena-msmtp-config
Architecture: all
Depends: msmtp, debathena-kerberos-config, ${misc:Depends}
+Conflicts: debathena-pine (<= 4.64-3debathena3)
Description: msmtp configuration for Debian-Athena
This packages provides a script to send authenticated outgoing mail via
outgoing.mit.edu on Athena.
+
+Package: debathena-msmtp-sendmail
+Architecture: all
+Depends: debathena-msmtp-config (>= 1.1~)
+Provides: mail-transport-agent
+Conflicts: mail-transport-agent
+Description: msmtp sendmail wrapper for Debian-Athena
+ This package configures the debathena-msmtp wrapper as the system's
+ sendmail program.
Modified: trunk/debathena/config/msmtp-config/debian/control.in
===================================================================
--- trunk/debathena/config/msmtp-config/debian/control.in 2008-04-16 21:59:16 UTC (rev 22898)
+++ trunk/debathena/config/msmtp-config/debian/control.in 2008-04-16 22:02:39 UTC (rev 22899)
@@ -8,6 +8,16 @@
Package: debathena-msmtp-config
Architecture: all
Depends: msmtp, debathena-kerberos-config, ${misc:Depends}
+Conflicts: debathena-pine (<= 4.64-3debathena3)
Description: msmtp configuration for Debian-Athena
This packages provides a script to send authenticated outgoing mail via
outgoing.mit.edu on Athena.
+
+Package: debathena-msmtp-sendmail
+Architecture: all
+Depends: debathena-msmtp-config (>= 1.1~)
+Provides: mail-transport-agent
+Conflicts: mail-transport-agent
+Description: msmtp sendmail wrapper for Debian-Athena
+ This package configures the debathena-msmtp wrapper as the system's
+ sendmail program.
Modified: trunk/debathena/config/msmtp-config/debian/debathena-msmtp
===================================================================
--- trunk/debathena/config/msmtp-config/debian/debathena-msmtp 2008-04-16 21:59:16 UTC (rev 22898)
+++ trunk/debathena/config/msmtp-config/debian/debathena-msmtp 2008-04-16 22:02:39 UTC (rev 22899)
@@ -1,10 +1,16 @@
#!/bin/sh
-if ! klist -s; then
- echo "pine-sendmail: no valid Kerberos tickets found." >&2
+if [ -z "$DEBATHENA_SENDMAIL_AUTH" ]; then
+ if klist -s 2&>/dev/null; then
+ DEBATHENA_SENDMAIL_AUTH=yes
+ fi
fi
-kuser=$(klist | sed -n 's/^Default principal: \(.*\)@.*/\1/ p')
-if [ -z "$kuser" ]; then
- echo "pine-sendmail: no Kerberos tickets found." >&2
+if [ "$DEBATHENA_SENDMAIL_AUTH" = "yes" ]; then
+ kuser=$(klist 2>/dev/null | sed -n 's/^Default principal: \(.*\)@ATHENA\.MIT\.EDU/\1/ p')
+ if [ -z "$kuser" ]; then
+ echo "Could not find valid ATHENA.MIT.EDU Kerberos tickets." >&2
exit 1
+ fi
+ exec msmtp --host=outgoing.mit.edu --port=587 --auth=gssapi --user="$kuser" --auto-from=on --maildomain=mit.edu "$@"
+else
+ exec msmtp --host=outgoing.mit.edu --port=25 --auth=off --auto-from=on --maildomain=mit.edu "$@"
fi
-exec msmtp --host=outgoing.mit.edu --port=587 --auth=gssapi --user="$kuser" --debug --auto-from=on --maildomain=mit.edu -t "$@"
Modified: trunk/debathena/config/msmtp-config/debian/rules
===================================================================
--- trunk/debathena/config/msmtp-config/debian/rules 2008-04-16 21:59:16 UTC (rev 22898)
+++ trunk/debathena/config/msmtp-config/debian/rules 2008-04-16 22:02:39 UTC (rev 22899)
@@ -2,3 +2,7 @@
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_DH_LINK_debathena-msmtp-sendmail += \
+ /usr/sbin/sendmail /usr/lib/sendmail \
+ /usr/lib/debathena-msmtp /usr/sbin/sendmail
