3 files changed, 39 insertions, 9 deletions

diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.sh.in
index 7ad2acdb899a..a2ec2e2f7fa4 100644
--- a/mail/courier/files/courier.sh.in
+++ b/mail/courier/files/courier.sh.in
@@ -247,12 +247,30 @@ courier_start()
 		esac
 	fi
 	echo "."
+
+	LISTS=""
+	if [ -f ${sysconfdir}/webmlmrc ]; then 
+		. ${sysconfdir}/webmlmrc
+		if [ -n "$LISTS" ];then
+			if [ -x ${bindir}/webmlmd \
+			  -a -x ${bindir}/webmlmd.rc ]; then
+				echo -n " webmlmd"
+				${bindir}/webmlmd.rc start ${sysconfdir}/webmlmrc
+			fi
+		fi
+	fi
 }
 
 courier_stop()
 {	# kill courier services in the reverse order of starting them
 	echo -n "Stopping"
 
+	if [ -x ${bindir}/webmlmd \
+	  -a -x ${bindir}/webmlmd.rc ]; then
+		echo -n " webmlmd"
+		${bindir}/webmlmd.rc stop ${sysconfdir}/webmlmrc
+	fi
+
 	if [ -x ${sbindir}/pop3d-ssl ]; then
 		echo -n " pop3d-ssl"
 		${sbindir}/pop3d-ssl stop
diff --git a/mail/courier/files/patch-courier__cmlm.h b/mail/courier/files/patch-courier__cmlm.h
new file mode 100644
index 000000000000..f38f744a4dc2
--- /dev/null
+++ b/mail/courier/files/patch-courier__cmlm.h
@@ -0,0 +1,11 @@
+--- courier/cmlm.h.orig	2007-04-29 11:59:40.000000000 -0400
++++ courier/cmlm.h	2007-04-29 11:59:40.000000000 -0400
+@@ -56,7 +56,7 @@
+ 
+ #include	"bindir.h"
+ 
+-#define	SENDMAIL	BINDIR "/sendmail"
++#define	SENDMAIL	"/usr/sbin/sendmail"
+ #define	REFORMIME	BINDIR "/reformime"
+ #define	MAXRCPTS	20
+ 
diff --git a/mail/courier/files/patch-courier__perms.sh.in b/mail/courier/files/patch-courier__perms.sh.in
index 03feaf7a3202..fe80b2bf349b 100644
--- a/mail/courier/files/patch-courier__perms.sh.in
+++ b/mail/courier/files/patch-courier__perms.sh.in
@@ -1,7 +1,7 @@
---- courier/perms.sh.in.orig	Thu Jan 27 21:53:58 2005
-+++ courier/perms.sh.in	Thu Jan 27 21:53:58 2005
-@@ -10,9 +10,6 @@
- exec_prefix="@exec_prefix@"
+--- courier/perms.sh.in.orig	2007-07-01 11:36:31.000000000 -0400
++++ courier/perms.sh.in	2007-07-01 11:36:31.000000000 -0400
+@@ -11,9 +11,6 @@
+ datarootdir="@datarootdir@"
  
  PERMS="
 -.			755
@@ -10,7 +10,7 @@
  @localstatedir@/tmp	770
  @localstatedir@/msgs	750
  @localstatedir@/msgq	750
-@@ -45,7 +42,6 @@
+@@ -47,7 +44,6 @@
  @sysconfdir@/rfcerr2046.txt	444	config
  @sysconfdir@/rfcerr2047.txt	444	config
  
@@ -18,13 +18,14 @@
  @libexecdir@/courier	755	x	bin	bin
  @libexecdir@/courier/modules	755	x	bin	bin
  @libexecdir@/courier/submitmkdir	4550
-@@ -59,13 +55,12 @@
+@@ -61,14 +57,13 @@
  @libexecdir@/courier/makedatprog	555
  @libexecdir@/courier/imaplogin		555	x	bin	bin
  @libexecdir@/courier/pcpd		555	x	bin	bin
 -@libexecdir@/courier/webmail		700	x	root	bin
 +@libexecdir@/courier/webmail		500	x	root	bin
  @libexecdir@/courier/webmail/webmail	555	x	root	bin
+ @libexecdir@/courier/webmail/webmlm	555	x	root	bin
  @libexecdir@/courier/sqwebmaild		555
 -@libexecdir@/courier/sqwebpasswd	2755
 -@libexecdir@/courier/webmail/webadmin	4555	x	root	bin
@@ -35,7 +36,7 @@
  @sbindir@/courier		555
  @sbindir@/showconfig		555
  @sbindir@/showmodules		550
-@@ -78,7 +73,6 @@
+@@ -82,7 +77,6 @@
  @datadir@/imapd			555	x	bin	bin
  @datadir@/imapd-ssl		555	x	bin	bin
  
@@ -43,7 +44,7 @@
  @bindir@/cancelmsg		6555
  @bindir@/courier-config		555
  @bindir@/mailq			2555
-@@ -105,10 +99,10 @@
+@@ -111,10 +105,10 @@
  @sbindir@/makealiases		550
  @datadir@/makehosteddomains	555
  @sbindir@/makehosteddomains	555
@@ -58,7 +59,7 @@
  @sbindir@/webgpg		555
  
  @datadir@			755	x	bin	bin
-@@ -202,7 +196,7 @@
+@@ -226,7 +220,7 @@
  if test "@HAVE_LDAP@" != 0
  then
  	echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config