Fix documentation of openssl settings.

6 files changed, 28 insertions, 50 deletions

diff --git a/imap/ChangeLog b/imap/ChangeLog
index 4150b26..8d8f31f 100644
--- a/imap/ChangeLog
+++ b/imap/ChangeLog
@@ -1,3 +1,11 @@
+5.0.8
+
+2019-08-28  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* Update documentation in the imapd and pop3d ssl config flies.
+
+	* Fix the RPM spec file for CentOS 7
+
 5.0.7
 
 2019-02-24  Sam Varshavchik  <mrsam@courier-mta.com>
diff --git a/imap/configure.ac b/imap/configure.ac
index 82fab4d..c21a80e 100644
--- a/imap/configure.ac
+++ b/imap/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl
-dnl Copyright 1998 - 2018 Double Precision, Inc.  See COPYING for
+dnl Copyright 1998 - 2019 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
-AC_INIT(courier-imap, 5.0.7, [courier-users@lists.sourceforge.net])
+AC_INIT(courier-imap, 5.0.8, [courier-users@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros
 
diff --git a/imap/imapd-ssl.dist.in.git b/imap/imapd-ssl.dist.in.git
index 17f8366..8ed9e36 100644
--- a/imap/imapd-ssl.dist.in.git
+++ b/imap/imapd-ssl.dist.in.git
@@ -5,7 +5,7 @@
 # Do not alter lines that begin with ##, they are used when upgrading
 # this configuration.
 #
-#  Copyright 2000 - 2016 Double Precision, Inc.  See COPYING for
+#  Copyright 2000 - 2019 Double Precision, Inc.  See COPYING for
 #  distribution information.
 #
 #  This configuration file sets various options for the Courier-IMAP server
@@ -106,9 +106,9 @@ COURIERTLS=@bindir@/couriertls
 
 ##NAME: TLS_PRIORITY:0
 #
-# GnuTLS setting only
+# GnuTLS setting only (use TLS_CIPHER_LIST for OpenSSL)
 #
-# Set TLS protocol priority settings (GnuTLS only)
+# Set TLS protocol priority settings
 #
 # DEFAULT: NORMAL:-CTYPE-OPENPGP
 #
@@ -144,33 +144,15 @@ COURIERTLS=@bindir@/couriertls
 
 ##NAME: TLS_CIPHER_LIST:0
 #
+# OpenSSL only (use TLS_PRIORITY for GnuTLS):
+#
 # TLS_CIPHER_LIST optionally sets the list of ciphers to be used by the
 # OpenSSL library.  In most situations you can leave TLS_CIPHER_LIST
 # undefined
 #
-# OpenSSL:
-#
 # TLS_CIPHER_LIST="TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH"
 #
-# GnuTLS:
-#
-# TLS_CIPHER_LIST="HIGH:MEDIUM"
-#
-# The actual list of available ciphers depend on the options GnuTLS was
-# compiled against. The possible ciphers are:
-#
-# AES256, 3DES, AES128, ARC128, ARC40, RC2, DES, NULL
-#
-# Also, the following aliases:
-#
-# HIGH -- all ciphers that use more than a 128 bit key size
-# MEDIUM -- all ciphers that use a 128 bit key size
-# LOW -- all ciphers that use fewer than a 128 bit key size, the NULL cipher
-#        is not included
-# ALL -- all ciphers except the NULL cipher
-#
-# See GnuTLS documentation, gnutls_priority_init(3) for additional
-# documentation.
+# See the OpenSSL ciphers(1) manual page for the format of this setting.
 
 ##NAME: TLS_STARTTLS_PROTOCOL:0
 #
diff --git a/imap/pop3d-ssl.dist.in.git b/imap/pop3d-ssl.dist.in.git
index 6b5b352..bca75e8 100644
--- a/imap/pop3d-ssl.dist.in.git
+++ b/imap/pop3d-ssl.dist.in.git
@@ -5,7 +5,7 @@
 # Do not alter lines that begin with ##, they are used when upgrading
 # this configuration.
 #
-#  Copyright 2000-2016 Double Precision, Inc.  See COPYING for
+#  Copyright 2000-2019 Double Precision, Inc.  See COPYING for
 #  distribution information.
 #
 #  This configuration file sets various options for the Courier-IMAP server
@@ -91,7 +91,9 @@ COURIERTLS=@bindir@/couriertls
 
 ##NAME: TLS_PRIORITY:0
 #
-# Set TLS protocol priority settings (GnuTLS only)
+# GnuTLS setting only (use TLS_CIPHER_LIST for OpenSSL)
+#
+# Set TLS protocol priority settings
 #
 # DEFAULT: NORMAL:-CTYPE-OPENPGP
 #
@@ -142,29 +144,9 @@ TLS_STARTTLS_PROTOCOL="$TLS_PROTOCOL"
 # OpenSSL library.  In most situations you can leave TLS_CIPHER_LIST
 # undefined
 #
-# OpenSSL:
-#
 # TLS_CIPHER_LIST="TLSv1:HIGH:!LOW:!MEDIUM:!EXP:!NULL:!aNULL@STRENGTH"
 #
-# GnuTLS:
-#
-# TLS_CIPHER_LIST="HIGH:MEDIUM"
-#
-# The actual list of available ciphers depend on the options GnuTLS was
-# compiled against. The possible ciphers are:
-#
-# AES256, 3DES, AES128, ARC128, ARC40, RC2, DES, NULL
-#
-# Also, the following aliases:
-#
-# HIGH -- all ciphers that use more than a 128 bit key size
-# MEDIUM -- all ciphers that use a 128 bit key size
-# LOW -- all ciphers that use fewer than a 128 bit key size, the NULL cipher
-#        is not included
-# ALL -- all ciphers except the NULL cipher
-#
-# See GnuTLS documentation, gnutls_priority_init(3) for additional
-# documentation.
+# See the OpenSSL ciphers(1) manual page for the format of this setting.
 
 ##NAME: TLS_STARTTLS_PROTOCOL:0
 #
diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog
index 770c394..8d14d7f 100644
--- a/sqwebmail/ChangeLog
+++ b/sqwebmail/ChangeLog
@@ -1,3 +1,9 @@
+6.0.3
+
+2019-08-28  Sam Varshavchik  <mrsam@courier-mta.com>
+
+	* Fix the RPM spec file for CentOS 7
+
 6.0.2
 
 2019-06-08  Sam Varshavchik  <mrsam@courier-mta.com>
diff --git a/sqwebmail/configure.ac b/sqwebmail/configure.ac
index 1bcfe14..e30a78d 100644
--- a/sqwebmail/configure.ac
+++ b/sqwebmail/configure.ac
@@ -2,7 +2,7 @@ dnl
 dnl Copyright 1998 - 2019 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
-AC_INIT(sqwebmail, 6.0.2, [courier-sqwebmail@lists.sourceforge.net])
+AC_INIT(sqwebmail, 6.0.3, [courier-sqwebmail@lists.sourceforge.net])
 
 >confdefs.h  # Kill PACKAGE_ macros