Hello community, here is the log from the commit of package msmtp for openSUSE:Factory checked in at 2016-11-15 18:02:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-06-02 09:40:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.msmtp.new/msmtp.changes 2016-11-15 18:02:07.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 14 22:09:00 UTC 2016 - benoit.mo...@gmx.fr + +- update to version 1.6.6: + * This version fixes a memory leak and a double-free in + msmtp_read_headers(). The double-free was triggered by read + errors. +- remove reference to msmtp-fix-newopenssl.patch: + this patch was removed 5 years ago. + +------------------------------------------------------------------- Old: ---- msmtp-1.6.5.tar.xz msmtp-1.6.5.tar.xz.sig New: ---- msmtp-1.6.6.tar.xz msmtp-1.6.6.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msmtp.spec ++++++ --- /var/tmp/diff_new_pack.5D4GOj/_old 2016-11-15 18:02:08.000000000 +0100 +++ /var/tmp/diff_new_pack.5D4GOj/_new 2016-11-15 18:02:08.000000000 +0100 @@ -19,7 +19,7 @@ %bcond_with gnome_keyring Name: msmtp -Version: 1.6.5 +Version: 1.6.6 Release: 0 BuildRequires: libidn-devel BuildRequires: openssl-devel @@ -54,7 +54,6 @@ Requires(post): /sbin/install-info Requires(preun):/sbin/install-info %endif -#Patch0: msmtp-fix-newopenssl.patch Summary: Lightweight SMTP Client License: GPL-3.0+ Group: Productivity/Networking/Email/Utilities ++++++ msmtp-1.6.5.tar.xz -> msmtp-1.6.6.tar.xz ++++++ ++++ 3076 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.5/ChangeLog new/msmtp-1.6.6/ChangeLog --- old/msmtp-1.6.5/ChangeLog 2016-05-31 20:52:27.000000000 +0200 +++ new/msmtp-1.6.6/ChangeLog 2016-11-14 21:01:10.000000000 +0100 @@ -1,3 +1,47 @@ +commit 2fa66d2b7fd417b024f48addb2dae04324751875 +Author: Martin Lambers <mar...@marlam.de> +Date: 2016-11-14 20:59:18 +0100 + + Bump version to 1.6.6 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e35a417cfd97914ff5b064bdd7980d55e0fd85a7 +Author: Martin Lambers <mar...@marlam.de> +Date: 2016-11-14 20:53:43 +0100 + + Fix cross-build with x86_64-w64-mingw32 + + getservbyname() is available, but winsock2.h needs to be included. + + src/msmtp.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9eb17c779cfc7ee466fd9ff3822b8ddc45a1281d +Author: Martin Lambers <mar...@marlam.de> +Date: 2016-11-11 08:46:41 +0100 + + Include <stdint.h>, for uint16_t in the SOCKS code. + + This is only necessary on platforms lacking <arpa/inet.h>, i.e. Windows, but + does not hurt on other platforms as <arpa/inet.h> includes this anyway. + + src/net.c | 1 + + 1 file changed, 1 insertion(+) + +commit 7f3c8b83fb1d9d495b90034c5b121d6b17810596 +Author: Martin Lambers <mar...@marlam.de> +Date: 2016-09-04 17:21:44 +0200 + + Fix a memory leak and a double-free in msmtp_read_headers(). + + Both problems were reported and analyzed by Felix Janda. Thanks a lot! + The double-free was triggered on read errors, e.g. "msmtp -t < /". + + src/msmtp.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + commit 6c693ffea3dcc1ed6cc3f7a7ae1d5bf349909350 Author: Martin Lambers <mar...@marlam.de> Date: 2016-05-31 20:51:19 +0200 @@ -171,9 +215,9 @@ Update msmtpq scripts. - scripts/msmtpq/README.msmtpq | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- + scripts/msmtpq/README.msmtpq | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- scripts/msmtpq/msmtp-queue | 2 +- - scripts/msmtpq/msmtpq | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------- + scripts/msmtpq/msmtpq | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ 3 files changed, 135 insertions(+), 55 deletions(-) commit f52acb765262b05e4b1c9639ff08f4265cb71e3e @@ -307,7 +351,7 @@ Improve man page and manual. - doc/msmtp.1 | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------ + doc/msmtp.1 | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------ doc/msmtp.texi | 142 ++++++++++++++++---------------- 2 files changed, 333 insertions(+), 311 deletions(-) @@ -317,7 +361,7 @@ Update the manual. Rework the TLS and Authentication sections. - doc/msmtp.texi | 632 +++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------- + doc/msmtp.texi | 632 +++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------- 1 file changed, 277 insertions(+), 355 deletions(-) commit c370cdf1dbdeeda804af36a7b6239c1ccc61f013 @@ -326,8 +370,8 @@ Update configuration file example - doc/msmtp.1 | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- - doc/msmtp.texi | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------- + doc/msmtp.1 | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + doc/msmtp.texi | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- doc/msmtprc-user.example | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 272 insertions(+), 55 deletions(-) @@ -482,7 +526,7 @@ doc/msmtp.texi | 16 +++++--- scripts/Makefile.am | 4 +- scripts/msmtp-gnome-tool/README | 1 - - scripts/msmtp-gnome-tool/msmtp-gnome-tool.py | 175 --------------------------------------------------------------------------------- + scripts/msmtp-gnome-tool/msmtp-gnome-tool.py | 175 ---------------------------------------------------------------------------------- src/msmtp.c | 30 +++++++++++++- 7 files changed, 55 insertions(+), 191 deletions(-) @@ -508,9 +552,9 @@ NEWS | 2 ++ doc/msmtp.1 | 11 +++++---- doc/msmtp.texi | 20 ++++++++--------- - src/conf.c | 69 ++++++++++++++++++++++++++++++++++++-------------------- - src/conf.h | 48 +++++++++++++++++++-------------------- - src/msmtp.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- + src/conf.c | 69 +++++++++++++++++++++++++++++++++++++-------------------- + src/conf.h | 48 ++++++++++++++++++++-------------------- + src/msmtp.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- 6 files changed, 166 insertions(+), 120 deletions(-) commit 595280fd8314bcfb4db18e1aa92e4454939404b8 @@ -534,7 +578,7 @@ doc/msmtp.texi | 30 ++++++++++++-- src/conf.c | 62 ++++++++++++++++++++++++++-- src/conf.h | 69 ++++++++++++++++--------------- - src/msmtp.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- + src/msmtp.c | 248 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- 7 files changed, 285 insertions(+), 154 deletions(-) commit b347dd5563f7eb4d809d8495d8437630731411af 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.5/configure.ac new/msmtp-1.6.6/configure.ac --- old/msmtp-1.6.5/configure.ac 2016-05-31 20:51:17.000000000 +0200 +++ new/msmtp-1.6.6/configure.ac 2016-11-14 20:59:07.000000000 +0100 @@ -24,7 +24,7 @@ # dnl Autotools init stuff -AC_INIT([msmtp], [1.6.5], [mar...@marlam.de], [msmtp], [http://msmtp.sourceforge.net/]) +AC_INIT([msmtp], [1.6.6], [mar...@marlam.de], [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.5/doc/msmtp.info new/msmtp-1.6.6/doc/msmtp.info --- old/msmtp-1.6.5/doc/msmtp.info 2016-05-31 20:52:20.000000000 +0200 +++ new/msmtp-1.6.6/doc/msmtp.info 2016-11-14 21:01:09.000000000 +0100 @@ -1,6 +1,6 @@ -This is msmtp.info, produced by makeinfo version 6.1 from msmtp.texi. +This is msmtp.info, produced by makeinfo version 6.3 from msmtp.texi. -This manual was last updated 9 April 2016 for version 1.6.5 of msmtp. +This manual was last updated 9 April 2016 for version 1.6.6 of msmtp. Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Martin Lambers @@ -21,7 +21,7 @@ msmtp ***** -This manual was last updated 9 April 2016 for version 1.6.5 of msmtp. +This manual was last updated 9 April 2016 for version 1.6.6 of msmtp. Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Martin Lambers 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.5/doc/stamp-vti new/msmtp-1.6.6/doc/stamp-vti --- old/msmtp-1.6.5/doc/stamp-vti 2016-05-31 20:52:18.000000000 +0200 +++ new/msmtp-1.6.6/doc/stamp-vti 2016-11-14 21:01:08.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 9 April 2016 @set UPDATED-MONTH April 2016 -@set EDITION 1.6.5 -@set VERSION 1.6.5 +@set EDITION 1.6.6 +@set VERSION 1.6.6 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.5/doc/version.texi new/msmtp-1.6.6/doc/version.texi --- old/msmtp-1.6.5/doc/version.texi 2016-05-31 20:52:18.000000000 +0200 +++ new/msmtp-1.6.6/doc/version.texi 2016-11-14 21:01:08.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 9 April 2016 @set UPDATED-MONTH April 2016 -@set EDITION 1.6.5 -@set VERSION 1.6.5 +@set EDITION 1.6.6 +@set VERSION 1.6.6 Files old/msmtp-1.6.5/po/de.gmo and new/msmtp-1.6.6/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.5/po/de.po new/msmtp-1.6.6/po/de.po --- old/msmtp-1.6.5/po/de.po 2016-05-31 20:52:26.000000000 +0200 +++ new/msmtp-1.6.6/po/de.po 2016-11-14 21:01:07.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: msmtp 1.4.31\n" "Report-Msgid-Bugs-To: mar...@marlam.de\n" -"POT-Creation-Date: 2016-05-31 20:52+0200\n" +"POT-Creation-Date: 2016-11-14 21:01+0100\n" "PO-Revision-Date: 2013-04-22 19:10+0200\n" "Last-Translator: Martin Lambers <mar...@marlam.de>\n" "Language-Team: German\n" @@ -139,159 +139,159 @@ "permissions" msgstr "darf nicht mehr Rechte als Lese-/Schreibrecht für den Benutzer haben" -#: src/msmtp.c:107 +#: src/msmtp.c:112 #, c-format msgid "%s: FATAL: %s\n" msgstr "%s: FATAL: %s\n" -#: src/msmtp.c:430 +#: src/msmtp.c:435 #, c-format msgid "password for %s at %s: " msgstr "Passwort für %s auf %s: " -#: src/msmtp.c:484 +#: src/msmtp.c:489 msgid "Common Name" msgstr "Allgemeiner Name" -#: src/msmtp.c:484 +#: src/msmtp.c:489 msgid "Organization" msgstr "Organisation" -#: src/msmtp.c:485 +#: src/msmtp.c:490 msgid "Organizational unit" msgstr "Organisationseinheit" -#: src/msmtp.c:485 +#: src/msmtp.c:490 msgid "Locality" msgstr "Ort" -#: src/msmtp.c:485 +#: src/msmtp.c:490 msgid "State or Province" msgstr "Staat oder Provinz" -#: src/msmtp.c:486 +#: src/msmtp.c:491 msgid "Country" msgstr "Land" -#: src/msmtp.c:498 +#: src/msmtp.c:503 #, c-format msgid "TLS certificate information:\n" msgstr "TLS Zertifikatinformation:\n" -#: src/msmtp.c:499 +#: src/msmtp.c:504 msgid "Owner" msgstr "Eigentümer" -#: src/msmtp.c:510 +#: src/msmtp.c:515 msgid "Issuer" msgstr "Aussteller" -#: src/msmtp.c:521 +#: src/msmtp.c:526 msgid "Validity" msgstr "Gültigkeit" -#: src/msmtp.c:523 +#: src/msmtp.c:528 msgid "Activation time" msgstr "Aktivierungszeitpunkt" -#: src/msmtp.c:525 +#: src/msmtp.c:530 msgid "Expiration time" msgstr "Ablaufzeitpunkt" -#: src/msmtp.c:526 +#: src/msmtp.c:531 msgid "Fingerprints" msgstr "Fingerabdrücke" -#: src/msmtp.c:648 src/msmtp.c:818 src/msmtp.c:1774 +#: src/msmtp.c:653 src/msmtp.c:823 src/msmtp.c:1786 #, c-format msgid "the server does not support TLS via the STARTTLS command" msgstr "der Server unterstützt TLS über das STLS Kommando nicht" -#: src/msmtp.c:688 +#: src/msmtp.c:693 #, c-format msgid "the server does not support Remote Message Queue Starting" msgstr "der Server unterstützt Remote Message Queue Starting nicht" -#: src/msmtp.c:700 src/msmtp.c:1830 +#: src/msmtp.c:705 src/msmtp.c:1842 #, c-format msgid "the server does not support authentication" msgstr "der Server unterstützt keine Authentifizierung" -#: src/msmtp.c:853 +#: src/msmtp.c:858 #, c-format msgid "%s server at %s (%s [%s]), port %d:\n" msgstr "%s Server auf %s (%s [%s]), Port %d:\n" -#: src/msmtp.c:859 +#: src/msmtp.c:864 #, c-format msgid "%s server at %s (%s), port %d:\n" msgstr "%s Server auf %s (%s), Port %d:\n" -#: src/msmtp.c:865 +#: src/msmtp.c:870 #, c-format msgid "%s server at %s ([%s]), port %d:\n" msgstr "%s Server auf %s ([%s]), Port %d:\n" -#: src/msmtp.c:871 +#: src/msmtp.c:876 #, c-format msgid "%s server at %s, port %d:\n" msgstr "%s Server auf %s, Port %d:\n" -#: src/msmtp.c:891 +#: src/msmtp.c:896 #, c-format msgid "No special capabilities.\n" msgstr "Keine besonderen Leistungsmerkmale:\n" -#: src/msmtp.c:895 +#: src/msmtp.c:900 #, c-format msgid "Capabilities:\n" msgstr "Leistungsmerkmale:\n" -#: src/msmtp.c:899 +#: src/msmtp.c:904 msgid "Maximum message size is " msgstr "Maximale Mailgröße ist " -#: src/msmtp.c:902 +#: src/msmtp.c:907 #, c-format msgid "unlimited\n" msgstr "unbegrenzt\n" -#: src/msmtp.c:906 +#: src/msmtp.c:911 #, c-format msgid "%ld bytes" msgstr "%ld bytes" -#: src/msmtp.c:909 +#: src/msmtp.c:914 #, c-format msgid " = %.2f MiB" msgstr " = %.2f MiB" -#: src/msmtp.c:914 +#: src/msmtp.c:919 #, c-format msgid " = %.2f KiB" msgstr " = %.2f KiB" -#: src/msmtp.c:921 +#: src/msmtp.c:926 msgid "Support for command grouping for faster transmission" msgstr "Unterstützung für schnelle Übertragung durch Kommandogruppierung" -#: src/msmtp.c:926 +#: src/msmtp.c:931 msgid "Support for RMQS (Remote Message Queue Starting)" msgstr "Unterstützung für RMQS (Remote Message Queue Starting)" -#: src/msmtp.c:931 +#: src/msmtp.c:936 msgid "Support for Delivery Status Notifications" msgstr "Unterstützung für Lieferstatusbenachrichtigungen (DSN)" -#: src/msmtp.c:941 +#: src/msmtp.c:946 msgid "Support for TLS encryption via the STARTTLS command" msgstr "Unterstützung für TLS Verschlüsselung über das STLS Kommando" -#: src/msmtp.c:947 +#: src/msmtp.c:952 msgid "Supported authentication methods:" msgstr "Unterstützte Authentifizierungsmethoden:" -#: src/msmtp.c:988 +#: src/msmtp.c:993 #, c-format msgid "" "This server might advertise more or other capabilities when TLS is active.\n" @@ -299,80 +299,80 @@ "Dieser Server könnte mehr oder andere Leistungsmerkmale angeben\n" " wenn TLS Verschlüsselung aktiviert ist.\n" -#: src/msmtp.c:1547 src/msmtp.c:3377 +#: src/msmtp.c:1552 src/msmtp.c:3389 #, c-format msgid "cannot write mail headers to temporary file: output error" msgstr "kann Mail Kopfzeilen nicht in temporäre Datei schreiben: Ausgabefehler" -#: src/msmtp.c:1645 +#: src/msmtp.c:1654 #, c-format msgid "input error while reading the mail" msgstr "Fehler beim Lesen der Mail" -#: src/msmtp.c:1819 +#: src/msmtp.c:1831 #, c-format msgid "the server does not support DSN" msgstr "der Server unterstützt kein DSN" -#: src/msmtp.c:2142 src/msmtp.c:4130 src/tls.c:114 +#: src/msmtp.c:2154 src/msmtp.c:4142 src/tls.c:114 #, c-format msgid "cannot get system time: %s" msgstr "kann Systemzeit nicht feststellen: %s" -#: src/msmtp.c:2148 +#: src/msmtp.c:2160 msgid "cannot convert UTC time to local time" msgstr "kann UTC Zeit nicht in lokale Zeit umwandeln" -#: src/msmtp.c:2162 +#: src/msmtp.c:2174 #, c-format msgid "cannot open: %s" msgstr "kann Datei nicht öffnen: %s" -#: src/msmtp.c:2170 +#: src/msmtp.c:2182 #, c-format msgid "cannot lock (tried for %d seconds): %s" msgstr "kann Datei nicht sperren (habe es %d Sekunden versucht): %s" -#: src/msmtp.c:2175 +#: src/msmtp.c:2187 #, c-format msgid "cannot lock: %s" msgstr "kann Datei nicht sperren: %s" -#: src/msmtp.c:2184 +#: src/msmtp.c:2196 msgid "output error" msgstr "Ausgabefehler" -#: src/msmtp.c:2197 +#: src/msmtp.c:2209 #, c-format msgid "cannot log to %s: %s" msgstr "kann Log Information nicht in %s schreiben: %s" -#: src/msmtp.c:2201 +#: src/msmtp.c:2213 #, c-format msgid "log info was: %s" msgstr "Log Information war: %s" -#: src/msmtp.c:2308 +#: src/msmtp.c:2320 #, c-format msgid "%s version %s\n" msgstr "%s Version %s\n" -#: src/msmtp.c:2309 +#: src/msmtp.c:2321 #, c-format msgid "Platform: %s\n" msgstr "Plattform: %s\n" -#: src/msmtp.c:2311 +#: src/msmtp.c:2323 #, c-format msgid "TLS/SSL library: %s\n" msgstr "TLS/SSL Programmbibliothek: %s\n" -#: src/msmtp.c:2317 src/msmtp.c:2383 +#: src/msmtp.c:2329 src/msmtp.c:2395 #, c-format msgid "none" msgstr "keine" -#: src/msmtp.c:2321 +#: src/msmtp.c:2333 #, c-format msgid "" "Authentication library: %s\n" @@ -381,61 +381,61 @@ "Authentifizierungsprogrammbibliothek: %s\n" "Unterstützte Authentifizierungsmethoden:\n" -#: src/msmtp.c:2326 +#: src/msmtp.c:2338 msgid "built-in" msgstr "eingebaut" -#: src/msmtp.c:2363 +#: src/msmtp.c:2375 #, c-format msgid "IDN support: " msgstr "IDN Unterstützung: " -#: src/msmtp.c:2367 src/msmtp.c:2375 +#: src/msmtp.c:2379 src/msmtp.c:2387 #, c-format msgid "enabled" msgstr "aktiviert" -#: src/msmtp.c:2369 src/msmtp.c:2378 +#: src/msmtp.c:2381 src/msmtp.c:2390 #, c-format msgid "disabled" msgstr "deaktiviert" -#: src/msmtp.c:2373 +#: src/msmtp.c:2385 #, c-format msgid "NLS: " msgstr "NLS: " -#: src/msmtp.c:2376 +#: src/msmtp.c:2388 #, c-format msgid ", LOCALEDIR is %s" msgstr ", LOCALEDIR ist %s" -#: src/msmtp.c:2381 +#: src/msmtp.c:2393 #, c-format msgid "Keyring support: " msgstr "Keyring Unterstützung: " -#: src/msmtp.c:2386 +#: src/msmtp.c:2398 #, c-format msgid "Gnome " msgstr "Gnome " -#: src/msmtp.c:2389 +#: src/msmtp.c:2401 #, c-format msgid "MacOS " msgstr "MacOS " -#: src/msmtp.c:2395 +#: src/msmtp.c:2407 #, c-format msgid "System configuration file name: %s\n" msgstr "Systemweite Konfigurationsdatei: %s\n" -#: src/msmtp.c:2400 +#: src/msmtp.c:2412 #, c-format msgid "User configuration file name: %s\n" msgstr "Benutzerkonfigurationsdatei: %s\n" -#: src/msmtp.c:2404 +#: src/msmtp.c:2416 #, fuzzy, c-format msgid "" "Copyright (C) 2016 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:2421 +#: src/msmtp.c:2433 #, c-format msgid "" "Usage:\n" "\n" msgstr "" -#: src/msmtp.c:2422 +#: src/msmtp.c:2434 #, c-format msgid "" "Sendmail mode (default):\n" @@ -467,7 +467,7 @@ "server.\n" msgstr "" -#: src/msmtp.c:2427 +#: src/msmtp.c:2439 #, c-format msgid "" "Server information mode:\n" @@ -475,7 +475,7 @@ " Print information about a server.\n" msgstr "" -#: src/msmtp.c:2430 +#: src/msmtp.c:2442 #, c-format msgid "" "Remote Message Queue Starting mode:\n" @@ -484,58 +484,58 @@ "\n" msgstr "" -#: src/msmtp.c:2434 +#: src/msmtp.c:2446 #, c-format msgid "General options:\n" msgstr "" -#: src/msmtp.c:2435 +#: src/msmtp.c:2447 #, c-format msgid " --version print version\n" msgstr "" -#: src/msmtp.c:2436 +#: src/msmtp.c:2448 #, c-format msgid " --help print help\n" msgstr "" -#: src/msmtp.c:2437 +#: src/msmtp.c:2449 #, c-format msgid " -P, --pretend print configuration info and exit\n" msgstr "" -#: src/msmtp.c:2438 +#: src/msmtp.c:2450 #, c-format msgid " -d, --debug print debugging information\n" msgstr "" -#: src/msmtp.c:2439 +#: src/msmtp.c:2451 #, c-format msgid "Changing the mode of operation:\n" msgstr "" -#: src/msmtp.c:2440 +#: src/msmtp.c:2452 #, c-format msgid " -S, --serverinfo print information about the server\n" msgstr "" -#: src/msmtp.c:2441 +#: src/msmtp.c:2453 #, c-format msgid "" " --rmqs=host|@domain|#queue send a Remote Message Queue Starting request\n" msgstr "" -#: src/msmtp.c:2442 +#: src/msmtp.c:2454 #, fuzzy, c-format msgid "Configuration options:\n" msgstr "Benutzerkonfigurationsdatei: %s\n" -#: src/msmtp.c:2443 +#: src/msmtp.c:2455 #, c-format msgid " -C, --file=filename set configuration file\n" msgstr "" -#: src/msmtp.c:2444 +#: src/msmtp.c:2456 #, 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:2447 +#: src/msmtp.c:2459 #, c-format msgid "" " --host=hostname set the server, use only command-line " @@ -552,628 +552,628 @@ " do not use any configuration file data\n" msgstr "" -#: src/msmtp.c:2449 +#: src/msmtp.c:2461 #, c-format msgid " --port=number set port number\n" msgstr "" -#: src/msmtp.c:2450 +#: src/msmtp.c:2462 #, c-format msgid " --timeout=(off|seconds) set/unset network timeout in seconds\n" msgstr "" -#: src/msmtp.c:2451 +#: src/msmtp.c:2463 #, c-format msgid " --protocol=(smtp|lmtp) use the given sub protocol\n" msgstr "" -#: src/msmtp.c:2452 +#: src/msmtp.c:2464 #, c-format msgid "" " --domain=string set the argument of EHLO or LHLO command\n" msgstr "" -#: src/msmtp.c:2453 +#: src/msmtp.c:2465 #, c-format msgid "" " --auth[=(on|off|method)] enable/disable authentication and optionally\n" " choose the method\n" msgstr "" -#: src/msmtp.c:2455 +#: src/msmtp.c:2467 #, c-format msgid " --user=[username] set/unset user name for authentication\n" msgstr "" -#: src/msmtp.c:2456 +#: src/msmtp.c:2468 #, c-format msgid " --passwordeval=[eval] evaluate password for authentication\n" msgstr "" -#: src/msmtp.c:2457 +#: src/msmtp.c:2469 #, c-format msgid " --tls[=(on|off)] enable/disable TLS encryption\n" msgstr "" -#: src/msmtp.c:2458 +#: src/msmtp.c:2470 #, c-format msgid " --tls-starttls[=(on|off)] enable/disable STARTTLS for TLS\n" msgstr "" -#: src/msmtp.c:2459 +#: src/msmtp.c:2471 #, c-format msgid " --tls-trust-file=[file] set/unset trust file for TLS\n" msgstr "" -#: src/msmtp.c:2460 +#: src/msmtp.c:2472 #, c-format msgid " --tls-crl-file=[file] set/unset revocation file for TLS\n" msgstr "" -#: src/msmtp.c:2461 +#: src/msmtp.c:2473 #, c-format msgid "" " --tls-fingerprint=[f] set/unset trusted certificate fingerprint for " "TLS\n" msgstr "" -#: src/msmtp.c:2462 +#: src/msmtp.c:2474 #, c-format msgid " --tls-key-file=[file] set/unset private key file for TLS\n" msgstr "" -#: src/msmtp.c:2463 +#: src/msmtp.c:2475 #, c-format msgid " --tls-cert-file=[file] set/unset private cert file for TLS\n" msgstr "" -#: src/msmtp.c:2464 +#: src/msmtp.c:2476 #, c-format msgid "" " --tls-certcheck[=(on|off)] enable/disable server certificate checks for " "TLS\n" msgstr "" -#: src/msmtp.c:2465 +#: src/msmtp.c:2477 #, c-format msgid " --tls-min-dh-prime-bits=[b] set/unset minimum bit size of DH prime\n" msgstr "" -#: src/msmtp.c:2466 +#: src/msmtp.c:2478 #, c-format msgid " --tls-priorities=[prios] set/unset TLS priorities.\n" msgstr "" -#: src/msmtp.c:2467 +#: src/msmtp.c:2479 #, c-format msgid "Options specific to sendmail mode:\n" msgstr "" -#: src/msmtp.c:2468 +#: src/msmtp.c:2480 #, c-format msgid "" " --auto-from[=(on|off)] enable/disable automatic envelope-from " "addresses\n" msgstr "" -#: src/msmtp.c:2469 +#: src/msmtp.c:2481 #, c-format msgid " -f, --from=address set envelope from address\n" msgstr "" -#: src/msmtp.c:2470 +#: src/msmtp.c:2482 #, c-format msgid "" " --maildomain=[domain] set the domain for automatic envelope from\n" " addresses\n" msgstr "" -#: src/msmtp.c:2472 +#: src/msmtp.c:2484 #, c-format msgid " -N, --dsn-notify=(off|cond) set/unset DSN conditions\n" msgstr "" -#: src/msmtp.c:2473 +#: src/msmtp.c:2485 #, c-format msgid " -R, --dsn-return=(off|ret) set/unset DSN amount\n" msgstr "" -#: src/msmtp.c:2474 +#: src/msmtp.c:2486 #, c-format msgid " -X, --logfile=[file] set/unset log file\n" msgstr "" -#: src/msmtp.c:2475 +#: src/msmtp.c:2487 #, c-format msgid "" " --syslog[=(on|off|facility)] enable/disable/configure syslog logging\n" msgstr "" -#: src/msmtp.c:2476 +#: src/msmtp.c:2488 #, c-format msgid "" " -t, --read-recipients read additional recipients from the mail\n" msgstr "" -#: src/msmtp.c:2477 +#: src/msmtp.c:2489 #, c-format msgid "" " --read-envelope-from read envelope from address from the mail\n" msgstr "" -#: src/msmtp.c:2478 +#: src/msmtp.c:2490 #, c-format msgid " --aliases=[file] set/unset aliases file\n" msgstr "" -#: src/msmtp.c:2479 +#: src/msmtp.c:2491 #, c-format msgid " --proxy-host=[IP|hostname] set/unset proxy\n" msgstr "" -#: src/msmtp.c:2480 +#: src/msmtp.c:2492 #, c-format msgid " --proxy-port=[number] set/unset proxy port\n" msgstr "" -#: src/msmtp.c:2481 +#: src/msmtp.c:2493 #, c-format msgid "" " --add-missing-from-header[=(on|off)] enable/disable addition of From " "header\n" msgstr "" -#: src/msmtp.c:2482 +#: src/msmtp.c:2494 #, c-format msgid "" " --add-missing-date-header[=(on|off)] enable/disable addition of Date " "header\n" msgstr "" -#: src/msmtp.c:2483 +#: src/msmtp.c:2495 #, c-format msgid "" " --remove-bcc-headers[=(on|off)] enable/disable removal of Bcc headers\n" msgstr "" -#: src/msmtp.c:2484 +#: src/msmtp.c:2496 #, c-format msgid " -- end of options\n" msgstr "" -#: src/msmtp.c:2485 +#: src/msmtp.c:2497 #, c-format msgid "" "Accepted but ignored: -A, -B, -bm, -F, -G, -h, -i, -L, -m, -n, -O, -o, -v\n" msgstr "" -#: src/msmtp.c:2486 +#: src/msmtp.c:2498 #, c-format msgid "" "\n" "Report bugs to <%s>.\n" msgstr "" -#: src/msmtp.c:2696 src/msmtp.c:2710 +#: src/msmtp.c:2708 src/msmtp.c:2722 msgid "cannot use both --serverinfo and --rmqs" msgstr "kann nicht gleichzeitig --serverinfo und --rmqs benutzen" -#: src/msmtp.c:2730 src/msmtp.c:2742 +#: src/msmtp.c:2742 src/msmtp.c:2754 msgid "cannot use both --host and --account" msgstr "kann nicht gleichzeitig --host und --account benutzen" -#: src/msmtp.c:2758 src/msmtp.c:2776 src/msmtp.c:2795 src/msmtp.c:2850 -#: src/msmtp.c:2882 src/msmtp.c:2900 src/msmtp.c:2963 src/msmtp.c:3008 -#: src/msmtp.c:3030 src/msmtp.c:3063 src/msmtp.c:3088 src/msmtp.c:3107 -#: src/msmtp.c:3147 src/msmtp.c:3192 src/msmtp.c:3215 src/msmtp.c:3233 -#: src/msmtp.c:3251 src/msmtp.c:3302 +#: src/msmtp.c:2770 src/msmtp.c:2788 src/msmtp.c:2807 src/msmtp.c:2862 +#: src/msmtp.c:2894 src/msmtp.c:2912 src/msmtp.c:2975 src/msmtp.c:3020 +#: src/msmtp.c:3042 src/msmtp.c:3075 src/msmtp.c:3100 src/msmtp.c:3119 +#: src/msmtp.c:3159 src/msmtp.c:3204 src/msmtp.c:3227 src/msmtp.c:3245 +#: src/msmtp.c:3263 src/msmtp.c:3314 #, c-format msgid "invalid argument %s for %s" msgstr "ungültiges Argument %s für %s" -#: src/msmtp.c:2805 src/msmtp.c:3265 +#: src/msmtp.c:2817 src/msmtp.c:3277 msgid "cannot use both --from and --read-envelope-from" msgstr "kann nicht gleichzeitig --from und --read-envelope-from benutzen" -#: src/msmtp.c:3280 +#: src/msmtp.c:3292 #, c-format msgid "unsupported operation mode b%s" msgstr "Operationsmodus b%s nicht unterstützt" -#: src/msmtp.c:3354 src/msmtp.c:3807 src/msmtp.c:4106 +#: src/msmtp.c:3366 src/msmtp.c:3819 src/msmtp.c:4118 #, c-format msgid "cannot create temporary file: %s" msgstr "kann keine temporäre Datei erzeugen: %s" -#: src/msmtp.c:3384 src/msmtp.c:3832 src/msmtp.c:4140 +#: src/msmtp.c:3396 src/msmtp.c:3844 src/msmtp.c:4152 #, c-format msgid "cannot rewind temporary file: %s" msgstr "kann temporäre Datei nicht zurückspulen: %s" -#: src/msmtp.c:3449 +#: src/msmtp.c:3461 #, c-format msgid "ignoring system configuration file %s: %s\n" msgstr "ignoriere systemweite Konfigurationsdatei %s: %s\n" -#: src/msmtp.c:3464 +#: src/msmtp.c:3476 #, c-format msgid "loaded system configuration file %s\n" msgstr "systemweite Konfigurationsdatei %s geladen\n" -#: src/msmtp.c:3505 +#: src/msmtp.c:3517 #, c-format msgid "ignoring user configuration file %s: %s\n" msgstr "ignoriere Benutzerkonfigurationsdatei %s: %s\n" -#: src/msmtp.c:3520 +#: src/msmtp.c:3532 #, c-format msgid "loaded user configuration file %s\n" msgstr "Benutzerkonfigurationsdatei %s geladen\n" -#: src/msmtp.c:3577 +#: src/msmtp.c:3589 #, c-format msgid "using account %s from %s\n" msgstr "benutze Account %s aus %s\n" -#: src/msmtp.c:3583 src/msmtp.c:3618 src/msmtp.c:3619 src/msmtp.c:3621 -#: src/msmtp.c:3623 src/msmtp.c:3627 src/msmtp.c:3629 src/msmtp.c:3648 -#: src/msmtp.c:3650 src/msmtp.c:3652 src/msmtp.c:3662 src/msmtp.c:3665 -#: src/msmtp.c:3670 src/msmtp.c:3673 src/msmtp.c:3681 src/msmtp.c:3683 -#: src/msmtp.c:3685 src/msmtp.c:3687 src/msmtp.c:3689 +#: src/msmtp.c:3595 src/msmtp.c:3630 src/msmtp.c:3631 src/msmtp.c:3633 +#: src/msmtp.c:3635 src/msmtp.c:3639 src/msmtp.c:3641 src/msmtp.c:3660 +#: src/msmtp.c:3662 src/msmtp.c:3664 src/msmtp.c:3674 src/msmtp.c:3677 +#: src/msmtp.c:3682 src/msmtp.c:3685 src/msmtp.c:3693 src/msmtp.c:3695 +#: src/msmtp.c:3697 src/msmtp.c:3699 src/msmtp.c:3701 msgid "(not set)" msgstr "(nicht gesetzt)" -#: src/msmtp.c:3588 +#: src/msmtp.c:3600 #, c-format msgid "off\n" msgstr "aus\n" -#: src/msmtp.c:3594 +#: src/msmtp.c:3606 #, c-format msgid "%d seconds\n" msgstr "%d Sekunden\n" -#: src/msmtp.c:3598 +#: src/msmtp.c:3610 #, c-format msgid "1 second\n" msgstr "1 Sekunde\n" -#: src/msmtp.c:3607 +#: src/msmtp.c:3619 #, c-format msgid "none\n" msgstr "keine\n" -#: src/msmtp.c:3611 +#: src/msmtp.c:3623 #, c-format msgid "choose\n" msgstr "automatisch\n" -#: src/msmtp.c:3624 src/msmtp.c:3625 src/msmtp.c:3654 src/msmtp.c:3668 -#: src/msmtp.c:3675 src/msmtp.c:3677 src/msmtp.c:3679 +#: src/msmtp.c:3636 src/msmtp.c:3637 src/msmtp.c:3666 src/msmtp.c:3680 +#: src/msmtp.c:3687 src/msmtp.c:3689 src/msmtp.c:3691 msgid "on" msgstr "an" -#: src/msmtp.c:3624 src/msmtp.c:3625 src/msmtp.c:3654 src/msmtp.c:3668 -#: src/msmtp.c:3675 src/msmtp.c:3677 src/msmtp.c:3679 +#: src/msmtp.c:3636 src/msmtp.c:3637 src/msmtp.c:3666 src/msmtp.c:3680 +#: src/msmtp.c:3687 src/msmtp.c:3689 src/msmtp.c:3691 msgid "off" msgstr "aus" -#: src/msmtp.c:3673 +#: src/msmtp.c:3685 msgid "(read from mail)" msgstr "(extrahiere aus Mail)" -#: src/msmtp.c:3692 +#: src/msmtp.c:3704 #, 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:3697 +#: src/msmtp.c:3709 #, c-format msgid "reading recipients from the command line\n" msgstr "extrahiere Empfängerliste aus Kommandozeile\n" -#: src/msmtp.c:3797 +#: src/msmtp.c:3809 msgid "too many arguments" msgstr "zu viele Argumente" -#: src/msmtp.c:3826 +#: src/msmtp.c:3838 #, c-format msgid "envelope from address extracted from mail: %s\n" msgstr "Umschlagabsenderadresse aus Mail extrahiert: %s\n" -#: src/msmtp.c:3841 +#: src/msmtp.c:3853 msgid "no recipients found" msgstr "keine Empfänger gefunden" -#: src/msmtp.c:3871 +#: src/msmtp.c:3883 #, c-format msgid "account chosen by envelope from address %s: %s\n" msgstr "Account ausgewählt durch Umschlagabsenderadresse %s: %s\n" -#: src/msmtp.c:3885 +#: src/msmtp.c:3897 #, c-format msgid "falling back to default account\n" msgstr "benutze den Account default\n" -#: src/msmtp.c:3908 +#: src/msmtp.c:3920 #, c-format msgid "using environment variables EMAIL and SMTPSERVER\n" msgstr "benutze Umgebungsvariablen EMAIL und SMTPSERVER\n" -#: src/msmtp.c:3916 +#: src/msmtp.c:3928 #, c-format msgid "account %s not found in %s and %s" msgstr "Account %s nicht in %s und %s gefunden" -#: src/msmtp.c:3922 src/msmtp.c:3927 +#: src/msmtp.c:3934 src/msmtp.c:3939 #, c-format msgid "account %s not found in %s" msgstr "Account %s nicht in %s gefunden" -#: src/msmtp.c:3932 +#: src/msmtp.c:3944 #, c-format msgid "account %s not found: no configuration file available" msgstr "Account %s nicht gefunden: Keine Konfigurationsdatei verfügbar" -#: src/msmtp.c:3947 +#: src/msmtp.c:3959 #, c-format msgid "using account specified on command line\n" msgstr "benutze den Account von der Kommandozeile\n" -#: src/msmtp.c:4016 +#: src/msmtp.c:4028 #, c-format msgid "account %s from %s: %s" msgstr "Account %s aus %s: %s" -#: src/msmtp.c:4057 +#: src/msmtp.c:4069 msgid "this platform does not support syslog logging" msgstr "diese Plattform unterstützt Syslog nicht" -#: src/msmtp.c:4066 +#: src/msmtp.c:4078 #, 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:4074 +#: src/msmtp.c:4086 #, c-format msgid "cannot initialize networking: %s" msgstr "kann Netzwerkprogrammbibliothek nicht initialisieren: %s" -#: src/msmtp.c:4085 +#: src/msmtp.c:4097 #, c-format msgid "cannot initialize TLS library: %s" msgstr "kann TLS Programmbibliothek nicht initialisieren: %s" -#: src/msmtp.c:4092 +#: src/msmtp.c:4104 msgid "support for TLS is not compiled in" msgstr "Unterstützung für TLS ist nicht einkompiliert worden" -#: src/msmtp.c:4168 +#: src/msmtp.c:4180 #, c-format msgid "LMTP server message: %s" msgstr "Nachricht des LMTP Servers: %s" -#: src/msmtp.c:4179 +#: src/msmtp.c:4191 #, 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:4185 +#: src/msmtp.c:4197 msgid "could not send mail to all recipients" msgstr "konnte Mail nicht an alle Empfänger schicken" -#: src/msmtp.c:4200 src/msmtp.c:4255 src/msmtp.c:4276 +#: src/msmtp.c:4212 src/msmtp.c:4267 src/msmtp.c:4288 #, c-format msgid "server message: %s" msgstr "Nachricht des Servers: %s" -#: src/msmtp.c:4206 +#: src/msmtp.c:4218 #, c-format msgid "could not send mail (account %s from %s)" msgstr "konnte Mail nicht verschicken (Account %s aus %s)" -#: src/msmtp.c:4211 +#: src/msmtp.c:4223 msgid "could not send mail" msgstr "konnte Mail nicht verschicken" -#: src/msmtp.c:4221 +#: src/msmtp.c:4233 #, c-format msgid "delivery to one or more recipients failed" msgstr "Zustellung an einen oder mehrere Empfänger fehlgeschlagen" -#: src/net.c:80 +#: src/net.c:81 msgid "not enough memory" msgstr "nicht genug Speicher" -#: src/net.c:83 src/net.c:194 src/net.c:241 src/net.c:642 src/net.c:746 +#: src/net.c:84 src/net.c:195 src/net.c:242 src/net.c:643 src/net.c:747 #: src/tls.c:1473 src/tls.c:1530 src/tls.c:1580 src/tls.c:1662 src/tls.c:1708 #, c-format msgid "operation aborted" msgstr "Operation abgebrochen" -#: src/net.c:86 +#: src/net.c:87 msgid "invalid argument" msgstr "ungültiges Argument" -#: src/net.c:89 +#: src/net.c:90 msgid "class type not found" msgstr "Klassentyp nicht gefunden" -#: src/net.c:92 +#: src/net.c:93 msgid "the network subsystem has failed" msgstr "Das Netzwerksystem versagte" -#: src/net.c:95 +#: src/net.c:96 msgid "host not found (authoritative)" msgstr "Host nicht gefunden (endgültig)" -#: src/net.c:98 +#: src/net.c:99 msgid "host not found (nonauthoritative) or server failure" msgstr "Host nicht gefunden (nicht endgültig) oder Serverfehlfunktion" -#: src/net.c:101 +#: src/net.c:102 msgid "nonrecoverable error" msgstr "Nichtbehebbarer Fehler" -#: src/net.c:104 +#: src/net.c:105 msgid "valid name, but no data record of requested type" msgstr "gültiger Name, aber keine Daten des angeforderten Typs gefunden" -#: src/net.c:107 +#: src/net.c:108 msgid "address family not supported" msgstr "Adressfamilie nicht unterstützt" -#: src/net.c:110 +#: src/net.c:111 msgid "no socket descriptors available" msgstr "keine Socketdeskriptoren verfügbar" -#: src/net.c:113 +#: src/net.c:114 msgid "no buffer space available" msgstr "kein Pufferplatz verfügbar" -#: src/net.c:116 +#: src/net.c:117 msgid "protocol not supported" msgstr "Protokoll nicht unterstützt" -#: src/net.c:119 +#: src/net.c:120 msgid "wrong protocol type for this socket" msgstr "falsches Protokoll für diesen Socket" -#: src/net.c:122 +#: src/net.c:123 msgid "socket type is not supported in this address family" msgstr "Sockettyp ist in dieser Adressfamilie nicht unterstützt" -#: src/net.c:125 +#: src/net.c:126 msgid "remote address is not valid" msgstr "Partneradresse ist ungültig" -#: src/net.c:128 src/net.c:554 +#: src/net.c:129 src/net.c:555 msgid "connection refused" msgstr "Verbindung abgelehnt" -#: src/net.c:131 src/net.c:548 +#: src/net.c:132 src/net.c:549 msgid "network unreachable" msgstr "Netzwerk nicht erreichbar" -#: src/net.c:134 +#: src/net.c:135 msgid "timeout" msgstr "Timeout" -#: src/net.c:137 +#: src/net.c:138 msgid "socket not connected" msgstr "Socket nicht verbunden" -#: src/net.c:140 +#: src/net.c:141 msgid "the socket was shut down" msgstr "der Socket wurde beendet" -#: src/net.c:143 src/net.c:551 +#: src/net.c:144 src/net.c:552 msgid "host unreachable" msgstr "Host nicht erreichbar" -#: src/net.c:146 +#: src/net.c:147 msgid "connection reset by peer" msgstr "Verbidung vom Partner zurückgesetzt" -#: src/net.c:149 +#: src/net.c:150 msgid "the underlying network subsystem is not ready" msgstr "das Netzwerksubsystem ist nicht bereit" -#: src/net.c:152 +#: src/net.c:153 msgid "the requested version is not available" msgstr "angeforderte Version ist nicht verfügbar" -#: src/net.c:155 +#: src/net.c:156 msgid "a blocking operation is in progress" msgstr "eine blockende Operation läuft" -#: src/net.c:158 +#: src/net.c:159 msgid "limit on the number of tasks has been reached" msgstr "Grenze der Anzahl der Abläufe wurde erreicht" -#: src/net.c:161 +#: src/net.c:162 msgid "invalid request" msgstr "ungültige Anfrage" -#: src/net.c:164 src/net.c:566 src/tls.c:1374 src/tls.c:1398 src/tls.c:1685 +#: src/net.c:165 src/net.c:567 src/tls.c:1374 src/tls.c:1398 src/tls.c:1685 msgid "unknown error" msgstr "unbekannter Fehler" -#: src/net.c:183 src/net.c:188 src/net.c:198 src/net.c:203 +#: src/net.c:184 src/net.c:189 src/net.c:199 src/net.c:204 #, c-format msgid "network read error: %s" msgstr "Netzwerk Lesefehler: %s" -#: src/net.c:184 src/net.c:199 src/net.c:231 src/net.c:246 src/tls.c:1393 +#: src/net.c:185 src/net.c:200 src/net.c:232 src/net.c:247 src/tls.c:1393 #: src/tls.c:1537 src/tls.c:1669 msgid "the operation timed out" msgstr "die Wartezeit ist abgelaufen" -#: src/net.c:230 src/net.c:235 src/net.c:245 src/net.c:250 +#: src/net.c:231 src/net.c:236 src/net.c:246 src/net.c:251 #, c-format msgid "network write error: %s" msgstr "Netzwerk Ausgabefehler: %s" -#: src/net.c:446 src/net.c:476 src/net.c:511 src/net.c:542 src/net.c:545 -#: src/net.c:548 src/net.c:551 src/net.c:554 src/net.c:557 src/net.c:560 -#: src/net.c:563 src/net.c:566 +#: src/net.c:447 src/net.c:477 src/net.c:512 src/net.c:543 src/net.c:546 +#: src/net.c:549 src/net.c:552 src/net.c:555 src/net.c:558 src/net.c:561 +#: src/net.c:564 src/net.c:567 #, c-format msgid "proxy failure: %s" msgstr "" -#: src/net.c:446 +#: src/net.c:447 msgid "host name too long" msgstr "" -#: src/net.c:460 src/net.c:494 src/net.c:859 +#: src/net.c:461 src/net.c:495 src/net.c:860 #, c-format msgid "network write error" msgstr "Netzwerk Ausgabefehler" -#: src/net.c:470 src/net.c:504 src/net.c:533 +#: src/net.c:471 src/net.c:505 src/net.c:534 #, fuzzy, c-format msgid "network read error" msgstr "Netzwerk Lesefehler: %s" -#: src/net.c:476 src/net.c:511 +#: src/net.c:477 src/net.c:512 msgid "unexpected reply" msgstr "" -#: src/net.c:542 +#: src/net.c:543 msgid "general server failure" msgstr "" -#: src/net.c:545 +#: src/net.c:546 #, fuzzy msgid "connection not allowed" msgstr "Verbindung abgelehnt" -#: src/net.c:557 +#: src/net.c:558 msgid "time-to-live expired" msgstr "" -#: src/net.c:560 +#: src/net.c:561 #, fuzzy msgid "command not supported" msgstr "Protokoll nicht unterstützt" -#: src/net.c:563 +#: src/net.c:564 #, fuzzy msgid "address type not supported" msgstr "Adressfamilie nicht unterstützt" -#: src/net.c:637 src/net.c:646 +#: src/net.c:638 src/net.c:647 #, c-format msgid "cannot locate host %s: %s" msgstr "kann Host %s nicht finden: %s" -#: src/net.c:725 +#: src/net.c:726 #, c-format msgid "cannot create socket: %s" msgstr "kann Socket nicht erstellen: %s" -#: src/net.c:741 src/net.c:754 +#: src/net.c:742 src/net.c:755 #, c-format msgid "cannot connect to %s, port %d: %s" msgstr "kann keine Verbindung zu %s, Port %d herstellen: %s" 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.5/src/msmtp.c new/msmtp-1.6.6/src/msmtp.c --- old/msmtp-1.6.5/src/msmtp.c 2016-04-09 21:59:04.000000000 +0200 +++ new/msmtp-1.6.6/src/msmtp.c 2016-11-14 20:44:01.000000000 +0100 @@ -59,6 +59,11 @@ #ifdef HAVE_MACOSXKEYRING # include <Security/Security.h> #endif +#ifdef W32_NATIVE +# define WIN32_LEAN_AND_MEAN /* do not include more than necessary */ +# define _WIN32_WINNT 0x0502 /* Windows XP SP2 or later */ +# include <winsock2.h> /* for getservbyname() */ +#endif #include "gettext.h" #define _(string) gettext(string) @@ -1626,6 +1631,7 @@ list_insert(recipients, resent_recipients->data); recipients = recipients->next; } + list_free(resent_recipients); } else { @@ -1637,7 +1643,10 @@ list_insert(recipients, normal_recipients->data); recipients = recipients->next; } + list_free(normal_recipients); } + normal_recipients_list = NULL; + resent_recipients_list = NULL; } if (ferror(mailf)) @@ -1649,9 +1658,12 @@ return EX_OK; error_exit: - if (recipients) + if (normal_recipients_list) { list_xfree(normal_recipients_list, free); + } + if (resent_recipients_list) + { list_xfree(resent_recipients_list, free); } if (from) 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.5/src/net.c new/msmtp-1.6.6/src/net.c --- old/msmtp-1.6.5/src/net.c 2015-11-02 10:29:43.000000000 +0100 +++ new/msmtp-1.6.6/src/net.c 2016-11-11 09:12:04.000000000 +0100 @@ -27,6 +27,7 @@ #include <stdlib.h> #include <stdio.h> +#include <stdint.h> #include <string.h> #include <unistd.h> #include <fcntl.h>