[Pgp-tools-commit] r481 - in trunk: debian gpg-mailkeys

[Franck Joncourt]

Author: franck
Date: 2010-11-23 20:57:58 +0000 (Tue, 23 Nov 2010)
New Revision: 481

Modified:
   trunk/debian/changelog
   trunk/gpg-mailkeys/example.gpg-mailkeysrc
   trunk/gpg-mailkeys/gpg-mailkeys
   trunk/gpg-mailkeys/gpg-mailkeys.1
Log:
Add new environment variable SENDMAIL_ARGS to allow user to pass arguments to sendmail (closes: #599409).

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-11-22 21:06:30 UTC (rev 480)
+++ trunk/debian/changelog	2010-11-23 20:57:58 UTC (rev 481)
@@ -17,6 +17,8 @@
       springgraph (closes: #604028).
   * gpg-mailkeys:
     + Correct path of ~/.gpg-mailkeysrc and ~/.signature in manpage.
+    + Add new environment variable SENDMAIL_ARGS to allow user to pass
+      arguments to sendmail (closes: #599409).
   * caff:
     + Refactor import of own key and import for keys to sign from keyrings.
     + Also automatically import keys to sign from the user's normal gpg

Modified: trunk/gpg-mailkeys/example.gpg-mailkeysrc
===================================================================
--- trunk/gpg-mailkeys/example.gpg-mailkeysrc	2010-11-22 21:06:30 UTC (rev 480)
+++ trunk/gpg-mailkeys/example.gpg-mailkeysrc	2010-11-23 20:57:58 UTC (rev 481)
@@ -15,3 +15,10 @@
 
 See you!
 "
+
+# You can add here whatever arguments you want to pass to sendmail.
+# For example, if you use ssmtp, you may want to set your credentials this way
+#     SENDMAIL_ARGS="-au myusername -aps3cr3t"
+# to authenticate to the smtp server with username myusername and password
+# s3cr3t.
+SENDMAIL_ARGS=""

Modified: trunk/gpg-mailkeys/gpg-mailkeys
===================================================================
--- trunk/gpg-mailkeys/gpg-mailkeys	2010-11-22 21:06:30 UTC (rev 480)
+++ trunk/gpg-mailkeys/gpg-mailkeys	2010-11-23 20:57:58 UTC (rev 481)
@@ -61,6 +61,9 @@
 Enjoy,
 $NAME"
 fi
+if [ -z "$SENDMAIL_ARGS" ]; then
+	SENDMAIL_ARGS=""
+fi
 
 get_local_charset
 
@@ -120,7 +123,7 @@
 --$BOUNDARY--
 EOM
 	printf " sending"
-	/usr/sbin/sendmail -ti <$TEMPFILE
+	/usr/sbin/sendmail $SENDMAIL_ARGS -ti <$TEMPFILE
 	rm $TEMPFILE
 	printf " done.\n"
 	shift 1

Modified: trunk/gpg-mailkeys/gpg-mailkeys.1
===================================================================
--- trunk/gpg-mailkeys/gpg-mailkeys.1	2010-11-22 21:06:30 UTC (rev 480)
+++ trunk/gpg-mailkeys/gpg-mailkeys.1	2010-11-23 20:57:58 UTC (rev 481)
@@ -1,5 +1,5 @@
 .\"
-.TH GPG-MAILKEYS 1 "June 29, 2010"
+.TH GPG-MAILKEYS 1 "Nov 23, 2010"
 .SH NAME
 .B gpg\-mailkeys
 \- sends emails containing keys to their owners
@@ -31,6 +31,11 @@
 .TP 13
 .I TEXT
 Set the body text of the messages
+.TP 13
+.I SENDMAIL_ARGS
+Set arguments to pass to /usr/sbin/sendmail. This can be useful to set
+credentials in order to authenticate to an smtp server when using ssmtp
+for example.
 
 .SH FILES
 The behavior of