- updated to 1.0.3 (now uses unicode maildir naming scheme, needs upgrade synchroniza...

[packages/courier.git] / courier-certs.patch

diff --git a/courier-certs.patch b/courier-certs.patch
index 10b84092da23239db691b3eac7e74a2a96ccc753..271c33e712743697589841fb6c3e97ac22050cc1 100644 (file)
--- a/courier-certs.patch
+++ b/courier-certs.patch
@@ -13,20 +13,21 @@
  
  MAILDROP="$bindir/maildrop"
  AC_SUBST(MAILDROP)
---- courier-0.78.2.orig/courier/imapd-ssl.rc.in        2010-05-08 23:30:54.599915374 +0200
-+++ courier-0.78.2/courier/imapd-ssl.rc.in     2010-05-08 23:31:10.355976183 +0200
-@@ -28,6 +28,11 @@
+--- courier-1.0.3/courier/imapd-ssl.rc.in.orig 2018-11-24 08:32:30.698359598 +0100
++++ courier-1.0.3/courier/imapd-ssl.rc.in      2018-11-24 08:46:40.145016565 +0100
+@@ -27,6 +27,12 @@
  
  case $1 in
  start)
-+        # If we do not have a certificate, make one up.
-+        if [ ! -f @certsdir@/imapd.pem ]; then
-+        @sbindir@/mkimapdcert
-+        fi
++      # If we do not have a certificate, make one up.
++      if test ! -f @certsdir@/imapd.pem
++      then
++              @sbindir@/mkimapdcert
++      fi
 +
-       umask $IMAP_UMASK
-       @ULIMIT@ $IMAP_ULIMITD
-       @SETENV@ -i @SHELL@ -c " set -a ;
+       if test "$TLS_CACHEFILE" != ""
+       then
+               rm -f "$TLS_CACHEFILE"
 --- courier-0.78.2.orig/courier/module.esmtp/configure.ac      2008-07-12 22:17:24.000000000 +0200
 +++ courier-0.78.2/courier/module.esmtp/configure.ac   2010-05-08 23:31:10.355976183 +0200
 @@ -287,6 +287,11 @@
@@ -105,20 +106,21 @@
  else
        if test "$BITS" = ""
        then
---- courier-0.78.2.orig/courier/pop3d-ssl.in   2010-05-08 23:30:54.612778263 +0200
-+++ courier-0.78.2/courier/pop3d-ssl.in        2010-05-08 23:31:10.355976183 +0200
-@@ -29,6 +29,11 @@
+--- courier-1.0.3/courier/pop3d-ssl.in.orig    2018-11-24 08:32:30.701692932 +0100
++++ courier-1.0.3/courier/pop3d-ssl.in 2018-11-24 08:47:26.655016034 +0100
+@@ -28,6 +28,12 @@
  
  case $1 in
  start)
-+        # If we do not have a certificate, make one up.
-+        if [ ! -f @certsdir@/pop3d.pem ]; then
-+        @sbindir@/mkpop3dcert
-+        fi
++      # If we do not have a certificate, make one up.
++      if test ! -f @certsdir@/pop3d.pem
++      then
++              @sbindir@/mkpop3dcert
++      fi
 +
-       exec @SETENV@ -i PATH="$PATH" SHELL="$SHELL" \
-               @SHELL@ -c " set -a ; \
-               prefix=@prefix@ ; \
+       if test "$TLS_CACHEFILE" != ""
+       then
+               rm -f "$TLS_CACHEFILE"
 --- courier-0.78.2.orig/courier.sysvinit.in    2010-05-08 23:30:54.612778263 +0200
 +++ courier-0.78.2/courier.sysvinit.in 2010-05-08 23:31:10.355976183 +0200
 @@ -18,7 +18,7 @@