-diff -Nur old/courier/configure.in new/courier/configure.in
---- old/courier/configure.in 2003-10-30 00:53:31.000000000 +0000
-+++ new/courier/configure.in 2004-03-02 12:51:12.000000000 +0000
-@@ -547,6 +547,7 @@
-
- eval "exec_prefix=$exec_prefix"
- eval "bindir=$bindir"
-+eval "datadir=$datadir"
-
- MAILDROP="$bindir/maildrop"
- AC_SUBST(MAILDROP)
-diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
---- old/courier/imapd.rc.in 2004-02-24 15:15:10.000000000 +0000
-+++ new/courier/imapd.rc.in 2004-03-02 12:44:49.000000000 +0000
-@@ -53,6 +53,7 @@
+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)
- @sbindir@/couriertcpd -pid=$PIDFILE -stop
+ @courierlogger@ -pid=$PIDFILE -stop
+ rm -f $PIDFILE
;;
restart)
- @sbindir@/couriertcpd -pid=$PIDFILE -restart
-diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in
---- old/courier/imapd-ssl.rc.in 2004-02-24 15:15:10.000000000 +0000
-+++ new/courier/imapd-ssl.rc.in 2004-03-02 14:06:44.000000000 +0000
-@@ -28,6 +28,11 @@
-
- case $1 in
- start)
-+ # If we do not have a certificate, make one up.
-+ if [ ! -f @datadir@/imapd.pem ]; then
-+ @sbindir@/mkimapdcert
-+ fi
-+
- LIBAUTHMODULES=""
- for f in `echo $AUTHMODULES`
- do
-@@ -54,6 +59,7 @@
+ @courierlogger@ -pid=$PIDFILE -restart
+--- courier-1.1.8.orig//courier/imapd-ssl.rc.in 2005-07-03 00:53:19.000000000 +0200
++++ courier-1.1.8/courier/imapd-ssl.rc.in 2010-05-08 23:30:04.685962634 +0200
+@@ -73,6 +73,7 @@ start)
;;
stop)
- @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
+ @courierlogger@ -pid=$SSLPIDFILE -stop
+ rm -f $SSLPIDFILE
;;
- esac
- exit 0
-diff -Nur old/courier/module.esmtp/esmtpd.in new/courier/module.esmtp/esmtpd.in
---- old/courier/module.esmtp/esmtpd.in 2001-08-05 20:36:08.000000000 +0000
-+++ new/courier/module.esmtp/esmtpd.in 2004-03-02 12:44:24.000000000 +0000
+ restart)
+ @courierlogger@ -pid=$SSLPIDFILE -restart
+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)
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 2002-07-09 19:38:18.000000000 +0000
-+++ new/courier/module.esmtp/esmtpd-ssl.in 2004-03-02 14:06:51.000000000 +0000
-@@ -25,9 +25,14 @@
-
- case $1 in
- start)
-+ # If we do not have a certificate, make one up.
-+ if [ ! -f @datadir@/esmtpd.pem ]; then
-+ @sbindir@/mkesmtpdcert
-+ fi
+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)
${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop
exit 0
;;
restart)
-diff -Nur old/courier/pop3d.in new/courier/pop3d.in
---- old/courier/pop3d.in 2004-02-24 15:15:10.000000000 +0000
-+++ new/courier/pop3d.in 2004-03-02 12:45:16.000000000 +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)
- ${sbindir}/couriertcpd -pid=$PIDFILE -stop
+ @courierlogger@ -pid=$PIDFILE -stop
+ rm -f $PIDFILE
exit 0
;;
restart)
-diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in
---- old/courier/pop3d-ssl.in 2004-02-24 15:15:10.000000000 +0000
-+++ new/courier/pop3d-ssl.in 2004-03-02 14:06:40.000000000 +0000
-@@ -29,6 +29,11 @@
-
- case $1 in
- start)
-+ # If we do not have a certificate, make one up.
-+ if [ ! -f @datadir@/pop3d.pem ]; then
-+ @sbindir@/mkpop3dcert
-+ fi
-+
- LIBAUTHMODULES=""
- for f in `echo $AUTHMODULES`
- do
-@@ -58,6 +63,7 @@
+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)
- @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop
+ @courierlogger@ -pid=$SSLPIDFILE -stop
+ rm -f $SSLPIDFILE
;;
restart)
- @sbindir@/couriertcpd -pid=$SSLPIDFILE -restart
-diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in
---- old/courier.sysvinit.in 2003-11-28 02:31:55.000000000 +0000
-+++ new/courier.sysvinit.in 2004-03-02 17:06:32.000000000 +0000
+ @courierlogger@ -pid=$SSLPIDFILE -restart
+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
++ rm -f ${PIDFILE}
++ rm -f ${PIDFILE}.pcp
+ ;;
+ reload)
+ @courierlogger@ -pid=${PIDFILE} -restart
+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 @@
#
#
+
prefix="@prefix@"
exec_prefix="@exec_prefix@"
- sysconfdir="@sysconfdir@"
-@@ -24,6 +27,11 @@
+ datarootdir="@datarootdir@"
+@@ -25,6 +28,11 @@
case "$1" in
start)
cd /
# Start daemons.
touch /var/lock/subsys/courier
-@@ -209,6 +217,9 @@
+@@ -200,6 +208,8 @@
echo ""
;;
stop)
+ if [ -e /var/lock/subsys/courier ]; then
+
-+ rm -f /var/lock/subsys/courier
echo -n "Stopping Courier mail server:"
- if test -x ${sbindir}/imapd
-@@ -273,6 +284,10 @@
- fi
+ if test -x ${bindir}/webmlmd
+@@ -260,6 +270,11 @@
${sbindir}/courierfilter stop
echo " courierfilter"
+ rm -f /var/lock/subsys/courier
+
+ else
-+ msg_not_running Courier
++ msg_not_running Courier
+ fi
++
;;
restart)
$0 stop