Commit 08b64178 authored by Markus Wanner's avatar Markus Wanner

Disable gnutls OPENPGP certificates. Closes: #879530.

Patch provided by Dimitri John Ledkov.
parent 4ceb1555
courier (1.0.1-1) UNRELEASED; urgency=medium
[ Markus Wanner ]
* New upstream release 1.0.1.
* Update and correct debian/copyright, use https links.
* Refresh patches 0002, 0010, 0012, 0015, 0016, 0019, 0022, 0023,
......@@ -24,6 +25,9 @@ courier (1.0.1-1) UNRELEASED; urgency=medium
dpkg-statoverride.
* sqwebmail/install-www: change table to use split choices.
[ Dimitri John Ledkov ]
* Disable gnutls OPENPGP certificates. Closes: #879530.
-- Markus Wanner <markus@bluegap.ch> Mon, 22 Oct 2018 20:12:02 +0200
courier (0.78.0-2) unstable; urgency=medium
......
......@@ -2,17 +2,6 @@ From: "Stefan Hornburg (Racke)" <racke@linuxia.de>
Date: Thu, 31 Dec 2015 12:04:08 +0100
Subject: Fix default configuration for Debian
---
courier/ldapaliasrc.dist | 2 +-
courier/module.esmtp/esmtpd-ssl.dist.in | 2 +-
courier/module.esmtp/esmtpd.dist.in | 10 +++++-----
courier/webmlmrc.dist.in | 2 +-
libs/imap/imapd-ssl.dist.in | 2 +-
libs/imap/imapd.dist.in | 6 +++---
libs/imap/pop3d-ssl.dist.in | 2 +-
libs/imap/pop3d.dist.in | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
--- a/courier/ldapaliasrc.dist
+++ b/courier/ldapaliasrc.dist
@@ -48,7 +48,7 @@
......@@ -35,6 +24,18 @@ Subject: Fix default configuration for Debian
##NAME: COURIERTLS:0
#
@@ -146,9 +146,9 @@
#
# Set TLS protocol priority settings (GnuTLS only)
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
#
# This setting is also used to select the available ciphers.
#
--- a/courier/module.esmtp/esmtpd.dist.in
+++ b/courier/module.esmtp/esmtpd.dist.in
@@ -36,7 +36,7 @@
......@@ -62,6 +63,18 @@ Subject: Fix default configuration for Debian
##NAME: TARPIT:1
#
@@ -135,9 +135,9 @@
#
# Set TLS protocol priority settings (GnuTLS only)
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
##NAME: TLS_PROTOCOL:0
#
@@ -211,7 +211,7 @@
# In all cases, $TLS_CERTFILE needs to be linked to one of the existing
# certificate files.
......@@ -99,6 +112,15 @@ Subject: Fix default configuration for Debian
##NAME: IMAPDSTARTTLS:0
#
@@ -110,7 +110,7 @@
#
# Set TLS protocol priority settings (GnuTLS only)
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
# This setting is also used to select the available ciphers.
#
--- a/libs/imap/imapd.dist.in
+++ b/libs/imap/imapd.dist.in
@@ -57,7 +57,7 @@
......@@ -139,6 +161,18 @@ Subject: Fix default configuration for Debian
##NAME: POP3_STARTTLS:0
#
@@ -93,9 +93,9 @@
#
# Set TLS protocol priority settings (GnuTLS only)
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
#
# This setting is also used to select the available ciphers.
#
--- a/libs/imap/pop3d.dist.in
+++ b/libs/imap/pop3d.dist.in
@@ -146,7 +146,7 @@
......@@ -162,3 +196,28 @@ Subject: Fix default configuration for Debian
AC_MSG_CHECKING(for modules to compile)
dirlist=""
--- a/libs/tcpd/libcouriergnutls.c
+++ b/libs/tcpd/libcouriergnutls.c
@@ -236,7 +236,7 @@
}
p->priority_list=safe_getenv(p, "TLS_PRIORITY",
- "NORMAL:-CTYPE-OPENPGP");
+ "NORMAL");
if ((certfile=strdup(safe_getenv(p, "TLS_CERTFILE", ""))) == NULL ||
(p->trustcerts=strdup(safe_getenv(p, "TLS_TRUSTCERTS", "")))
--- a/courier/courierd.dist.in
+++ b/courier/courierd.dist.in
@@ -280,9 +280,9 @@
#
# Set TLS protocol priority settings (GnuTLS only)
#
-# DEFAULT: NORMAL:-CTYPE-OPENPGP
+# DEFAULT: NORMAL
#
-# TLS_PRIORITY="NORMAL:-CTYPE-OPENPGP"
+# TLS_PRIORITY="NORMAL"
#
# This setting is also used to select the available ciphers.
#
......@@ -46,7 +46,7 @@ Subject: Dynamically resolver mailuid and mailgid on runtime (suboptimal,
echo "#define CONFIGURE_ARGS \"`cat ../configure.args`\"" >configargs.h
--- a/courier/configure.ac
+++ b/courier/configure.ac
@@ -322,16 +322,8 @@
@@ -325,16 +325,8 @@
AC_ARG_WITH(mailgroup, [], mailgroup="$withval",
AC_MSG_ERROR(--with-mailgroup not set))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment