From d17b8ca431080f710a7d8e2a10fccdeeee059960 Mon Sep 17 00:00:00 2001 From: hawk Date: Mon, 10 May 2010 16:33:54 +0000 Subject: [PATCH] - updated for 0.64.2 Changed files: courier-certs.patch -> 1.10 courier-db.patch -> 1.4 courier-maildir.patch -> 1.10 courier-sendmail_dir.patch -> 1.5 courier-start_scripts.patch -> 1.7 courier-withoutfam.patch -> 1.3 --- courier-certs.patch | 228 ++++++++++++++++++------------------ courier-db.patch | 24 ++-- courier-maildir.patch | 72 ++++++------ courier-sendmail_dir.patch | 50 ++++---- courier-start_scripts.patch | 60 +++++----- courier-withoutfam.patch | 8 +- 6 files changed, 223 insertions(+), 219 deletions(-) diff --git a/courier-certs.patch b/courier-certs.patch index 279ef50..e6dcc67 100644 --- a/courier-certs.patch +++ b/courier-certs.patch @@ -1,6 +1,6 @@ -diff -urN courier-0.58.0.orig/configure.in courier-0.58.0/configure.in ---- courier-0.58.0.orig/configure.in 2007-11-24 04:25:52.000000000 +0100 -+++ courier-0.58.0/configure.in 2008-01-19 23:37:26.428337743 +0100 +diff -urN courier-0.64.2.orig//configure.in courier-0.64.2/configure.in +--- courier-0.64.2.orig//configure.in 2010-03-16 23:13:38.000000000 +0100 ++++ courier-0.64.2/configure.in 2010-05-08 23:31:10.332622817 +0200 @@ -70,6 +70,11 @@ eval "localstatedir=$localstatedir" eval "datadir=$datadir" @@ -13,10 +13,10 @@ diff -urN courier-0.58.0.orig/configure.in courier-0.58.0/configure.in AC_ARG_WITH(makedatprog, [], , ac_configure_args="$ac_configure_args --with-makedatprog=${libexecdir}/courier/makedatprog") -diff -urN courier-0.58.0.orig/courier/configure.in courier-0.58.0/courier/configure.in ---- courier-0.58.0.orig/courier/configure.in 2007-11-24 04:25:52.000000000 +0100 -+++ courier-0.58.0/courier/configure.in 2008-01-19 23:38:38.745253650 +0100 -@@ -498,6 +498,12 @@ +diff -urN courier-0.64.2.orig//courier/configure.in courier-0.64.2/courier/configure.in +--- courier-0.64.2.orig//courier/configure.in 2010-01-09 22:13:40.000000000 +0100 ++++ courier-0.64.2/courier/configure.in 2010-05-08 23:31:10.355976183 +0200 +@@ -480,6 +480,12 @@ eval "datarootdir=$datarootdir" eval "bindir=$bindir" eval "localstatedir=$localstatedir" @@ -29,9 +29,9 @@ diff -urN courier-0.58.0.orig/courier/configure.in courier-0.58.0/courier/config MAILDROP="$bindir/maildrop" AC_SUBST(MAILDROP) -diff -urN courier-0.58.0.orig/courier/imapd-ssl.rc.in courier-0.58.0/courier/imapd-ssl.rc.in ---- courier-0.58.0.orig/courier/imapd-ssl.rc.in 2008-01-19 23:30:56.000000000 +0100 -+++ courier-0.58.0/courier/imapd-ssl.rc.in 2008-01-19 23:37:26.428337743 +0100 +diff -urN courier-0.64.2.orig//courier/imapd-ssl.rc.in courier-0.64.2/courier/imapd-ssl.rc.in +--- courier-0.64.2.orig//courier/imapd-ssl.rc.in 2010-05-08 23:30:54.599915374 +0200 ++++ courier-0.64.2/courier/imapd-ssl.rc.in 2010-05-08 23:31:10.355976183 +0200 @@ -28,6 +28,11 @@ case $1 in @@ -44,10 +44,10 @@ diff -urN courier-0.58.0.orig/courier/imapd-ssl.rc.in courier-0.58.0/courier/ima umask $IMAP_UMASK @ULIMIT@ $IMAP_ULIMITD @SETENV@ -i @SHELL@ -c " set -a ; -diff -urN courier-0.58.0.orig/courier/module.esmtp/configure.in courier-0.58.0/courier/module.esmtp/configure.in ---- courier-0.58.0.orig/courier/module.esmtp/configure.in 2007-11-04 22:17:03.000000000 +0100 -+++ courier-0.58.0/courier/module.esmtp/configure.in 2008-01-19 23:37:26.428337743 +0100 -@@ -306,6 +306,11 @@ +diff -urN courier-0.64.2.orig//courier/module.esmtp/configure.in courier-0.64.2/courier/module.esmtp/configure.in +--- courier-0.64.2.orig//courier/module.esmtp/configure.in 2008-07-12 22:17:24.000000000 +0200 ++++ courier-0.64.2/courier/module.esmtp/configure.in 2010-05-08 23:31:10.355976183 +0200 +@@ -287,6 +287,11 @@ AC_SUBST(mydatadir) # Quell automake warning @@ -59,9 +59,9 @@ diff -urN courier-0.58.0.orig/courier/module.esmtp/configure.in courier-0.58.0/c dnl dnl Check what libraries are available dnl -diff -urN courier-0.58.0.orig/courier/module.esmtp/esmtpd.cnf.openssl.in courier-0.58.0/courier/module.esmtp/esmtpd.cnf.openssl.in ---- courier-0.58.0.orig/courier/module.esmtp/esmtpd.cnf.openssl.in 2007-07-01 17:36:34.000000000 +0200 -+++ courier-0.58.0/courier/module.esmtp/esmtpd.cnf.openssl.in 2008-01-19 23:39:34.911369481 +0100 +diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd.cnf.openssl.in courier-0.64.2/courier/module.esmtp/esmtpd.cnf.openssl.in +--- courier-0.64.2.orig//courier/module.esmtp/esmtpd.cnf.openssl.in 2007-11-04 22:17:03.000000000 +0100 ++++ courier-0.64.2/courier/module.esmtp/esmtpd.cnf.openssl.in 2010-05-08 23:31:10.355976183 +0200 @@ -1,5 +1,5 @@ -RANDFILE = @mydatadir@/esmtpd.rnd @@ -69,22 +69,22 @@ diff -urN courier-0.58.0.orig/courier/module.esmtp/esmtpd.cnf.openssl.in courier [ req ] default_bits = 1024 -diff -urN courier-0.58.0.orig/courier/module.esmtp/esmtpd.dist.in courier-0.58.0/courier/module.esmtp/esmtpd.dist.in ---- courier-0.58.0.orig/courier/module.esmtp/esmtpd.dist.in 2007-11-04 22:17:03.000000000 +0100 -+++ courier-0.58.0/courier/module.esmtp/esmtpd.dist.in 2008-01-19 23:39:44.028487817 +0100 -@@ -233,7 +233,7 @@ +diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd.dist.in courier-0.64.2/courier/module.esmtp/esmtpd.dist.in +--- courier-0.64.2.orig//courier/module.esmtp/esmtpd.dist.in 2010-02-02 23:30:00.000000000 +0100 ++++ courier-0.64.2/courier/module.esmtp/esmtpd.dist.in 2010-05-08 23:31:10.355976183 +0200 +@@ -242,7 +242,7 @@ # # This is an experimental feature. -TLS_CERTFILE=@mydatadir@/esmtpd.pem +TLS_CERTFILE=@certsdir@/esmtpd.pem - ##NAME: TLS_CERTINFO:0 + ##NAME: TLS_TRUSTCERTS:0 # -diff -urN courier-0.58.0.orig/courier/module.esmtp/esmtpd-ssl.dist.in courier-0.58.0/courier/module.esmtp/esmtpd-ssl.dist.in ---- courier-0.58.0.orig/courier/module.esmtp/esmtpd-ssl.dist.in 2007-11-04 22:17:03.000000000 +0100 -+++ courier-0.58.0/courier/module.esmtp/esmtpd-ssl.dist.in 2008-01-19 23:39:22.684097067 +0100 -@@ -256,7 +256,7 @@ +diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.dist.in courier-0.64.2/courier/module.esmtp/esmtpd-ssl.dist.in +--- courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.dist.in 2010-02-02 23:30:00.000000000 +0100 ++++ courier-0.64.2/courier/module.esmtp/esmtpd-ssl.dist.in 2010-05-08 23:31:10.355976183 +0200 +@@ -269,7 +269,7 @@ # # This is an experimental feature. @@ -93,9 +93,9 @@ diff -urN courier-0.58.0.orig/courier/module.esmtp/esmtpd-ssl.dist.in courier-0. ##NAME: TLS_TRUSTCERTS:0 # -diff -urN courier-0.58.0.orig/courier/module.esmtp/esmtpd-ssl.in courier-0.58.0/courier/module.esmtp/esmtpd-ssl.in ---- courier-0.58.0.orig/courier/module.esmtp/esmtpd-ssl.in 2008-01-19 23:30:56.000000000 +0100 -+++ courier-0.58.0/courier/module.esmtp/esmtpd-ssl.in 2008-01-19 23:37:26.431671242 +0100 +diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.in courier-0.64.2/courier/module.esmtp/esmtpd-ssl.in +--- courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.in 2010-05-08 23:30:54.612778263 +0200 ++++ courier-0.64.2/courier/module.esmtp/esmtpd-ssl.in 2010-05-08 23:31:10.355976183 +0200 @@ -25,6 +25,10 @@ case $1 in @@ -107,9 +107,9 @@ diff -urN courier-0.58.0.orig/courier/module.esmtp/esmtpd-ssl.in courier-0.58.0/ ;; stop) ${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop -diff -urN courier-0.58.0.orig/courier/module.esmtp/mkesmtpdcert.in courier-0.58.0/courier/module.esmtp/mkesmtpdcert.in ---- courier-0.58.0.orig/courier/module.esmtp/mkesmtpdcert.in 2007-11-04 22:17:03.000000000 +0100 -+++ courier-0.58.0/courier/module.esmtp/mkesmtpdcert.in 2008-01-19 23:40:14.373324466 +0100 +diff -urN courier-0.64.2.orig//courier/module.esmtp/mkesmtpdcert.in courier-0.64.2/courier/module.esmtp/mkesmtpdcert.in +--- courier-0.64.2.orig//courier/module.esmtp/mkesmtpdcert.in 2007-11-04 22:17:03.000000000 +0100 ++++ courier-0.64.2/courier/module.esmtp/mkesmtpdcert.in 2010-05-08 23:31:10.355976183 +0200 @@ -16,38 +16,38 @@ test -x @CERTTOOL@ || exit 0 fi @@ -168,9 +168,9 @@ diff -urN courier-0.58.0.orig/courier/module.esmtp/mkesmtpdcert.in courier-0.58. @CERTTOOL@ --generate-privkey --outfile esmtpd.key @CERTTOOL@ --generate-self-signed --load-privkey esmtpd.key --outfile esmtpd.cert --template @sysconfdir@/esmtpd.cnf -diff -urN courier-0.58.0.orig/courier/pop3d-ssl.in courier-0.58.0/courier/pop3d-ssl.in ---- courier-0.58.0.orig/courier/pop3d-ssl.in 2008-01-19 23:30:56.000000000 +0100 -+++ courier-0.58.0/courier/pop3d-ssl.in 2008-01-19 23:37:26.431671242 +0100 +diff -urN courier-0.64.2.orig//courier/pop3d-ssl.in courier-0.64.2/courier/pop3d-ssl.in +--- courier-0.64.2.orig//courier/pop3d-ssl.in 2010-05-08 23:30:54.612778263 +0200 ++++ courier-0.64.2/courier/pop3d-ssl.in 2010-05-08 23:31:10.355976183 +0200 @@ -29,6 +29,11 @@ case $1 in @@ -183,9 +183,9 @@ diff -urN courier-0.58.0.orig/courier/pop3d-ssl.in courier-0.58.0/courier/pop3d- exec @SETENV@ -i PATH="$PATH" SHELL="$SHELL" \ @SHELL@ -c " set -a ; \ prefix=@prefix@ ; \ -diff -urN courier-0.58.0.orig/courier.sysvinit.in courier-0.58.0/courier.sysvinit.in ---- courier-0.58.0.orig/courier.sysvinit.in 2008-01-19 23:30:56.000000000 +0100 -+++ courier-0.58.0/courier.sysvinit.in 2008-01-19 23:37:26.431671242 +0100 +diff -urN courier-0.64.2.orig//courier.sysvinit.in courier-0.64.2/courier.sysvinit.in +--- courier-0.64.2.orig//courier.sysvinit.in 2010-05-08 23:30:54.612778263 +0200 ++++ courier-0.64.2/courier.sysvinit.in 2010-05-08 23:31:10.355976183 +0200 @@ -18,7 +18,7 @@ sbindir="@sbindir@" bindir="@bindir@" @@ -222,10 +222,10 @@ diff -urN courier-0.58.0.orig/courier.sysvinit.in courier-0.58.0/courier.sysvini then echo -n " generating-IMAP-SSL-certificate..." -diff -urN courier-0.58.0.orig/imap/configure.in courier-0.58.0/imap/configure.in ---- courier-0.58.0.orig/imap/configure.in 2007-11-24 04:23:13.000000000 +0100 -+++ courier-0.58.0/imap/configure.in 2008-01-19 23:37:26.435004741 +0100 -@@ -300,6 +300,11 @@ +diff -urN courier-0.64.2.orig//imap/configure.in courier-0.64.2/imap/configure.in +--- courier-0.64.2.orig//imap/configure.in 2009-12-25 23:15:10.000000000 +0100 ++++ courier-0.64.2/imap/configure.in 2010-05-08 23:31:10.355976183 +0200 +@@ -284,6 +284,11 @@ mydatadir="$datadir" AC_SUBST(mydatadir) # Avoid useless autoconf warning @@ -237,9 +237,9 @@ diff -urN courier-0.58.0.orig/imap/configure.in courier-0.58.0/imap/configure.in # # Check for PAM configuration flavor -diff -urN courier-0.58.0.orig/imap/imapd.cnf.openssl.in courier-0.58.0/imap/imapd.cnf.openssl.in ---- courier-0.58.0.orig/imap/imapd.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 -+++ courier-0.58.0/imap/imapd.cnf.openssl.in 2008-01-19 23:40:41.287991189 +0100 +diff -urN courier-0.64.2.orig//imap/imapd.cnf.openssl.in courier-0.64.2/imap/imapd.cnf.openssl.in +--- courier-0.64.2.orig//imap/imapd.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-0.64.2/imap/imapd.cnf.openssl.in 2010-05-08 23:31:10.355976183 +0200 @@ -1,5 +1,5 @@ -RANDFILE = @mydatadir@/imapd.rand @@ -247,10 +247,10 @@ diff -urN courier-0.58.0.orig/imap/imapd.cnf.openssl.in courier-0.58.0/imap/imap [ req ] default_bits = 1024 -diff -urN courier-0.58.0.orig/imap/imapd-ssl.dist.in courier-0.58.0/imap/imapd-ssl.dist.in ---- courier-0.58.0.orig/imap/imapd-ssl.dist.in 2008-01-19 23:30:56.000000000 +0100 -+++ courier-0.58.0/imap/imapd-ssl.dist.in 2008-01-19 23:40:36.037731086 +0100 -@@ -254,7 +254,7 @@ +diff -urN courier-0.64.2.orig//imap/imapd-ssl.dist.in courier-0.64.2/imap/imapd-ssl.dist.in +--- courier-0.64.2.orig//imap/imapd-ssl.dist.in 2010-05-08 23:28:14.469307022 +0200 ++++ courier-0.64.2/imap/imapd-ssl.dist.in 2010-05-08 23:31:10.359913750 +0200 +@@ -260,7 +260,7 @@ # # This is an experimental feature. @@ -259,45 +259,45 @@ diff -urN courier-0.58.0.orig/imap/imapd-ssl.dist.in courier-0.58.0/imap/imapd-s ##NAME: TLS_TRUSTCERTS:0 # -diff -urN courier-0.58.0.orig/imap/mkimapdcert.8.in courier-0.58.0/imap/mkimapdcert.8.in ---- courier-0.58.0.orig/imap/mkimapdcert.8.in 2007-04-22 20:19:43.000000000 +0200 -+++ courier-0.58.0/imap/mkimapdcert.8.in 2008-01-19 23:41:04.485807114 +0100 -@@ -21,18 +21,18 @@ +diff -urN courier-0.64.2.orig//imap/mkimapdcert.8.in courier-0.64.2/imap/mkimapdcert.8.in +--- courier-0.64.2.orig//imap/mkimapdcert.8.in 2010-02-20 05:11:46.000000000 +0100 ++++ courier-0.64.2/imap/mkimapdcert.8.in 2010-05-08 23:31:45.213634288 +0200 +@@ -29,18 +29,18 @@ .SH "DESCRIPTION" .PP - IMAP over SSL requires a valid, signed, X\.509 certificate\. The default location for the certificate file is --\fI@datadir@/imapd\.pem\fR\. -+\fI@certsdir@/imapd\.pem\fR\. + IMAP over SSL requires a valid, signed, X\&.509 certificate\&. The default location for the certificate file is +-@datadir@/imapd\&.pem\&. ++@certsdir@/imapd\&.pem\&. \fBmkimapdcert\fR - generates a self\-signed X\.509 certificate, mainly for testing\. For production use the X\.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\. + generates a self\-signed X\&.509 certificate, mainly for testing\&. For production use the X\&.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\&. .PP --\fI@datadir@/imapd\.pem\fR -+\fI@certsdir@/imapd\.pem\fR - must be owned by the @mailuser@ user and have no group or world permissions\. The +-@datadir@/imapd\&.pem ++@certsdir@/imapd\&.pem + must be owned by the @mailuser@ user and have no group or world permissions\&. The \fBmkimapdcert\fR - command will enforce this\. To prevent an unfortunate accident, + command will enforce this\&. To prevent an unfortunate accident, \fBmkimapdcert\fR will not work if --\fB@datadir@/imapd\.pem\fR -+\fB@certsdir@/imapd\.pem\fR - already exists\. +-\fB@datadir@/imapd\&.pem\fR ++\fB@certsdir@/imapd\&.pem\fR + already exists\&. .PP -@@ -42,7 +42,7 @@ - to be installed\. +@@ -50,7 +50,7 @@ + to be installed\&. .SH "FILES" .PP --@datadir@/imapd\.pem -+@certsdir@/imapd\.pem +-@datadir@/imapd\&.pem ++@certsdir@/imapd\&.pem .RS 4 - X\.509 certificate\. + X\&.509 certificate\&. .RE -diff -urN courier-0.58.0.orig/imap/mkimapdcert.html.in courier-0.58.0/imap/mkimapdcert.html.in ---- courier-0.58.0.orig/imap/mkimapdcert.html.in 2007-04-22 20:19:42.000000000 +0200 -+++ courier-0.58.0/imap/mkimapdcert.html.in 2008-01-19 23:41:31.457143328 +0100 +diff -urN courier-0.64.2.orig//imap/mkimapdcert.html.in courier-0.64.2/imap/mkimapdcert.html.in +--- courier-0.64.2.orig//imap/mkimapdcert.html.in 2010-02-20 05:11:46.000000000 +0100 ++++ courier-0.64.2/imap/mkimapdcert.html.in 2010-05-08 23:31:51.539285741 +0200 @@ -7,22 +7,22 @@ - -->

