Hello community, here is the log from the commit of package msmtp for openSUSE:Factory checked in at 2015-05-26 12:35:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msmtp (Old) and /work/SRC/openSUSE:Factory/.msmtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "msmtp" Changes: -------- --- /work/SRC/openSUSE:Factory/msmtp/msmtp.changes 2015-01-15 15:58:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.msmtp.new/msmtp.changes 2015-05-26 12:35:37.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 24 19:10:07 UTC 2015 - [email protected] + +- update to version 1.6.2: + * A bug was fixed that prevented consecutive Bcc headers from + being removed properly. +- add tarball signature and keyring + +------------------------------------------------------------------- Old: ---- msmtp-1.6.1.tar.xz New: ---- msmtp-1.6.2.tar.xz msmtp-1.6.2.tar.xz.sig msmtp.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msmtp.spec ++++++ --- /var/tmp/diff_new_pack.IC0cvV/_old 2015-05-26 12:35:37.000000000 +0200 +++ /var/tmp/diff_new_pack.IC0cvV/_new 2015-05-26 12:35:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package msmtp # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_with gnome_keyring Name: msmtp -Version: 1.6.1 +Version: 1.6.2 Release: 0 BuildRequires: libidn-devel BuildRequires: openssl-devel @@ -59,6 +59,8 @@ Group: Productivity/Networking/Email/Utilities Url: http://msmtp.sourceforge.net/ Source: http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.xz +Source1: http://prdownloads.sourceforge.net/msmtp/msmtp-%{version}.tar.xz.sig +Source2: %{name}.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ msmtp-1.6.1.tar.xz -> msmtp-1.6.2.tar.xz ++++++ ++++ 2279 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/ChangeLog new/msmtp-1.6.2/ChangeLog --- old/msmtp-1.6.1/ChangeLog 2015-01-05 08:56:05.000000000 +0100 +++ new/msmtp-1.6.2/ChangeLog 2015-04-24 19:12:55.000000000 +0200 @@ -1,3 +1,52 @@ +commit 164d1d0a27c888c4424e79862ae72da06b946606 +Author: Martin Lambers <[email protected]> +Date: 2015-04-24 19:11:59 +0200 + + Bump version to 1.6.2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed638d3fa37a7985c1186bb70e38aa7c5fe2c4dd +Author: Martin Lambers <[email protected]> +Date: 2015-04-24 19:11:52 +0200 + + Update NEWS + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 38bc299a2400b8cdfc2bfb1b83e4458ba58c127a +Author: Martin Küttler <[email protected]> +Date: 2015-04-24 10:54:45 +0200 + + Fix removal of multiple consecutive Bcc headers. + + Previously, only every second of multiple consecutive Bcc headers was removed. + + src/smtp.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +commit 0f794b730a178b6ea7899b9f1484b8ae13f64e77 +Author: Chris Gianniotis <[email protected]> +Date: 2015-03-12 15:59:19 +0100 + + Update msmtpq scripts. + + scripts/msmtpq/README.msmtpq | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- + scripts/msmtpq/msmtp-queue | 2 +- + scripts/msmtpq/msmtpq | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- + 3 files changed, 135 insertions(+), 55 deletions(-) + +commit f52acb765262b05e4b1c9639ff08f4265cb71e3e +Author: Martin Lambers <[email protected]> +Date: 2015-01-06 20:59:26 +0100 + + Fix --version output for IDN without libidn + + src/msmtp.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + commit 0f7fc8cb83bd5e7a11443104c9b5c873ae00487f Author: Martin Lambers <[email protected]> Date: 2015-01-05 08:55:32 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/NEWS new/msmtp-1.6.2/NEWS --- old/msmtp-1.6.1/NEWS 2015-01-05 08:55:15.000000000 +0100 +++ new/msmtp-1.6.2/NEWS 2015-04-24 19:10:07.000000000 +0200 @@ -1,3 +1,7 @@ +Version 1.6.2: +- A bug was fixed that prevented consecutive Bcc headers from being removed + properly. + Version 1.6.1: - The new configure option --with-tls replaces --with-ssl. - A new configure option --disable-gai-idn was added. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/configure.ac new/msmtp-1.6.2/configure.ac --- old/msmtp-1.6.1/configure.ac 2015-01-04 12:21:29.000000000 +0100 +++ new/msmtp-1.6.2/configure.ac 2015-04-24 19:10:33.000000000 +0200 @@ -24,7 +24,7 @@ # dnl Autotools init stuff -AC_INIT([msmtp], [1.6.1], [[email protected]], [msmtp], [http://msmtp.sourceforge.net/]) +AC_INIT([msmtp], [1.6.2], [[email protected]], [msmtp], [http://msmtp.sourceforge.net/]) AC_CONFIG_SRCDIR([src/msmtp.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/doc/msmtp.info new/msmtp-1.6.2/doc/msmtp.info --- old/msmtp-1.6.1/doc/msmtp.info 2015-01-04 12:22:11.000000000 +0100 +++ new/msmtp-1.6.2/doc/msmtp.info 2015-04-24 19:12:49.000000000 +0200 @@ -1,6 +1,6 @@ This is msmtp.info, produced by makeinfo version 5.2 from msmtp.texi. -This manual was last updated 30 December 2014 for version 1.6.1 of +This manual was last updated 30 December 2014 for version 1.6.2 of msmtp. Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, @@ -22,7 +22,7 @@ msmtp ***** -This manual was last updated 30 December 2014 for version 1.6.1 of +This manual was last updated 30 December 2014 for version 1.6.2 of msmtp. Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/doc/stamp-vti new/msmtp-1.6.2/doc/stamp-vti --- old/msmtp-1.6.1/doc/stamp-vti 2015-01-04 12:22:10.000000000 +0100 +++ new/msmtp-1.6.2/doc/stamp-vti 2015-04-24 19:12:47.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 30 December 2014 @set UPDATED-MONTH December 2014 -@set EDITION 1.6.1 -@set VERSION 1.6.1 +@set EDITION 1.6.2 +@set VERSION 1.6.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/doc/version.texi new/msmtp-1.6.2/doc/version.texi --- old/msmtp-1.6.1/doc/version.texi 2015-01-04 12:22:10.000000000 +0100 +++ new/msmtp-1.6.2/doc/version.texi 2015-04-24 19:12:47.000000000 +0200 @@ -1,4 +1,4 @@ @set UPDATED 30 December 2014 @set UPDATED-MONTH December 2014 -@set EDITION 1.6.1 -@set VERSION 1.6.1 +@set EDITION 1.6.2 +@set VERSION 1.6.2 Files old/msmtp-1.6.1/po/de.gmo and new/msmtp-1.6.2/po/de.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/po/de.po new/msmtp-1.6.2/po/de.po --- old/msmtp-1.6.1/po/de.po 2015-01-05 08:56:04.000000000 +0100 +++ new/msmtp-1.6.2/po/de.po 2015-04-24 19:12:55.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: msmtp 1.4.31\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2015-01-05 08:56+0100\n" +"POT-Creation-Date: 2015-04-24 19:12+0200\n" "PO-Revision-Date: 2013-04-22 19:10+0200\n" "Last-Translator: Martin Lambers <[email protected]>\n" "Language-Team: German\n" @@ -299,7 +299,7 @@ "Dieser Server könnte mehr oder andere Leistungsmerkmale angeben\n" " wenn TLS Verschlüsselung aktiviert ist.\n" -#: src/msmtp.c:1545 src/msmtp.c:3364 +#: src/msmtp.c:1545 src/msmtp.c:3366 #, c-format msgid "cannot write mail headers to temporary file: output error" msgstr "kann Mail Kopfzeilen nicht in temporäre Datei schreiben: Ausgabefehler" @@ -314,7 +314,7 @@ msgid "the server does not support DSN" msgstr "der Server unterstützt kein DSN" -#: src/msmtp.c:2139 src/msmtp.c:4111 src/tls.c:113 +#: src/msmtp.c:2139 src/msmtp.c:4113 src/tls.c:113 #, c-format msgid "cannot get system time: %s" msgstr "kann Systemzeit nicht feststellen: %s" @@ -367,7 +367,7 @@ msgid "TLS/SSL library: %s\n" msgstr "TLS/SSL Programmbibliothek: %s\n" -#: src/msmtp.c:2314 src/msmtp.c:2378 +#: src/msmtp.c:2314 src/msmtp.c:2380 #, c-format msgid "none" msgstr "keine" @@ -390,52 +390,52 @@ msgid "IDN support: " msgstr "IDN Unterstützung: " -#: src/msmtp.c:2362 src/msmtp.c:2370 +#: src/msmtp.c:2364 src/msmtp.c:2372 #, c-format msgid "enabled" msgstr "aktiviert" -#: src/msmtp.c:2364 src/msmtp.c:2373 +#: src/msmtp.c:2366 src/msmtp.c:2375 #, c-format msgid "disabled" msgstr "deaktiviert" -#: src/msmtp.c:2368 +#: src/msmtp.c:2370 #, c-format msgid "NLS: " msgstr "NLS: " -#: src/msmtp.c:2371 +#: src/msmtp.c:2373 #, c-format msgid ", LOCALEDIR is %s" msgstr ", LOCALEDIR ist %s" -#: src/msmtp.c:2376 +#: src/msmtp.c:2378 #, c-format msgid "Keyring support: " msgstr "Keyring Unterstützung: " -#: src/msmtp.c:2381 +#: src/msmtp.c:2383 #, c-format msgid "Gnome " msgstr "Gnome " -#: src/msmtp.c:2384 +#: src/msmtp.c:2386 #, c-format msgid "MacOS " msgstr "MacOS " -#: src/msmtp.c:2390 +#: src/msmtp.c:2392 #, c-format msgid "System configuration file name: %s\n" msgstr "Systemweite Konfigurationsdatei: %s\n" -#: src/msmtp.c:2395 +#: src/msmtp.c:2397 #, c-format msgid "User configuration file name: %s\n" msgstr "Benutzerkonfigurationsdatei: %s\n" -#: src/msmtp.c:2399 +#: src/msmtp.c:2401 #, fuzzy, c-format msgid "" "Copyright (C) 2015 Martin Lambers and others.\n" @@ -450,14 +450,14 @@ "der GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n" "Es gibt KEINERLEI GARANTIE, so weit das Gesetz es erlaubt.\n" -#: src/msmtp.c:2416 +#: src/msmtp.c:2418 #, c-format msgid "" "Usage:\n" "\n" msgstr "" -#: src/msmtp.c:2417 +#: src/msmtp.c:2419 #, c-format msgid "" "Sendmail mode (default):\n" @@ -467,7 +467,7 @@ "server.\n" msgstr "" -#: src/msmtp.c:2422 +#: src/msmtp.c:2424 #, c-format msgid "" "Server information mode:\n" @@ -475,7 +475,7 @@ " Print information about a server.\n" msgstr "" -#: src/msmtp.c:2425 +#: src/msmtp.c:2427 #, c-format msgid "" "Remote Message Queue Starting mode:\n" @@ -484,58 +484,58 @@ "\n" msgstr "" -#: src/msmtp.c:2429 +#: src/msmtp.c:2431 #, c-format msgid "General options:\n" msgstr "" -#: src/msmtp.c:2430 +#: src/msmtp.c:2432 #, c-format msgid " --version print version\n" msgstr "" -#: src/msmtp.c:2431 +#: src/msmtp.c:2433 #, c-format msgid " --help print help\n" msgstr "" -#: src/msmtp.c:2432 +#: src/msmtp.c:2434 #, c-format msgid " -P, --pretend print configuration info and exit\n" msgstr "" -#: src/msmtp.c:2433 +#: src/msmtp.c:2435 #, c-format msgid " -d, --debug print debugging information\n" msgstr "" -#: src/msmtp.c:2434 +#: src/msmtp.c:2436 #, c-format msgid "Changing the mode of operation:\n" msgstr "" -#: src/msmtp.c:2435 +#: src/msmtp.c:2437 #, c-format msgid " -S, --serverinfo print information about the server\n" msgstr "" -#: src/msmtp.c:2436 +#: src/msmtp.c:2438 #, c-format msgid "" " --rmqs=host|@domain|#queue send a Remote Message Queue Starting request\n" msgstr "" -#: src/msmtp.c:2437 +#: src/msmtp.c:2439 #, fuzzy, c-format msgid "Configuration options:\n" msgstr "Benutzerkonfigurationsdatei: %s\n" -#: src/msmtp.c:2438 +#: src/msmtp.c:2440 #, c-format msgid " -C, --file=filename set configuration file\n" msgstr "" -#: src/msmtp.c:2439 +#: src/msmtp.c:2441 #, c-format msgid "" " -a, --account=id use the given account instead of the account\n" @@ -544,7 +544,7 @@ " with command-line options\n" msgstr "" -#: src/msmtp.c:2442 +#: src/msmtp.c:2444 #, c-format msgid "" " --host=hostname set the server, use only command-line " @@ -552,432 +552,432 @@ " do not use any configuration file data\n" msgstr "" -#: src/msmtp.c:2444 +#: src/msmtp.c:2446 #, c-format msgid " --port=number set port number\n" msgstr "" -#: src/msmtp.c:2445 +#: src/msmtp.c:2447 #, c-format msgid " --timeout=(off|seconds) set/unset network timeout in seconds\n" msgstr "" -#: src/msmtp.c:2446 +#: src/msmtp.c:2448 #, c-format msgid " --protocol=(smtp|lmtp) use the given sub protocol\n" msgstr "" -#: src/msmtp.c:2447 +#: src/msmtp.c:2449 #, c-format msgid "" " --domain=string set the argument of EHLO or LHLO command\n" msgstr "" -#: src/msmtp.c:2448 +#: src/msmtp.c:2450 #, c-format msgid "" " --auth[=(on|off|method)] enable/disable authentication and optionally\n" " choose the method\n" msgstr "" -#: src/msmtp.c:2450 +#: src/msmtp.c:2452 #, c-format msgid " --user=[username] set/unset user name for authentication\n" msgstr "" -#: src/msmtp.c:2451 +#: src/msmtp.c:2453 #, c-format msgid " --passwordeval=[eval] evaluate password for authentication\n" msgstr "" -#: src/msmtp.c:2452 +#: src/msmtp.c:2454 #, c-format msgid " --tls[=(on|off)] enable/disable TLS encryption\n" msgstr "" -#: src/msmtp.c:2453 +#: src/msmtp.c:2455 #, c-format msgid " --tls-starttls[=(on|off)] enable/disable STARTTLS for TLS\n" msgstr "" -#: src/msmtp.c:2454 +#: src/msmtp.c:2456 #, c-format msgid " --tls-trust-file=[file] set/unset trust file for TLS\n" msgstr "" -#: src/msmtp.c:2455 +#: src/msmtp.c:2457 #, c-format msgid " --tls-crl-file=[file] set/unset revocation file for TLS\n" msgstr "" -#: src/msmtp.c:2456 +#: src/msmtp.c:2458 #, c-format msgid "" " --tls-fingerprint=[f] set/unset trusted certificate fingerprint for " "TLS\n" msgstr "" -#: src/msmtp.c:2457 +#: src/msmtp.c:2459 #, c-format msgid " --tls-key-file=[file] set/unset private key file for TLS\n" msgstr "" -#: src/msmtp.c:2458 +#: src/msmtp.c:2460 #, c-format msgid " --tls-cert-file=[file] set/unset private cert file for TLS\n" msgstr "" -#: src/msmtp.c:2459 +#: src/msmtp.c:2461 #, c-format msgid "" " --tls-certcheck[=(on|off)] enable/disable server certificate checks for " "TLS\n" msgstr "" -#: src/msmtp.c:2460 +#: src/msmtp.c:2462 #, c-format msgid " --tls-min-dh-prime-bits=[b] set/unset minimum bit size of DH prime\n" msgstr "" -#: src/msmtp.c:2461 +#: src/msmtp.c:2463 #, c-format msgid " --tls-priorities=[prios] set/unset TLS priorities.\n" msgstr "" -#: src/msmtp.c:2462 +#: src/msmtp.c:2464 #, c-format msgid "Options specific to sendmail mode:\n" msgstr "" -#: src/msmtp.c:2463 +#: src/msmtp.c:2465 #, c-format msgid "" " --auto-from[=(on|off)] enable/disable automatic envelope-from " "addresses\n" msgstr "" -#: src/msmtp.c:2464 +#: src/msmtp.c:2466 #, c-format msgid " -f, --from=address set envelope from address\n" msgstr "" -#: src/msmtp.c:2465 +#: src/msmtp.c:2467 #, c-format msgid "" " --maildomain=[domain] set the domain for automatic envelope from\n" " addresses\n" msgstr "" -#: src/msmtp.c:2467 +#: src/msmtp.c:2469 #, c-format msgid " -N, --dsn-notify=(off|cond) set/unset DSN conditions\n" msgstr "" -#: src/msmtp.c:2468 +#: src/msmtp.c:2470 #, c-format msgid " -R, --dsn-return=(off|ret) set/unset DSN amount\n" msgstr "" -#: src/msmtp.c:2469 +#: src/msmtp.c:2471 #, c-format msgid " -X, --logfile=[file] set/unset log file\n" msgstr "" -#: src/msmtp.c:2470 +#: src/msmtp.c:2472 #, c-format msgid "" " --syslog[=(on|off|facility)] enable/disable/configure syslog logging\n" msgstr "" -#: src/msmtp.c:2471 +#: src/msmtp.c:2473 #, c-format msgid "" " -t, --read-recipients read additional recipients from the mail\n" msgstr "" -#: src/msmtp.c:2472 +#: src/msmtp.c:2474 #, c-format msgid "" " --read-envelope-from read envelope from address from the mail\n" msgstr "" -#: src/msmtp.c:2473 +#: src/msmtp.c:2475 #, c-format msgid " --aliases=[file] set/unset aliases file\n" msgstr "" -#: src/msmtp.c:2474 +#: src/msmtp.c:2476 #, c-format msgid " --proxy-host=[IP|hostname] set/unset proxy\n" msgstr "" -#: src/msmtp.c:2475 +#: src/msmtp.c:2477 #, c-format msgid " --proxy-port=[number] set/unset proxy port\n" msgstr "" -#: src/msmtp.c:2476 +#: src/msmtp.c:2478 #, c-format msgid "" " --add-missing-from-header[=(on|off)] enable/disable addition of From " "header\n" msgstr "" -#: src/msmtp.c:2477 +#: src/msmtp.c:2479 #, c-format msgid "" " --add-missing-date-header[=(on|off)] enable/disable addition of Date " "header\n" msgstr "" -#: src/msmtp.c:2478 +#: src/msmtp.c:2480 #, c-format msgid "" " --remove-bcc-headers[=(on|off)] enable/disable removal of Bcc headers\n" msgstr "" -#: src/msmtp.c:2479 +#: src/msmtp.c:2481 #, c-format msgid " -- end of options\n" msgstr "" -#: src/msmtp.c:2480 +#: src/msmtp.c:2482 #, c-format msgid "" "Accepted but ignored: -A, -B, -bm, -F, -G, -h, -i, -L, -m, -n, -O, -o, -v\n" msgstr "" -#: src/msmtp.c:2481 +#: src/msmtp.c:2483 #, c-format msgid "" "\n" "Report bugs to <%s>.\n" msgstr "" -#: src/msmtp.c:2691 src/msmtp.c:2705 +#: src/msmtp.c:2693 src/msmtp.c:2707 msgid "cannot use both --serverinfo and --rmqs" msgstr "kann nicht gleichzeitig --serverinfo und --rmqs benutzen" -#: src/msmtp.c:2725 src/msmtp.c:2737 +#: src/msmtp.c:2727 src/msmtp.c:2739 msgid "cannot use both --host and --account" msgstr "kann nicht gleichzeitig --host und --account benutzen" -#: src/msmtp.c:2753 src/msmtp.c:2771 src/msmtp.c:2790 src/msmtp.c:2845 -#: src/msmtp.c:2877 src/msmtp.c:2895 src/msmtp.c:2950 src/msmtp.c:2995 -#: src/msmtp.c:3017 src/msmtp.c:3050 src/msmtp.c:3075 src/msmtp.c:3094 -#: src/msmtp.c:3134 src/msmtp.c:3179 src/msmtp.c:3202 src/msmtp.c:3220 -#: src/msmtp.c:3238 src/msmtp.c:3289 +#: src/msmtp.c:2755 src/msmtp.c:2773 src/msmtp.c:2792 src/msmtp.c:2847 +#: src/msmtp.c:2879 src/msmtp.c:2897 src/msmtp.c:2952 src/msmtp.c:2997 +#: src/msmtp.c:3019 src/msmtp.c:3052 src/msmtp.c:3077 src/msmtp.c:3096 +#: src/msmtp.c:3136 src/msmtp.c:3181 src/msmtp.c:3204 src/msmtp.c:3222 +#: src/msmtp.c:3240 src/msmtp.c:3291 #, c-format msgid "invalid argument %s for %s" msgstr "ungültiges Argument %s für %s" -#: src/msmtp.c:2800 src/msmtp.c:3252 +#: src/msmtp.c:2802 src/msmtp.c:3254 msgid "cannot use both --from and --read-envelope-from" msgstr "kann nicht gleichzeitig --from und --read-envelope-from benutzen" -#: src/msmtp.c:3267 +#: src/msmtp.c:3269 #, c-format msgid "unsupported operation mode b%s" msgstr "Operationsmodus b%s nicht unterstützt" -#: src/msmtp.c:3341 src/msmtp.c:3788 src/msmtp.c:4087 +#: src/msmtp.c:3343 src/msmtp.c:3790 src/msmtp.c:4089 #, c-format msgid "cannot create temporary file: %s" msgstr "kann keine temporäre Datei erzeugen: %s" -#: src/msmtp.c:3371 src/msmtp.c:3813 src/msmtp.c:4121 +#: src/msmtp.c:3373 src/msmtp.c:3815 src/msmtp.c:4123 #, c-format msgid "cannot rewind temporary file: %s" msgstr "kann temporäre Datei nicht zurückspulen: %s" -#: src/msmtp.c:3436 +#: src/msmtp.c:3438 #, c-format msgid "ignoring system configuration file %s: %s\n" msgstr "ignoriere systemweite Konfigurationsdatei %s: %s\n" -#: src/msmtp.c:3451 +#: src/msmtp.c:3453 #, c-format msgid "loaded system configuration file %s\n" msgstr "systemweite Konfigurationsdatei %s geladen\n" -#: src/msmtp.c:3492 +#: src/msmtp.c:3494 #, c-format msgid "ignoring user configuration file %s: %s\n" msgstr "ignoriere Benutzerkonfigurationsdatei %s: %s\n" -#: src/msmtp.c:3507 +#: src/msmtp.c:3509 #, c-format msgid "loaded user configuration file %s\n" msgstr "Benutzerkonfigurationsdatei %s geladen\n" -#: src/msmtp.c:3564 +#: src/msmtp.c:3566 #, c-format msgid "using account %s from %s\n" msgstr "benutze Account %s aus %s\n" -#: src/msmtp.c:3570 src/msmtp.c:3605 src/msmtp.c:3606 src/msmtp.c:3608 -#: src/msmtp.c:3610 src/msmtp.c:3614 src/msmtp.c:3616 src/msmtp.c:3629 -#: src/msmtp.c:3631 src/msmtp.c:3633 src/msmtp.c:3643 src/msmtp.c:3646 -#: src/msmtp.c:3651 src/msmtp.c:3654 src/msmtp.c:3662 src/msmtp.c:3664 -#: src/msmtp.c:3666 src/msmtp.c:3668 src/msmtp.c:3670 +#: src/msmtp.c:3572 src/msmtp.c:3607 src/msmtp.c:3608 src/msmtp.c:3610 +#: src/msmtp.c:3612 src/msmtp.c:3616 src/msmtp.c:3618 src/msmtp.c:3631 +#: src/msmtp.c:3633 src/msmtp.c:3635 src/msmtp.c:3645 src/msmtp.c:3648 +#: src/msmtp.c:3653 src/msmtp.c:3656 src/msmtp.c:3664 src/msmtp.c:3666 +#: src/msmtp.c:3668 src/msmtp.c:3670 src/msmtp.c:3672 msgid "(not set)" msgstr "(nicht gesetzt)" -#: src/msmtp.c:3575 +#: src/msmtp.c:3577 #, c-format msgid "off\n" msgstr "aus\n" -#: src/msmtp.c:3581 +#: src/msmtp.c:3583 #, c-format msgid "%d seconds\n" msgstr "%d Sekunden\n" -#: src/msmtp.c:3585 +#: src/msmtp.c:3587 #, c-format msgid "1 second\n" msgstr "1 Sekunde\n" -#: src/msmtp.c:3594 +#: src/msmtp.c:3596 #, c-format msgid "none\n" msgstr "keine\n" -#: src/msmtp.c:3598 +#: src/msmtp.c:3600 #, c-format msgid "choose\n" msgstr "automatisch\n" -#: src/msmtp.c:3611 src/msmtp.c:3612 src/msmtp.c:3635 src/msmtp.c:3649 -#: src/msmtp.c:3656 src/msmtp.c:3658 src/msmtp.c:3660 +#: src/msmtp.c:3613 src/msmtp.c:3614 src/msmtp.c:3637 src/msmtp.c:3651 +#: src/msmtp.c:3658 src/msmtp.c:3660 src/msmtp.c:3662 msgid "on" msgstr "an" -#: src/msmtp.c:3611 src/msmtp.c:3612 src/msmtp.c:3635 src/msmtp.c:3649 -#: src/msmtp.c:3656 src/msmtp.c:3658 src/msmtp.c:3660 +#: src/msmtp.c:3613 src/msmtp.c:3614 src/msmtp.c:3637 src/msmtp.c:3651 +#: src/msmtp.c:3658 src/msmtp.c:3660 src/msmtp.c:3662 msgid "off" msgstr "aus" -#: src/msmtp.c:3654 +#: src/msmtp.c:3656 msgid "(read from mail)" msgstr "(extrahiere aus Mail)" -#: src/msmtp.c:3673 +#: src/msmtp.c:3675 #, c-format msgid "reading recipients from the command line and the mail\n" msgstr "extrahiere Empfängerliste aus Kommandozeile und Mail\n" -#: src/msmtp.c:3678 +#: src/msmtp.c:3680 #, c-format msgid "reading recipients from the command line\n" msgstr "extrahiere Empfängerliste aus Kommandozeile\n" -#: src/msmtp.c:3778 +#: src/msmtp.c:3780 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/msmtp.c:3807 +#: src/msmtp.c:3809 #, c-format msgid "envelope from address extracted from mail: %s\n" msgstr "Umschlagabsenderadresse aus Mail extrahiert: %s\n" -#: src/msmtp.c:3822 +#: src/msmtp.c:3824 msgid "no recipients found" msgstr "keine Empfänger gefunden" -#: src/msmtp.c:3852 +#: src/msmtp.c:3854 #, c-format msgid "account chosen by envelope from address %s: %s\n" msgstr "Account ausgewählt durch Umschlagabsenderadresse %s: %s\n" -#: src/msmtp.c:3866 +#: src/msmtp.c:3868 #, c-format msgid "falling back to default account\n" msgstr "benutze den Account default\n" -#: src/msmtp.c:3889 +#: src/msmtp.c:3891 #, c-format msgid "using environment variables EMAIL and SMTPSERVER\n" msgstr "benutze Umgebungsvariablen EMAIL und SMTPSERVER\n" -#: src/msmtp.c:3897 +#: src/msmtp.c:3899 #, c-format msgid "account %s not found in %s and %s" msgstr "Account %s nicht in %s und %s gefunden" -#: src/msmtp.c:3903 src/msmtp.c:3908 +#: src/msmtp.c:3905 src/msmtp.c:3910 #, c-format msgid "account %s not found in %s" msgstr "Account %s nicht in %s gefunden" -#: src/msmtp.c:3913 +#: src/msmtp.c:3915 #, c-format msgid "account %s not found: no configuration file available" msgstr "Account %s nicht gefunden: Keine Konfigurationsdatei verfügbar" -#: src/msmtp.c:3928 +#: src/msmtp.c:3930 #, c-format msgid "using account specified on command line\n" msgstr "benutze den Account von der Kommandozeile\n" -#: src/msmtp.c:3997 +#: src/msmtp.c:3999 #, c-format msgid "account %s from %s: %s" msgstr "Account %s aus %s: %s" -#: src/msmtp.c:4038 +#: src/msmtp.c:4040 msgid "this platform does not support syslog logging" msgstr "diese Plattform unterstützt Syslog nicht" -#: src/msmtp.c:4047 +#: src/msmtp.c:4049 #, c-format msgid "support for authentication method %s is not compiled in" msgstr "" "Unterstützung für Authentifizierungsmethode %s ist nicht einkompiliert worden" -#: src/msmtp.c:4055 +#: src/msmtp.c:4057 #, c-format msgid "cannot initialize networking: %s" msgstr "kann Netzwerkprogrammbibliothek nicht initialisieren: %s" -#: src/msmtp.c:4066 +#: src/msmtp.c:4068 #, c-format msgid "cannot initialize TLS library: %s" msgstr "kann TLS Programmbibliothek nicht initialisieren: %s" -#: src/msmtp.c:4073 +#: src/msmtp.c:4075 msgid "support for TLS is not compiled in" msgstr "Unterstützung für TLS ist nicht einkompiliert worden" -#: src/msmtp.c:4149 +#: src/msmtp.c:4151 #, c-format msgid "LMTP server message: %s" msgstr "Nachricht des LMTP Servers: %s" -#: src/msmtp.c:4160 +#: src/msmtp.c:4162 #, c-format msgid "could not send mail to all recipients (account %s from %s)" msgstr "konnte Mail nicht an alle Empfänger schicken (Account %s aus %s)" -#: src/msmtp.c:4166 +#: src/msmtp.c:4168 msgid "could not send mail to all recipients" msgstr "konnte Mail nicht an alle Empfänger schicken" -#: src/msmtp.c:4181 src/msmtp.c:4236 src/msmtp.c:4257 +#: src/msmtp.c:4183 src/msmtp.c:4238 src/msmtp.c:4259 #, c-format msgid "server message: %s" msgstr "Nachricht des Servers: %s" -#: src/msmtp.c:4187 +#: src/msmtp.c:4189 #, c-format msgid "could not send mail (account %s from %s)" msgstr "konnte Mail nicht verschicken (Account %s aus %s)" -#: src/msmtp.c:4192 +#: src/msmtp.c:4194 msgid "could not send mail" msgstr "konnte Mail nicht verschicken" -#: src/msmtp.c:4202 +#: src/msmtp.c:4204 #, c-format msgid "delivery to one or more recipients failed" msgstr "Zustellung an einen oder mehrere Empfänger fehlgeschlagen" @@ -1217,7 +1217,7 @@ msgstr "der SMTP Server unterstützt weder EHLO noch HELO" #: src/smtp.c:437 src/smtp.c:579 src/smtp.c:584 src/smtp.c:657 src/smtp.c:705 -#: src/smtp.c:795 src/smtp.c:886 src/smtp.c:1863 +#: src/smtp.c:795 src/smtp.c:886 src/smtp.c:1860 #, c-format msgid "command %s failed" msgstr "Kommando %s fehlgeschlagen" @@ -1293,22 +1293,22 @@ msgid "the server does not accept mail data" msgstr "der Server akzeptiert die Maildaten nicht" -#: src/smtp.c:1721 +#: src/smtp.c:1718 #, c-format msgid "the server did not accept the mail" msgstr "der Server hat die Mail nicht akzeptiert" -#: src/smtp.c:1785 +#: src/smtp.c:1782 #, c-format msgid "the server refuses to send the mail to %s" msgstr "der Server weigert sich, die Mail an %s zu schicken" -#: src/smtp.c:1849 +#: src/smtp.c:1846 #, c-format msgid "the server is unable to fulfill the request" msgstr "der Server kann die Anforderung nicht erfüllen" -#: src/smtp.c:1857 +#: src/smtp.c:1854 #, c-format msgid "invalid argument for Remote Message Queue Starting" msgstr "ungültiges Argument für Remote Message Queue Starting" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/scripts/msmtpq/README.msmtpq new/msmtp-1.6.2/scripts/msmtpq/README.msmtpq --- old/msmtp-1.6.1/scripts/msmtpq/README.msmtpq 2013-02-14 20:34:02.000000000 +0100 +++ new/msmtp-1.6.2/scripts/msmtpq/README.msmtpq 2014-10-25 00:14:50.000000000 +0200 @@ -1,7 +1,7 @@ -msmtpq is a modification of the scripts comprising Martin Lambers' +msmtpq is a modification of the scripts comprising part of Martin Lambers' msmtpqueue package ; it attempts be useful to msmtp by holding mail sent -by an MUA when a machine, e.g. a laptop, is not connected to the net ; +by an MUA when a system, e.g. a laptop, is not connected to the net ; queued mails are held as files in a user defined and created queue directory ; when the machine is connected all mail can be sent directly out ; the msmtpq package does queue handling for msmtp according to the @@ -44,7 +44,7 @@ 'set sendmail = /path/to/msmtpq' -set, also +set, also, 'set sendmail_wait = -1' @@ -58,7 +58,7 @@ all config is done within the msmtpq script set the MSMTP var to point to the location of the msmtp executable - (only if necessary ; if it's not on the path) + (set this only if necessary ; if it's not on the path) set the Q var to point to the location of the queue directory set the LOG var to point to the location of the queue log @@ -72,7 +72,7 @@ the LOG variable should have the desired name & location of the queue log -the locations are clearly marked near the beginnings of the script ; +the locations are clearly marked near the beginning of the script ; modify all to the locations you prefer (the defaults work for me ; you may or may not be happy with them) ... please note that it's preferable to create the queue directory (with 0700 permissions) before using these @@ -95,12 +95,37 @@ to use msmtpq with additional options : +the vars : EMAIL_CONN_NOTEST (to test for a net connection or not + before attempting to send a mail) + + (please note that the above var is deprecated + and will be removed in a future version of msmtpq ; + replace it with EMAIL_CONN_TEST=x + to perform the same function) + + EMAIL_CONN_TEST (which test for net connection to use) + EMAIL_QUEUE_QUIET (suppress unnecessary queue 'chatter') + +see below for their values + +there are two methods of setting options - + + +- set the vars in the msmtpq script (near the top) + + see the script, just beneath the the three setup vars mentioned above + +- set the vars externally to the script + + define the variables as environment vars, set on the command line + invoking msmtp + set sendmail = "/path/to/msmtpq" # normal config for mutt to use the queue # (by default the ping connection test is enabled) -set sendmail = "EMAIL_CONN_NOTEST=t /path/to/msmtpq" - # use queue without a net connection test +set sendmail = "EMAIL_CONN_TEST=x /path/to/msmtpq" + # use queue without a net connection test set sendmail = "EMAIL_CONN_TEST=p /path/to/msmtpq" # use queue with ping connection test (the default) set sendmail = "EMAIL_CONN_TEST=P /path/to/msmtpq" @@ -111,19 +136,30 @@ # (netcat must be installed on user's system) set sendmail = "EMAIL_CONN_TEST=s /path/to/msmtpq" # use queue with sh sockets connection test - # (this does *not* work on Debian systems + # (this does *not* work on Debian systems ; # socket use is not compiled into bash for - # security on multiuser systems - it may not be - # a serious consideration, however, on + # security reasons on multiuser systems - it + # may not be a serious consideration, however, on # single user workstations - e.g. on laptops - # or in embedded systems) set sendmail = "EMAIL_QUEUE_QUIET=t /path/to/msmtpq" # use queue ; suppress messages and 'chatter' - # good, apparently, for use w/emacs + # good, apparently, for use w/emacs MUAs + +set sendmail = "EMAIL_CONN_TEST=? EMAIL_QUEUE_QUIET=t /path/to/msmtpq" + # use queue w/connection test spec & + # suppression of messages and chatter + +externally multiple environmental vars may be used on the command + line, space separated, before the msmtpq invocation ; internally + to the script multiple vars may be set + +note that vars set internally will take precedence over vars set + externally -multiple environmental vars may be used on the command line, -space separated, before the msmtpq invocation +if no option is specified, by either method, the net connection test + is made using the ping test by default in summary : @@ -133,9 +169,10 @@ create the queue dir (0700) if necessary ( mkdir -p /path/to/queue/dir ) ( chmod 0700 /path/to/queue/dir ) - enter or confirm the values of the three config vars in msmtpq + enter or confirm the values of the three config setup vars in msmtpq + enter or confirm the values of the three option vars in msmtpq - if desired for mutt users - - set sendmail="/path/to/msmtpq" ("ANY_ENV_VARS_HERE /path/to/msmtpq") + set sendmail="/path/to/msmtpq" (or "ANY_ENV_VARS_HERE=t /path/to/msmtpq") set sendmail_wait = -1 set use_from=yes set realname="Your Name" @@ -143,9 +180,12 @@ set envelope_from=yes (and perhaps more on the msmtp man page & docs ...) for other MUAs - - set the mta to '/path/to/msmtpq', as above + set the mta to '/path/to/msmtpq', as above and background its execution, if possible +msmtpq is entirely self contained ; beyond keeping an eye on the queue + and queue logs it should require no admin or user attention once set up + log(s) rotation : @@ -172,12 +212,9 @@ That's it. -Usage : ------ - -msmtpq is entirely self contained ; beyond keeping an eye on the queue -and queue logs it should require no admin or user attention once set up +msmtp-queue usage : +----------------- msmtp-queue offers the following options : @@ -201,7 +238,8 @@ I find it useful to have a display of the number of mails currently in the queue in conky ; it uses one shell line (in the .conkyrc script) : -mail queue : ${exec /bin/ls -1 ${HOME}/.msmtp.queue/*.mail 2>/dev/null | /usr/bin/wc -l} +mailq : ${exec /bin/ls -1 ${HOME}/.msmtp.queue/*.mail 2>/dev/null | /usr/bin/wc -l} + With hopes that it's useful, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/scripts/msmtpq/msmtp-queue new/msmtp-1.6.2/scripts/msmtpq/msmtp-queue --- old/msmtp-1.6.1/scripts/msmtpq/msmtp-queue 2012-05-01 17:58:26.000000000 +0200 +++ new/msmtp-1.6.2/scripts/msmtpq/msmtp-queue 2013-07-24 10:42:18.000000000 +0200 @@ -22,7 +22,7 @@ ## all configuration and documentation is in the msmtpq script ## note that for 'special circumstances' -## e.g. embedded systems, etc. +## (e.g. embedded systems, etc.) ## where the msmtpq script itself is not on the path ## change the below line to be ## exec /path/to/msmtpq --q-mgmt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/scripts/msmtpq/msmtpq new/msmtp-1.6.2/scripts/msmtpq/msmtpq --- old/msmtp-1.6.1/scripts/msmtpq/msmtpq 2013-02-14 20:33:59.000000000 +0100 +++ new/msmtp-1.6.2/scripts/msmtpq/msmtpq 2015-02-09 16:07:24.000000000 +0100 @@ -4,7 +4,7 @@ ## ## msmtpq : queue funtions to both use & manage the msmtp queue, ## as it was defined by Martin Lambers -## Copyright (C) 2008, 2009, 2010, 2011 Chris Gianniotis +## Copyright (C) 2008 - 2015 Chris Gianniotis ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -12,17 +12,17 @@ ## your option, any later version. ## ##-------------------------------------------------------------- - +## ## msmtpq is meant to be used by an email client - in 'sendmail' mode ## for this purpose, it is invoked directly as 'msmtpq' ## it is also meant to be used to maintain the msmtp queue -## evoked by the wrapper script 'msmtp-queue' +## when it is evoked by the wrapper script 'msmtp-queue' ## (which calls this script as msmtpq --q-mgmt) - +## ## there is a queue log file, distinct from the msmtp log, ## for all events & operations on the msmtp queue ## that is defined below - +## ## (mutt users, using msmtpq in 'sendmail' mode, ## should make at least the following two settings in their .muttrc ## set sendmail = /path/to/msmtpq @@ -31,25 +31,17 @@ ## please see the msmtp man page and docs for further mutt settings ## and optimisations ## ) - -## msmtpq now uses the following environment variables : -## EMAIL_CONN_NOTEST if set will suppress any testing for a connection -## EMAIL_CONN_TEST if unset or =p will use a ping test (debian.org) for a connection -## if =P will use a fast ping test (8.8.8.8) for a connection -## if =n will use netcat (nc) to test for a connection -## if =s will use bash sockets to test for a connection -## EMAIL_QUEUE_QUIET if set will cause suppression of messages and 'chatter' - +## ## two essential patches by Philipp Hartwig ## 19 Oct 2011 & 27 Oct 2011 - +## ##-------------------------------------------------------------- ## the msmtp queue contains unique filenames of the following form : ## two files for each mail in the queue ## ## creates new unique filenames of the form : ## MLF: ccyy-mm-dd-hh.mm.ss[-x].mail -- mail file -## MSF: ccyy-mm-dd-hh.mm.ss[-x].msmtp -- msmtp command line file +## MSF: ccyy-mm-dd-hh.mm.ss[-x].msmtp -- msmtp commands file ## where x is a consecutive number only appended for uniqueness ## if more than one mail per second is sent ##-------------------------------------------------------------- @@ -58,7 +50,6 @@ dsp() { local L ; for L ; do [ -n "$L" ] && echo " $L" || echo ; done ; } err() { dsp '' "$@" '' ; exit 1 ; } - ## ====================================================================================== ## !!! please define or confirm the following three vars !!! ## !!! before using the msmtpq or msmtp-queue scripts !!! @@ -67,13 +58,14 @@ ## only if necessary (in unusual circumstances - e.g. embedded systems), ## enter the location of the msmtp executable (no quotes !!) ## e.g. ( MSMTP=/path/to/msmtp ) +## and uncomment the test for its existence MSMTP=msmtp #[ -x "$MSMTP" ] || \ # log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit ## ## set the queue var to the location of the msmtp queue directory -## if the queue dir doesn't yet exist, better to create it (0700) -## before using this routine +## if the queue dir doesn't yet exist, create it (0700) +## before using this script ## e.g. ( mkdir msmtp.queue ) ## ( chmod 0700 msmtp.queue ) ## @@ -95,6 +87,31 @@ LOG=~/log/msmtp.queue.log ## ====================================================================================== +## msmtpq can use the following environment variables : +## EMAIL_CONN_NOTEST if set will suppress any testing for a connection +## (the above var is deprecated & will be removed ; use the var below) +## EMAIL_CONN_TEST if =x will suppress any testing for a connection +## if =p or unset will use a ping test (debian.org) for a connection +## if =P will use a fast ping test (8.8.8.8) for a connection +## if =n will use netcat (nc) to test for a connection +## if =s will use bash sockets to test for a connection +## EMAIL_QUEUE_QUIET if set will cause suppression of messages and 'chatter' +## (perhaps useful for some of the emacs mail clients) +## +## ====================================================================================== +## !!! define or confirm the following vars if you wish to set !!! +## !!! these properties here in the script - the same properties !!! +## !!! may be set externally, by means of environment variables !!! +## !!! note the internal variables, if set, will take precedence !!! +## !!! over properties set via environment variables !!! +## ====================================================================================== +## +#EMAIL_CONN_NOTEST=y # deprecated ; use below var +#EMAIL_CONN_TEST={x| |p|P|n|s} # see settings above for EMAIL_CONN_TEST +EMAIL_CONN_TEST=n +#EMAIL_QUEUE_QUIET=t +## ====================================================================================== + umask 077 # set secure permissions on created directories and files declare -i CNT # a count of mail(s) currently in the queue @@ -105,19 +122,21 @@ # trap "rm -f \"\$TMPFILE\"; [[ $sig == EXIT ]] || kill -$sig $$" $sig #done trap on_exit INT TERM EXIT # run 'on_exit' on exit -on_exit() { - [ -n "$LKD" ] && lock_queue -u 2>/dev/null # unlock the queue on exit if the lock was set here +on_exit() { # unlock the queue on exit if the lock was set here + [ -n "$LKD" ] && lock_queue -u 2>/dev/null } # -## ----------------------------------- common functions +## ----------------------------------- functions common to both modes +## ----------------------------------- (msmtpq & msmtp-queue) # ## make an entry to the queue log file, possibly an error -## (log queue changes only ; not interactive chatter) +## (log queue changes only ; not interactive chatter) ## usage : log [ -e errcode ] msg [ msg ... ] ## opts : -e <exit code> an error ; log msg & terminate w/prejudice ## display msg to user, as well +## log() { local ARG RC PFX="$('date' +'%Y %d %b %H:%M:%S')" # time stamp prefix - "2008 13 Mar 03:59:45 " @@ -144,6 +163,7 @@ } ## write/remove queue lockfile for a queue op +## lock_queue() { # <-- '-u' to remove lockfile local LOK="${Q}/.lock" # lock file name local -i MAX=240 SEC=0 # max seconds to gain a lock ; seconds waiting @@ -170,28 +190,35 @@ ## test whether system is connected ## returns t/f (0/1) +## connect_test() { if [ -z "$EMAIL_CONN_TEST" ] || \ [ "$EMAIL_CONN_TEST" = 'p' ] ; then # use ping test (default) # verify net connection - ping ip address of debian.org # would ping -qnc2 -w4 be better ? # would ping -qnc1 -w10 or -w20 be better ? - ping -qnc1 -w4 debian.org >/dev/null 2>&1 || return 1 + #ping -qnc1 -w4 debian.org >/dev/null 2>&1 || return 1 + ping -qnc2 -w10 debian.org >/dev/null 2>&1 || return 1 + elif [ "$EMAIL_CONN_TEST" = 'P' ] ; then # use quicker ping test # I personally think that including a DNS lookup # is a better connection test but some # have found the above test too slow ping -qnc1 -w4 8.8.8.8 >/dev/null 2>&1 || return 1 + elif [ "$EMAIL_CONN_TEST" = 'n' ] ; then # use netcat (nc) test # must, of course, have netcat (nc) installed which nc >/dev/null 2>&1 || \ log -e 1 "msmtpq : can't find netcat executable [ nc ]" # if not found - complain ; quit - 'nc' -vz www.debian.org 80 || return 1 + 'nc' -vz www.debian.org 80 >/dev/null 2>&1 || return 1 + elif [ "$EMAIL_CONN_TEST" = 's' ] ; then # use sh sockets test # note that this does not work on debian systems - # where bash opened sockets are suppressed for security reasons - # this should be ok for single user systems (including embedded systems) - # test whether this is supported on your system before using + # where bash opened sockets are suppressed for security + # reasons on multiuser systems - however, this should be + # ok for single user systems (including embedded systems) + # test whether this is supported on your system before using... + # thank you to Brian Goose, on the list, for encouraging this exec 3<>/dev/udp/debian.org/80 || return 1 # open socket on site ; use dns exec 3<&- ; exec 3>&- # close socket fi @@ -204,6 +231,7 @@ # ## show queue maintenance functions +## usage() { # <-- error msg dsp ''\ 'usage : msmtp-queue functions' ''\ @@ -219,6 +247,7 @@ } ## get user [y/n] acknowledgement +## ok() { local R YN='Y/n' # default to yes @@ -239,14 +268,18 @@ } ## send a queued mail out via msmtp +## send_queued_mail() { # <-- mail id local FQP="${Q}/${1}" # fully qualified path name local -i RC=0 # for msmtp exit code if [ -f "${FQP}.msmtp" ] ; then # corresponding .msmtp file found - [ -z "$EMAIL_CONN_NOTEST" ] && { # connection test - connect_test || \ + [ "$EMAIL_CONN_TEST" != 'x' ] && \ + [ -z "$EMAIL_CONN_NOTEST" ] && { # do connection test + connect_test || { log "mail [ $2 ] [ $1 ] from queue ; couldn't be sent - host not connected" + return + } } if $MSMTP $(< "${FQP}.msmtp") < "${FQP}.mail" ; then # this mail goes out the door @@ -266,6 +299,7 @@ } ## run (flush) queue +## run_queue() { # <- 'sm' mode # run queue local M LST="$('ls' $Q/*.mail 2>/dev/null)" # list of mails in queue local -i NDX=0 @@ -282,6 +316,7 @@ } ## display queue contents +## display_queue() { # <-- { 'purge' | 'send' } (op label) ; { 'rec' } (record array of mail ids) local M ID LST="$('ls' ${Q}/*.mail 2>/dev/null)" # list of mail ids in queue @@ -304,6 +339,7 @@ } ## delete all mail in queue, after confirmation +## purge_queue() { display_queue 'purge' # show queue contents if ok -n 'remove (purge) all mail from the queue' ; then @@ -318,6 +354,7 @@ ## select a single mail from queue ; delete it or send it ## select by mail index (position in queue) or mail id +## select_mail() { # <-- < 'purge' | 'send' > local OK ID # mail id local -i I NDX # mail index (position in queue) @@ -403,6 +440,7 @@ ## ('sendmail' mode only) ## make base filename id for queue +## make_id() { local -i INC # increment counter for (possible) base fqp name collision @@ -421,6 +459,7 @@ ## ('sendmail' mode only) ## enqueue a mail +## enqueue_mail() { # <-- all mail args ; mail text via TMP if echo "$@" > "${FQP}.msmtp" ; then # write msmtp command line to queue .msmtp file log "enqueued mail as : [ $ID ] ( $* ) : successful" # (queue .mail file is already there) @@ -432,12 +471,15 @@ ## ('sendmail' mode only) ## send a mail (if possible, otherwise enqueue it) -## if send is successful, msmtp will also log it (if enabled in ~/.msmtprc) +## if send is successful, msmtp will also log it (if logging enabled in ~/.msmtprc) +## send_mail() { # <-- all mail args ; mail text via TMP - [ -z "$EMAIL_CONN_NOTEST" ] && { # connection test + [ "$EMAIL_CONN_TEST" != 'x' ] && \ + [ -z "$EMAIL_CONN_NOTEST" ] && { # do connection test connect_test || { log "mail for [ $* ] : couldn't be sent - host not connected" enqueue_mail "$@" # enqueue the mail + return } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/src/msmtp.c new/msmtp-1.6.2/src/msmtp.c --- old/msmtp-1.6.1/src/msmtp.c 2015-01-04 12:21:51.000000000 +0100 +++ new/msmtp-1.6.2/src/msmtp.c 2015-01-06 20:46:38.000000000 +0100 @@ -2358,7 +2358,9 @@ printf("\n"); /* Internationalized Domain Names support */ printf(_("IDN support: ")); -#ifdef HAVE_LIBIDN +#if defined(HAVE_LIBIDN) \ + || (defined(HAVE_GAI_IDN) && (!defined(HAVE_TLS) \ + || (defined(HAVE_LIBGNUTLS) && GNUTLS_VERSION_NUMBER >= 0x030400))) printf(_("enabled")); #else printf(_("disabled")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/msmtp-1.6.1/src/smtp.c new/msmtp-1.6.2/src/smtp.c --- old/msmtp-1.6.1/src/smtp.c 2014-12-11 13:27:07.000000000 +0100 +++ new/msmtp-1.6.2/src/smtp.c 2015-04-24 19:07:59.000000000 +0200 @@ -1632,16 +1632,13 @@ { if (line_starts) { - if (!in_bcc) + if (strncasecmp(buffer, "Bcc:", 4) == 0) { - if (strncasecmp(buffer, "Bcc:", 4) == 0) - { - in_bcc = 1; - /* remove Bcc header by ignoring this line */ - continue; - } + in_bcc = 1; + /* remove Bcc header by ignoring this line */ + continue; } - else + else if (in_bcc) { /* continued header lines begin with "horizontal * whitespace" (RFC 2822, section 2.2.3) */
