tag 741620 + patch thanks Hi Racke,
I've created patches for the two RC-bugs against courier. The patch to fix the STARTTLS problem is really tested, and fixed the problem in my test setup. The patch to fix maildrop delivery mode really makes maildrop to be linked against libcourierauth.so again, but I did not test whether it fixes the whole problem (and the patch is not that beautiful either, which are the two reasons I'm not adding the patch tag there). Do you currently have time to prepare an upload? Otherwise, I would do an NMU (after verifying that the second patch is also OK), but not before Thursday. Bye Willi
From 43a0424d6de39643036c421dc185fae0086c44c2 Mon Sep 17 00:00:00 2001
From: Willi Mann <wi...@wm1.at>
Date: Sun, 27 Apr 2014 14:56:48 +0200
Subject: [PATCH 1/3] Fix maildrop to build against courier authlib
---
debian/rules | 1 +
libs/maildrop/configure | 7 -------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/debian/rules b/debian/rules
index e3b1652..f8bbc9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,7 @@ COMMON_CONFOPTS=--prefix=/usr --mandir=\$${prefix}/share/man \
--with-calendardir=/var/run/courier/calendar \
--with-certsdir=/etc/courier \
--with-webadmindir=/usr/share/courier/webadmin \
+ --enable-authlib \
--enable-userdb \
--enable-syslog=1 \
--enable-unicode \
diff --git a/libs/maildrop/configure b/libs/maildrop/configure
index 0a600f1..c5f4433 100755
--- a/libs/maildrop/configure
+++ b/libs/maildrop/configure
@@ -16300,13 +16300,6 @@ fi
done
-# When we're a part of the Courier build, we let Courier do the authlib stuff
-
-if test -d ${srcdir}/../../courier
-then
- COURIERAUTHCONFIG=""
-fi
-
# Check whether --enable-authlib was given.
if test "${enable_authlib+set}" = set; then :
enableval=$enable_authlib;
--
1.7.10.4
From 66c08f5188192c5825dde9d9264b9d95a56664d8 Mon Sep 17 00:00:00 2001 From: Willi Mann <wi...@wm1.at> Date: Sun, 27 Apr 2014 15:02:05 +0200 Subject: [PATCH 2/3] Create dhparams in postinst --- debian/courier-ssl.postinst | 7 +++++++ debian/courier-ssl.postrm | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/courier-ssl.postinst b/debian/courier-ssl.postinst index 48e29b9..c09f6ae 100644 --- a/debian/courier-ssl.postinst +++ b/debian/courier-ssl.postinst @@ -20,4 +20,11 @@ # Source debconf library . /usr/share/debconf/confmodule +if [ "$1" = "configure" ]; then + test -d /etc/courier || mkdir /etc/courier + if [ ! -f /etc/courier/dhparams.pem ]; then + mkdhparams + fi +fi + #DEBHELPER# diff --git a/debian/courier-ssl.postrm b/debian/courier-ssl.postrm index 48a6965..5c065f8 100644 --- a/debian/courier-ssl.postrm +++ b/debian/courier-ssl.postrm @@ -19,6 +19,7 @@ if [ "$1" = "purge" ]; then rm -rf /var/lib/courier/couriersslcache + rm -rf /etc/courier/dhparams.pem fi #DEBHELPER# -- 1.7.10.4
signature.asc
Description: OpenPGP digital signature