Name

mkimapdcert — create a test SSL certificate for IMAP over SSL

Synopsis

@sbindir@/mkimapdcert

DESCRIPTION

+ -->

Name

mkimapdcert — create a test SSL certificate for IMAP over SSL

Synopsis

@sbindir@/mkimapdcert

DESCRIPTION

IMAP over SSL requires a valid, signed, X.509 certificate. The default location for the certificate file is -@datadir@/imapd.pem. @@ -318,14 +318,14 @@ diff -urN courier-0.58.0.orig/imap/mkimapdcert.html.in courier-0.58.0/imap/mkima -will not work if @datadir@/imapd.pem already exists.

+will not work if @certsdir@/imapd.pem already exists.

mkimapdcert requires --OpenSSL to be installed.

FILES

@datadir@/imapd.pem
-+OpenSSL to be installed.

FILES

@certsdir@/imapd.pem
+-OpenSSL to be installed.

FILES

@datadir@/imapd.pem
++OpenSSL to be installed.

FILES

@certsdir@/imapd.pem
X.509 certificate.
@sysconfdir@/imapd.cnf
Parameters used by OpenSSL to -diff -urN courier-0.58.0.orig/imap/mkimapdcert.in courier-0.58.0/imap/mkimapdcert.in ---- courier-0.58.0.orig/imap/mkimapdcert.in 2007-11-04 21:53:05.000000000 +0100 -+++ courier-0.58.0/imap/mkimapdcert.in 2008-01-19 23:42:07.038906129 +0100 +diff -urN courier-0.64.2.orig//imap/mkimapdcert.in courier-0.64.2/imap/mkimapdcert.in +--- courier-0.64.2.orig//imap/mkimapdcert.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-0.64.2/imap/mkimapdcert.in 2010-05-08 23:31:10.359913750 +0200 @@ -18,41 +18,41 @@ prefix="@prefix@" @@ -387,45 +387,45 @@ diff -urN courier-0.58.0.orig/imap/mkimapdcert.in courier-0.58.0/imap/mkimapdcer @CERTTOOL@ --generate-privkey --outfile imapd.key @CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/imapd.cnf -diff -urN courier-0.58.0.orig/imap/mkpop3dcert.8.in courier-0.58.0/imap/mkpop3dcert.8.in ---- courier-0.58.0.orig/imap/mkpop3dcert.8.in 2007-04-22 20:19:45.000000000 +0200 -+++ courier-0.58.0/imap/mkpop3dcert.8.in 2008-01-19 23:42:20.199558142 +0100 -@@ -21,18 +21,18 @@ +diff -urN courier-0.64.2.orig//imap/mkpop3dcert.8.in courier-0.64.2/imap/mkpop3dcert.8.in +--- courier-0.64.2.orig//imap/mkpop3dcert.8.in 2010-02-20 05:11:46.000000000 +0100 ++++ courier-0.64.2/imap/mkpop3dcert.8.in 2010-05-08 23:31:57.363659801 +0200 +@@ -29,18 +29,18 @@ .SH "DESCRIPTION" .PP - POP3 over SSL requires a valid, signed, X\.509 certificate\. The default location for the certificate file is --\fI@datadir@/pop3d\.pem\fR\. -+\fI@certsdir@/pop3d\.pem\fR\. + POP3 over SSL requires a valid, signed, X\&.509 certificate\&. The default location for the certificate file is +-@datadir@/pop3d\&.pem\&. ++@certsdir@/pop3d\&.pem\&. \fBmkpop3dcert\fR - generates a self\-signed X\.509 certificate, mainly for testing\. For production use the X\.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\. + generates a self\-signed X\&.509 certificate, mainly for testing\&. For production use the X\&.509 certificate must be signed by a recognized certificate authority, in order for mail clients to accept the certificate\&. .PP --\fI@datadir@/pop3d\.pem\fR -+\fI@certsdir@/pop3d\.pem\fR - must be owned by the @mailuser@ user and have no group or world permissions\. The +-@datadir@/pop3d\&.pem ++@certsdir@/pop3d\&.pem + must be owned by the @mailuser@ user and have no group or world permissions\&. The \fBmkpop3dcert\fR - command will enforce this\. To prevent an unfortunate accident, + command will enforce this\&. To prevent an unfortunate accident, \fBmkpop3dcert\fR will not work if --\fB@datadir@/pop3d\.pem\fR -+\fB@certsdir@/pop3d\.pem\fR - already exists\. +-\fB@datadir@/pop3d\&.pem\fR ++\fB@certsdir@/pop3d\&.pem\fR + already exists\&. .PP -@@ -42,7 +42,7 @@ - to be installed\. +@@ -50,7 +50,7 @@ + to be installed\&. .SH "FILES" .PP --@datadir@/pop3d\.pem -+@certsdir@/pop3d\.pem +-@datadir@/pop3d\&.pem ++@certsdir@/pop3d\&.pem .RS 4 - X\.509 certificate\. + X\&.509 certificate\&. .RE -diff -urN courier-0.58.0.orig/imap/mkpop3dcert.html.in courier-0.58.0/imap/mkpop3dcert.html.in ---- courier-0.58.0.orig/imap/mkpop3dcert.html.in 2007-04-22 20:19:45.000000000 +0200 -+++ courier-0.58.0/imap/mkpop3dcert.html.in 2008-01-19 23:42:28.846653207 +0100 +diff -urN courier-0.64.2.orig//imap/mkpop3dcert.html.in courier-0.64.2/imap/mkpop3dcert.html.in +--- courier-0.64.2.orig//imap/mkpop3dcert.html.in 2010-02-20 05:11:46.000000000 +0100 ++++ courier-0.64.2/imap/mkpop3dcert.html.in 2010-05-08 23:32:03.082617460 +0200 @@ -7,22 +7,22 @@ - -->

