diff options
| -rw-r--r-- | NEWS | 20 | ||||
| -rwxr-xr-x | fetchmailconf.py | 9 |
2 files changed, 21 insertions, 8 deletions
@@ -64,13 +64,12 @@ removed from a 6.5.0 or newer release.) for end-of-life OpenSSL versions may be removed even from patchlevel releases. -------------------------------------------------------------------------------- -fetchmail-6.4.15 (released 2021-01-03, 27614 LoC): +fetchmail-6.4.16 (not yet released): # BUG FIXES -* Fix a typo in the manual page reported by David McKelvie. -* Fix cross-compilation with openssl, by Fabrice Fontaine. Merge request !23. -* Fix truncation of SMTP PLAIN AUTH with ^ in credentials, by Earl Chew. - Gitlab issue #23, merge request !25. +* fetchmail's --configdump, and fetchmailconf, lacked support for the + sslcertfile option. --configdump support added by Earl Chew, + Gitlab issue #25, merge request !28. # KNOWN BUGS AND WORKAROUNDS (This section floats upwards through the NEWS file so it stays with the @@ -92,7 +91,16 @@ fetchmail-6.4.15 (released 2021-01-03, 27614 LoC): messages. This will not be fixed, because the maintainer has no Kerberos 5 server to test against. Use GSSAPI. --------------------------------------------------------------------------------- +--------------------------------------------------------------------------------- +fetchmail-6.4.15 (released 2021-01-03, 27614 LoC): + +# BUG FIXES +* Fix a typo in the manual page reported by David McKelvie. +* Fix cross-compilation with openssl, by Fabrice Fontaine. Merge request !23. +* Fix truncation of SMTP PLAIN AUTH with ^ in credentials, by Earl Chew. + Gitlab issue #23, merge request !25. + +------------------------------------------------------------------------------- fetchmail-6.4.14 (released 2020-11-26, 27608 LoC): # TRANSLATION UPDATES were made by these fine people: diff --git a/fetchmailconf.py b/fetchmailconf.py index c6073660..d528341e 100755 --- a/fetchmailconf.py +++ b/fetchmailconf.py @@ -29,7 +29,7 @@ import subprocess from tkinter import * from tkinter.dialog import * -VERSION = "1.63.1" +VERSION = "1.63.2" MIN_PY = (2, 7, 13) if sys.version_info < MIN_PY: @@ -294,7 +294,8 @@ class User(object): self.sslcert = None # SSL certificate filename self.sslproto = None # Force SSL? self.sslcertck = True # Enable strict SSL cert checking - self.sslcertpath = None # Path to trusted certificates + self.sslcertfile = None # Path to bundled file with trusted certificates + self.sslcertpath = None # Path to hashed directory trusted certificates self.sslcommonname = None # SSL CommonName to expect self.sslfingerprint = None # SSL key fingerprint to check self.properties = None # Extension properties @@ -408,6 +409,8 @@ class User(object): res = res + " sslproto " + repr(self.sslproto) if self.sslcertck is not None and self.sslcertck != UserDefaults.sslcertck: res = res + flag2str(self.sslcertck, 'sslcertck') + if self.sslcertfile and self.sslcertfile != UserDefaults.sslcertfile: + res = res + " sslcertfile " + repr(self.sslcertfile) if self.sslcertpath and self.sslcertpath != UserDefaults.sslcertpath: res = res + " sslcertpath " + repr(self.sslcertpath) if self.sslcommonname and self.sslcommonname != UserDefaults.sslcommonname: @@ -1772,6 +1775,8 @@ class UserEdit(Frame, MyWidget): self.sslcert, '14').pack(side=TOP, fill=X) Checkbutton(sslwin, text="Check server SSL certificate?", variable=self.sslcertck).pack(side=TOP, fill=X) + LabeledEntry(sslwin, 'SSL trusted certificate bundle file:', + self.sslcertfile, '14').pack(side=TOP, fill=X) LabeledEntry(sslwin, 'SSL trusted certificate directory:', self.sslcertpath, '14').pack(side=TOP, fill=X) LabeledEntry(sslwin, 'SSL CommonName:', |