-diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in
---- old/courier/imapd.rc.in 2005-04-03 16:22:06.000000000 +0000
-+++ new/courier/imapd.rc.in 2005-07-03 22:14:25.431864352 +0000
-@@ -49,6 +49,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 2005-04-03 16:22:06.000000000 +0000
-+++ new/courier/imapd-ssl.rc.in 2005-07-03 22:14:09.644264432 +0000
-@@ -50,6 +50,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 2005-02-16 23:42:13.000000000 +0000
-+++ new/courier/module.esmtp/esmtpd.in 2005-07-03 22:13:30.440224352 +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 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)
exit 0
;;
restart)
-diff -Nur old/courier/pop3d.in new/courier/pop3d.in
---- old/courier/pop3d.in 2005-04-03 16:22:06.000000000 +0000
-+++ new/courier/pop3d.in 2005-07-03 22:14:57.855935144 +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 2005-04-03 16:22:06.000000000 +0000
-+++ new/courier/pop3d-ssl.in 2005-07-03 22:14:41.899360912 +0000
-@@ -53,6 +53,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/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 @@
+ @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
;;
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 @@
#
#
+
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
-@@ -190,6 +198,8 @@
+@@ -200,6 +208,8 @@
echo ""
;;
stop)
+
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