Name

mkpop3dcert — create a test SSL certificate for POP3 over SSL

Synopsis

@sbindir@/mkpop3dcert

DESCRIPTION

+ -->

Name

mkpop3dcert — create a test SSL certificate for POP3 over SSL

Synopsis

@sbindir@/mkpop3dcert

DESCRIPTION

POP3 over SSL requires a valid, signed, X.509 certificate. The default location for the certificate file is -@datadir@/pop3d.pem. @@ -446,14 +446,14 @@ diff -urN courier-0.58.0.orig/imap/mkpop3dcert.html.in courier-0.58.0/imap/mkpop -will not work if @datadir@/pop3d.pem already exists.

+will not work if @certsdir@/pop3d.pem already exists.

mkpop3dcert requires --OpenSSL to be installed.

FILES

@datadir@/pop3d.pem
-+OpenSSL to be installed.

FILES

@certsdir@/pop3d.pem
+-OpenSSL to be installed.

FILES

@datadir@/pop3d.pem
++OpenSSL to be installed.

FILES

@certsdir@/pop3d.pem
X.509 certificate.
@sysconfdir@/pop3d.cnf
Parameters used by OpenSSL to -diff -urN courier-0.58.0.orig/imap/mkpop3dcert.in courier-0.58.0/imap/mkpop3dcert.in ---- courier-0.58.0.orig/imap/mkpop3dcert.in 2007-11-04 21:53:05.000000000 +0100 -+++ courier-0.58.0/imap/mkpop3dcert.in 2008-01-19 23:42:50.974416143 +0100 +diff -urN courier-0.64.2.orig//imap/mkpop3dcert.in courier-0.64.2/imap/mkpop3dcert.in +--- courier-0.64.2.orig//imap/mkpop3dcert.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-0.64.2/imap/mkpop3dcert.in 2010-05-08 23:31:10.359913750 +0200 @@ -18,41 +18,41 @@ prefix="@prefix@" @@ -515,9 +515,9 @@ diff -urN courier-0.58.0.orig/imap/mkpop3dcert.in courier-0.58.0/imap/mkpop3dcer @CERTTOOL@ --generate-privkey --outfile pop3d.key @CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf -diff -urN courier-0.58.0.orig/imap/pop3d.cnf.openssl.in courier-0.58.0/imap/pop3d.cnf.openssl.in ---- courier-0.58.0.orig/imap/pop3d.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 -+++ courier-0.58.0/imap/pop3d.cnf.openssl.in 2008-01-19 23:43:08.841968023 +0100 +diff -urN courier-0.64.2.orig//imap/pop3d.cnf.openssl.in courier-0.64.2/imap/pop3d.cnf.openssl.in +--- courier-0.64.2.orig//imap/pop3d.cnf.openssl.in 2007-11-04 21:49:58.000000000 +0100 ++++ courier-0.64.2/imap/pop3d.cnf.openssl.in 2010-05-08 23:31:10.359913750 +0200 @@ -1,5 +1,5 @@ -RANDFILE = @mydatadir@/pop3d.rand @@ -525,10 +525,10 @@ diff -urN courier-0.58.0.orig/imap/pop3d.cnf.openssl.in courier-0.58.0/imap/pop3 [ req ] default_bits = 1024 -diff -urN courier-0.58.0.orig/imap/pop3d-ssl.dist.in courier-0.58.0/imap/pop3d-ssl.dist.in ---- courier-0.58.0.orig/imap/pop3d-ssl.dist.in 2008-01-19 23:30:56.000000000 +0100 -+++ courier-0.58.0/imap/pop3d-ssl.dist.in 2008-01-19 23:43:02.304977494 +0100 -@@ -241,7 +241,7 @@ +diff -urN courier-0.64.2.orig//imap/pop3d-ssl.dist.in courier-0.64.2/imap/pop3d-ssl.dist.in +--- courier-0.64.2.orig//imap/pop3d-ssl.dist.in 2010-05-08 23:28:14.479307068 +0200 ++++ courier-0.64.2/imap/pop3d-ssl.dist.in 2010-05-08 23:31:10.359913750 +0200 +@@ -248,7 +248,7 @@ # # This is an experimental feature. diff --git a/courier-db.patch b/courier-db.patch index cfbf94a..9d220c3 100644 --- a/courier-db.patch +++ b/courier-db.patch @@ -1,14 +1,18 @@ ---- courier-0.49.0/maildrop/Makefile.am.orig 2004-10-31 04:13:48.000000000 +0100 -+++ courier-0.49.0/maildrop/Makefile.am 2005-03-24 23:14:03.438223172 +0100 -@@ -63,9 +63,8 @@ - mailbot_SOURCES=mailbot.c - mailbot_DEPENDENCIES=../rfc822/librfc822.la ../liblock/liblock.la \ - ../numlib/libnumlib.la $(DBLIB) --mailbot_LDADD=../rfc822/librfc822.la ../liblock/liblock.la \ -- ../numlib/libnumlib.la $(DBLIB) +diff -urN courier-0.64.2.orig//maildrop/Makefile.am courier-0.64.2/maildrop/Makefile.am +--- courier-0.64.2.orig//maildrop/Makefile.am 2009-11-08 19:14:47.000000000 +0100 ++++ courier-0.64.2/maildrop/Makefile.am 2010-05-08 23:35:52.249468988 +0200 +@@ -64,10 +64,10 @@ + mailbot_DEPENDENCIES=../rfc2045/librfc2045.la \ + ../rfc822/librfc822.la ../liblock/liblock.la \ + ../numlib/libnumlib.la ../unicode/libunicode.la $(DBLIB) +-mailbot_LDADD=../rfc2045/librfc2045.la \ +- ../rfc822/librfc822.la ../liblock/liblock.la \ +- ../numlib/libnumlib.la ../unicode/libunicode.la $(DBLIB) -mailbot_LDFLAGS = -static -+mailbot_LDADD=../rfc822/.libs/librfc822.a ../liblock/.libs/liblock.a \ -+ ../numlib/.libs/libnumlib.a $(DBLIB) $(LIBGDBM) ++mailbot_LDADD=../rfc2045/.libs/librfc2045.la \ ++ ../rfc822/.libs/librfc822.la ../liblock/.libs/liblock.la \ ++ ../numlib/.libs/libnumlib.la ../unicode/.libs/libunicode.la \ ++ $(DBLIB) $(LIBGDBM) EXTRA_DIST = maildroptips.html $(BUILT_SOURCES)\ maildrop.lsm testsuite.txt diff --git a/courier-maildir.patch b/courier-maildir.patch index 4e004d9..feb4720 100644 --- a/courier-maildir.patch +++ b/courier-maildir.patch @@ -1,7 +1,7 @@ -diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in ---- old/courier/courierd.dist.in 2002-03-15 19:17:18.000000000 +0000 -+++ new/courier/courierd.dist.in 2004-08-02 16:55:29.000000000 +0000 -@@ -55,9 +55,9 @@ +diff -urN courier-0.64.2.orig//courier/courierd.dist.in courier-0.64.2/courier/courierd.dist.in +--- courier-0.64.2.orig//courier/courierd.dist.in 2009-11-08 19:14:47.000000000 +0100 ++++ courier-0.64.2/courier/courierd.dist.in 2010-05-08 23:27:21.826603250 +0200 +@@ -88,9 +88,9 @@ # One of the following definitions of DEFAULTDELIVERY should be # uncommented. # @@ -13,7 +13,7 @@ diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in # # Alternatively, use procmail to deliver mail to local mailboxes. # -@@ -71,12 +71,12 @@ +@@ -104,12 +104,12 @@ # use something like this: # # DEFAULTDELIVERY="|| dotforward @@ -28,7 +28,7 @@ diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in ##NAME: MAILDROPDEFAULT:0 # -@@ -84,7 +84,7 @@ +@@ -117,7 +117,7 @@ # the location of the default mailbox. You should not change this setting # unless you REALLY know what you're doing. @@ -37,45 +37,45 @@ diff -Nur old/courier/courierd.dist.in new/courier/courierd.dist.in ##NAME: ESMTP_CORK:0 # -diff -Nur old/imap/imapd.dist.in new/imap/imapd.dist.in ---- old/imap/imapd.dist.in 2004-01-25 05:40:04.000000000 +0000 -+++ new/imap/imapd.dist.in 2004-03-16 17:45:49.000000000 +0000 -@@ -371,4 +371,4 @@ +diff -urN courier-0.64.2.orig//imap/imapd.dist.in courier-0.64.2/imap/imapd.dist.in +--- courier-0.64.2.orig//imap/imapd.dist.in 2008-06-21 18:01:23.000000000 +0200 ++++ courier-0.64.2/imap/imapd.dist.in 2010-05-08 23:27:21.829937594 +0200 +@@ -417,4 +417,4 @@ # # MAILDIRPATH - directory name of the maildir directory. # -MAILDIRPATH=Maildir +MAILDIRPATH=Mail/Maildir -diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in ---- old/imap/imapd-ssl.dist.in 2004-06-26 15:09:58.000000000 +0000 -+++ new/imap/imapd-ssl.dist.in 2004-08-02 16:10:12.000000000 +0000 -@@ -194,4 +194,4 @@ +diff -urN courier-0.64.2.orig//imap/imapd-ssl.dist.in courier-0.64.2/imap/imapd-ssl.dist.in +--- courier-0.64.2.orig//imap/imapd-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200 ++++ courier-0.64.2/imap/imapd-ssl.dist.in 2010-05-08 23:27:21.829937594 +0200 +@@ -329,4 +329,4 @@ # # MAILDIRPATH - directory name of the maildir directory. # -MAILDIRPATH=Maildir +MAILDIRPATH=Mail/Maildir -diff -Nur old/imap/pop3d.dist.in new/imap/pop3d.dist.in ---- old/imap/pop3d.dist.in 2004-01-25 05:40:04.000000000 +0000 -+++ new/imap/pop3d.dist.in 2004-03-16 17:45:56.000000000 +0000 -@@ -145,4 +145,4 @@ +diff -urN courier-0.64.2.orig//imap/pop3d.dist.in courier-0.64.2/imap/pop3d.dist.in +--- courier-0.64.2.orig//imap/pop3d.dist.in 2005-07-05 14:42:51.000000000 +0200 ++++ courier-0.64.2/imap/pop3d.dist.in 2010-05-08 23:27:21.829937594 +0200 +@@ -143,4 +143,4 @@ # # MAILDIRPATH - directory name of the maildir directory. # -MAILDIRPATH=Maildir +MAILDIRPATH=Mail/Maildir -diff -Nur old/imap/pop3d-ssl.dist.in new/imap/pop3d-ssl.dist.in ---- old/imap/pop3d-ssl.dist.in 2004-06-26 15:09:59.000000000 +0000 -+++ new/imap/pop3d-ssl.dist.in 2004-08-02 16:10:20.000000000 +0000 -@@ -182,4 +182,4 @@ +diff -urN courier-0.64.2.orig//imap/pop3d-ssl.dist.in courier-0.64.2/imap/pop3d-ssl.dist.in +--- courier-0.64.2.orig//imap/pop3d-ssl.dist.in 2009-08-13 00:25:49.000000000 +0200 ++++ courier-0.64.2/imap/pop3d-ssl.dist.in 2010-05-08 23:27:21.835978217 +0200 +@@ -315,4 +315,4 @@ # # MAILDIRPATH - directory name of the maildir directory. # -MAILDIRPATH=Maildir +MAILDIRPATH=Mail/Maildir -diff -Nur old/pcp/pcpd.c new/pcp/pcpd.c ---- old/pcp/pcpd.c 2004-05-02 14:59:42.000000000 +0000 -+++ new/pcp/pcpd.c 2004-05-20 15:55:56.000000000 +0000 +diff -urN courier-0.64.2.orig//pcp/pcpd.c courier-0.64.2/pcp/pcpd.c +--- courier-0.64.2.orig//pcp/pcpd.c 2006-01-24 00:22:10.000000000 +0100 ++++ courier-0.64.2/pcp/pcpd.c 2010-05-08 23:27:21.835978217 +0200 @@ -2187,10 +2187,10 @@ exit(1); } @@ -89,10 +89,10 @@ diff -Nur old/pcp/pcpd.c new/pcp/pcpd.c strerror(errno)); maildir_cache_cancel(); exit(1); -diff -Nur old/webmail/auth.c new/webmail/auth.c ---- old/webmail/auth.c 2004-05-09 03:33:22.000000000 +0000 -+++ new/webmail/auth.c 2004-05-20 15:54:25.000000000 +0000 -@@ -82,7 +82,7 @@ +diff -urN courier-0.64.2.orig//webmail/auth.c courier-0.64.2/webmail/auth.c +--- courier-0.64.2.orig//webmail/auth.c 2009-06-27 18:32:50.000000000 +0200 ++++ courier-0.64.2/webmail/auth.c 2010-05-08 23:27:21.835978217 +0200 +@@ -79,7 +79,7 @@ if (!maildir || !*maildir) maildir=getenv("MAILDIRPATH"); if (!maildir || !*maildir) @@ -101,9 +101,9 @@ diff -Nur old/webmail/auth.c new/webmail/auth.c if (chdir(maildir)) return (-1); maildir_loginexec(); return (0); -diff -Nur old/webmail/sqwebmaild.dist.in new/webmail/sqwebmaild.dist.in ---- old/webmail/sqwebmaild.dist.in 2004-05-09 03:33:22.000000000 +0000 -+++ new/webmail/sqwebmaild.dist.in 2004-05-28 10:50:17.000000000 +0000 +diff -urN courier-0.64.2.orig//webmail/sqwebmaild.dist.in courier-0.64.2/webmail/sqwebmaild.dist.in +--- courier-0.64.2.orig//webmail/sqwebmaild.dist.in 2007-02-10 04:16:35.000000000 +0100 ++++ courier-0.64.2/webmail/sqwebmaild.dist.in 2010-05-08 23:27:21.835978217 +0200 @@ -32,7 +32,7 @@ # # MAILDIRPATH - directory name of the maildir directory. @@ -111,11 +111,11 @@ diff -Nur old/webmail/sqwebmaild.dist.in new/webmail/sqwebmaild.dist.in -MAILDIRPATH=Maildir +MAILDIRPATH=Mail/Maildir - ##NAME: AUTHMODULES:0 + ##NAME: SQWEBMAIL_PREFORK:0 # -diff -Nur old/webmail/sqwebmail.h new/webmail/sqwebmail.h ---- old/webmail/sqwebmail.h 2004-02-29 20:50:13.000000000 +0000 -+++ new/webmail/sqwebmail.h 2004-04-15 10:58:47.000000000 +0000 +diff -urN courier-0.64.2.orig//webmail/sqwebmail.h courier-0.64.2/webmail/sqwebmail.h +--- courier-0.64.2.orig//webmail/sqwebmail.h 2007-02-24 20:02:59.000000000 +0100 ++++ courier-0.64.2/webmail/sqwebmail.h 2010-05-08 23:27:21.835978217 +0200 @@ -25,7 +25,7 @@ /* Location of the user's Maildir */ diff --git a/courier-sendmail_dir.patch b/courier-sendmail_dir.patch index 6bb6405..ab96942 100644 --- a/courier-sendmail_dir.patch +++ b/courier-sendmail_dir.patch @@ -1,14 +1,34 @@ -diff -Nur old/courier/Makefile.am new/courier/Makefile.am ---- old/courier/Makefile.am 2006-03-26 15:33:12.000000000 +0000 -+++ new/courier/Makefile.am 2006-11-07 19:10:21.776006250 +0000 -@@ -51,7 +51,7 @@ +diff -ur courier-0.64.2.orig//courier/cmlm.h courier-0.64.2/courier/cmlm.h +--- courier-0.64.2.orig//courier/cmlm.h 2007-03-11 05:44:43.000000000 +0100 ++++ courier-0.64.2/courier/cmlm.h 2010-05-08 23:28:42.329517182 +0200 +@@ -22,6 +22,7 @@ + #include + #include + ++#define SBINDIR "/usr/sbin" + #define TMP "tmp" + #define TMPLOCK "tmp.lock" + +@@ -56,7 +57,7 @@ + + #include "bindir.h" + +-#define SENDMAIL BINDIR "/sendmail" ++#define SENDMAIL SBINDIR "/sendmail" + #define REFORMIME BINDIR "/reformime" + #define MAXRCPTS 20 + +diff -ur courier-0.64.2.orig//courier/Makefile.am courier-0.64.2/courier/Makefile.am +--- courier-0.64.2.orig//courier/Makefile.am 2009-12-19 01:59:59.000000000 +0100 ++++ courier-0.64.2/courier/Makefile.am 2010-05-08 23:28:42.329517182 +0200 +@@ -49,7 +49,7 @@ extrabin=maildrop lockmail reformail reformime mailbot mimegpg \ imapd makemime deliverquota maildirmake maildiracl maildirkw -bin_PROGRAMS=cancelmsg mailq sendmail \ +bin_PROGRAMS=cancelmsg mailq \ testmxlookup dotforward \ - couriermlm \ + couriermlm webmlmd \ courier-config @couriertls@ @EXTRABIN@ @@ -63,7 +63,7 @@ sbin_SCRIPTS=@SBINSCRIPTS@ @@ -19,23 +39,3 @@ diff -Nur old/courier/Makefile.am new/courier/Makefile.am @COURIERLDAPALIASD@ @EXTRASBIN@ sysconf_DATA=pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \ -diff -Nur old/courier/cmlm.h new/courier/cmlm.h ---- old/courier/cmlm.h 2005-04-03 16:22:06.000000000 +0000 -+++ new/courier/cmlm.h 2006-11-07 19:11:13.283225250 +0000 -@@ -18,6 +18,7 @@ - - using namespace std; - -+#define SBINDIR "/usr/sbin" - #define TMP "tmp" - #define TMPLOCK "tmp.lock" - -@@ -52,7 +53,7 @@ - - #include "bindir.h" - --#define SENDMAIL BINDIR "/sendmail" -+#define SENDMAIL SBINDIR "/sendmail" - #define REFORMIME BINDIR "/reformime" - #define MAXRCPTS 20 - diff --git a/courier-start_scripts.patch b/courier-start_scripts.patch index b991903..2194671 100644 --- a/courier-start_scripts.patch +++ b/courier-start_scripts.patch @@ -1,6 +1,6 @@ -diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in ---- old/courier/imapd.rc.in 2005-07-02 02:11:16.000000000 +0000 -+++ new/courier/imapd.rc.in 2005-08-16 20:48:40.869430152 +0000 +diff -urN courier-0.64.2.orig//courier/imapd.rc.in courier-0.64.2/courier/imapd.rc.in +--- courier-0.64.2.orig//courier/imapd.rc.in 2005-07-02 04:11:16.000000000 +0200 ++++ courier-0.64.2/courier/imapd.rc.in 2010-05-08 23:30:04.683888399 +0200 @@ -48,6 +48,7 @@ ;; stop) @@ -9,9 +9,9 @@ diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in ;; restart) @courierlogger@ -pid=$PIDFILE -restart -diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in ---- old/courier/imapd-ssl.rc.in 2005-07-02 23:51:38.000000000 +0000 -+++ new/courier/imapd-ssl.rc.in 2005-08-16 20:49:03.195036144 +0000 +diff -urN courier-0.64.2.orig//courier/imapd-ssl.rc.in courier-0.64.2/courier/imapd-ssl.rc.in +--- courier-0.64.2.orig//courier/imapd-ssl.rc.in 2005-07-03 00:53:19.000000000 +0200 ++++ courier-0.64.2/courier/imapd-ssl.rc.in 2010-05-08 23:30:04.685962634 +0200 @@ -49,6 +49,7 @@ ;; stop) @@ -20,9 +20,9 @@ diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in ;; esac exit 0 -diff -Nur old/courier/module.esmtp/esmtpd.in new/courier/module.esmtp/esmtpd.in ---- old/courier/module.esmtp/esmtpd.in 2005-02-16 23:42:13.000000000 +0000 -+++ new/courier/module.esmtp/esmtpd.in 2005-07-03 22:13:30.440224352 +0000 +diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd.in courier-0.64.2/courier/module.esmtp/esmtpd.in +--- courier-0.64.2.orig//courier/module.esmtp/esmtpd.in 2009-07-30 04:29:54.000000000 +0200 ++++ courier-0.64.2/courier/module.esmtp/esmtpd.in 2010-05-08 23:30:04.695962596 +0200 @@ -38,6 +38,7 @@ ;; stop) @@ -31,9 +31,9 @@ diff -Nur old/courier/module.esmtp/esmtpd.in new/courier/module.esmtp/esmtpd.in exit 0 ;; restart) -diff -Nur old/courier/module.esmtp/esmtpd-ssl.in new/courier/module.esmtp/esmtpd-ssl.in ---- old/courier/module.esmtp/esmtpd-ssl.in 2005-02-16 23:42:13.000000000 +0000 -+++ new/courier/module.esmtp/esmtpd-ssl.in 2005-07-03 22:13:01.767583256 +0000 +diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.in courier-0.64.2/courier/module.esmtp/esmtpd-ssl.in +--- courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.in 2009-07-30 04:29:54.000000000 +0200 ++++ courier-0.64.2/courier/module.esmtp/esmtpd-ssl.in 2010-05-08 23:30:04.695962596 +0200 @@ -28,6 +28,7 @@ ;; stop) @@ -42,9 +42,9 @@ diff -Nur old/courier/module.esmtp/esmtpd-ssl.in new/courier/module.esmtp/esmtpd exit 0 ;; restart) -diff -Nur old/courier/pop3d.in new/courier/pop3d.in ---- old/courier/pop3d.in 2005-07-02 02:11:16.000000000 +0000 -+++ new/courier/pop3d.in 2005-08-16 20:49:27.358362760 +0000 +diff -urN courier-0.64.2.orig//courier/pop3d.in courier-0.64.2/courier/pop3d.in +--- courier-0.64.2.orig//courier/pop3d.in 2005-07-02 04:11:16.000000000 +0200 ++++ courier-0.64.2/courier/pop3d.in 2010-05-08 23:30:04.695962596 +0200 @@ -42,6 +42,7 @@ ;; stop) @@ -53,9 +53,9 @@ diff -Nur old/courier/pop3d.in new/courier/pop3d.in exit 0 ;; restart) -diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in ---- old/courier/pop3d-ssl.in 2005-07-02 23:51:38.000000000 +0000 -+++ new/courier/pop3d-ssl.in 2005-08-16 20:49:16.509012112 +0000 +diff -urN courier-0.64.2.orig//courier/pop3d-ssl.in courier-0.64.2/courier/pop3d-ssl.in +--- courier-0.64.2.orig//courier/pop3d-ssl.in 2005-07-03 01:24:34.000000000 +0200 ++++ courier-0.64.2/courier/pop3d-ssl.in 2010-05-08 23:30:04.695962596 +0200 @@ -52,6 +52,7 @@ ;; stop) @@ -64,10 +64,10 @@ diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in ;; restart) @courierlogger@ -pid=$SSLPIDFILE -restart -diff -Nur old/courier/webmaild.in new/courier/webmaild.in ---- old/courier/webmaild.in 2005-02-16 23:42:13.000000000 +0000 -+++ new/courier/webmaild.in 2005-07-03 22:15:29.401139544 +0000 -@@ -42,6 +42,8 @@ +diff -urN courier-0.64.2.orig//courier/webmaild.in courier-0.64.2/courier/webmaild.in +--- courier-0.64.2.orig//courier/webmaild.in 2007-07-01 00:07:21.000000000 +0200 ++++ courier-0.64.2/courier/webmaild.in 2010-05-08 23:30:04.695962596 +0200 +@@ -43,6 +43,8 @@ stop) @courierlogger@ -pid=${PIDFILE} -stop @courierlogger@ -pid=${PIDFILE}.pcp -stop @@ -76,9 +76,9 @@ diff -Nur old/courier/webmaild.in new/courier/webmaild.in ;; reload) @courierlogger@ -pid=${PIDFILE} -restart -diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in ---- old/courier.sysvinit.in 2005-05-12 15:21:52.000000000 +0000 -+++ new/courier.sysvinit.in 2005-07-03 22:12:14.255806144 +0000 +diff -urN courier-0.64.2.orig//courier.sysvinit.in courier-0.64.2/courier.sysvinit.in +--- courier-0.64.2.orig//courier.sysvinit.in 2009-08-29 04:51:52.000000000 +0200 ++++ courier-0.64.2/courier.sysvinit.in 2010-05-08 23:30:04.695962596 +0200 @@ -8,6 +8,9 @@ # # @@ -88,8 +88,8 @@ diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in + prefix="@prefix@" exec_prefix="@exec_prefix@" - sysconfdir="@sysconfdir@" -@@ -24,6 +27,11 @@ + datarootdir="@datarootdir@" +@@ -25,6 +28,11 @@ case "$1" in start) @@ -101,7 +101,7 @@ diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in cd / # Start daemons. touch /var/lock/subsys/courier -@@ -190,6 +198,8 @@ +@@ -200,6 +208,8 @@ echo "" ;; stop) @@ -109,8 +109,8 @@ diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in + echo -n "Stopping Courier mail server:" - if test -x ${sbindir}/imapd -@@ -244,6 +254,11 @@ + if test -x ${bindir}/webmlmd +@@ -260,6 +270,11 @@ ${sbindir}/courierfilter stop echo " courierfilter" rm -f /var/lock/subsys/courier diff --git a/courier-withoutfam.patch b/courier-withoutfam.patch index b5be938..4145595 100644 --- a/courier-withoutfam.patch +++ b/courier-withoutfam.patch @@ -1,7 +1,7 @@ -diff -Nur old/maildir/configure.in new/maildir/configure.in ---- old/maildir/configure.in 2004-01-11 02:59:03.000000000 +0000 -+++ new/maildir/configure.in 2004-03-16 18:16:07.000000000 +0000 -@@ -60,20 +60,7 @@ +diff -ur courier-0.64.2.orig//maildir/configure.in courier-0.64.2/maildir/configure.in +--- courier-0.64.2.orig//maildir/configure.in 2008-11-28 02:08:00.000000000 +0100 ++++ courier-0.64.2/maildir/configure.in 2010-05-08 23:25:47.222654406 +0200 +@@ -71,20 +71,7 @@ dnl Checks for library functions. AC_CHECK_HEADER(fam.h, :, :) AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes) -- 2.44.0