Update mail/courier-mta to 0.56.0. Changes from version 0.53.2 include:

    + Drop the uucp module from the default option set.

    + Patch the webmlm sources to not use "stdin" and "stdout" as function or
      member names as they can be macros according to the C standards.

    * webadmin: Remove check that prevents multiple virtual domains to
      be aliased to the same account.

    * webmlmd: new CGI module that can manage a Courier mailing list
      created with couriermlm.

    * Rewrite and code cleanup of couriermlm.

    * Use domain name, not MX hostname, for looking up authenticated
      SMTP passwords in esmtpauthclient

16 files changed, 255 insertions, 96 deletions

diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa
index 4e1245c71f3..e0fd0a5979d 100644
--- a/mail/courier-mta/patches/patch-aa
+++ b/mail/courier-mta/patches/patch-aa
@@ -1,53 +1,62 @@
-$NetBSD: patch-aa,v 1.2 2006/06/09 22:12:18 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2007/08/10 17:57:04 jlam Exp $
 
---- courier/Makefile.in.orig	2006-06-09 14:58:20.000000000 -0400
+--- courier/Makefile.in.orig	2007-06-23 07:56:06.000000000 -0400
 +++ courier/Makefile.in
-@@ -52,17 +52,17 @@ build_triplet = @build@
+@@ -50,18 +50,18 @@ build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
  pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
 -	aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
--	@EXTRAPKGLIB@ $(am__empty)
--webmail_PROGRAMS = webmail$(EXEEXT)
 +	aliascreate$(EXEEXT) submit$(EXEEXT) \
-+	$(am__empty)
-+webmail_PROGRAMS = 
+ 	@EXTRAPKGLIB@ $(am__empty)
+-webmail_PROGRAMS = webmail$(EXEEXT) webmlm$(EXEEXT)
++webmail_PROGRAMS = webmlm$(EXEEXT)
  EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT)
  bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \
  	testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \
--	courier-config$(EXEEXT) @couriertls@ @EXTRABIN@
-+	courier-config$(EXEEXT)
- sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
- 	showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
--	@EXTRASBIN@ $(am__empty)
+-	webmlmd$(EXEEXT) courier-config$(EXEEXT) @couriertls@ \
++	webmlmd$(EXEEXT) courier-config$(EXEEXT) \
+ 	@EXTRABIN@ $(am__empty)
+-sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
+-	showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
++sbin_PROGRAMS = courier$(EXEEXT) courier-showconfig$(EXEEXT) \
++	courier-showmodules$(EXEEXT) aliaslookup$(EXEEXT) @COURIERLDAPALIASD@ \
+ 	@EXTRASBIN@ $(am__empty)
 -cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
-+	$(am__empty)
-+cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT)
++cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@ 
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	$(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \
-@@ -402,7 +402,7 @@ RFCERRTXTIN = rfcerrheader.txt
+@@ -420,7 +420,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
+ 	uidgid.h configargs.h sort.h webmlmdhandlerslist.H
+ RFCERRTXTIN = rfcerrheader.txt
  RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
- extrapkglib = makedatprog courierpop3login pcpd
+-extrapkglib = makedatprog courierpop3login pcpd
++extrapkglib = 
  pkglibexecdir = $(libexecdir)/courier
--webmaildir = $(libexecdir)/courier/webmail
-+webmaildir = $(pkglibexecdir)/cgi-bin
+ webmaildir = $(libexecdir)/courier/webmail
  webmail_SOURCES = 
- sqwebmaild_SOURCES = 
+@@ -428,22 +428,19 @@ sqwebmaild_SOURCES = 
  
-@@ -413,16 +413,14 @@ extrabin = maildrop lockmail reformail r
+ # Don't forget to change perms.sh.in, if webmailimagedir moves.
+ webmailimagedir = $(datadir)/sqwebmail/images
+-extrabin = maildrop lockmail reformail reformime mailbot mimegpg \
+-	imapd makemime deliverquota maildirmake maildiracl maildirkw
++extrabin = 
  
- extrasbin = couriertcpd$(EXEEXT)
- sbinscripts = sharedindexsplit sharedindexinstall webmaild
--sbin_SCRIPTS = @SBINSCRIPTS@
-+sbin_SCRIPTS = 
+ bin_SCRIPTS = webmlmd.rc
+-extrasbin = couriertcpd$(EXEEXT)
+-sbinscripts = sharedindexsplit sharedindexinstall webmaild
++extrasbin = 
++sbinscripts = 
+ sbin_SCRIPTS = @SBINSCRIPTS@
  EXTRA_SCRIPTS = 
 -sysconf_DATA = pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \
 +sysconf_DATA = \
  	courierd.dist @LDAPALIASRC@ \
 -	imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
--	quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN)
-+	$(RFCERRTXTNOIN) $(RFCERRTXTIN)
+-	quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN) webmlmrc.dist
++	$(RFCERRTXTNOIN) $(RFCERRTXTIN) webmlmrc.dist
  
  databindir = $(datadir)
 -databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \
@@ -55,8 +64,30 @@ $NetBSD: patch-aa,v 1.2 2006/06/09 22:12:18 jlam Exp $
 +databin_SCRIPTS = courierctl.start makealiases makehosteddomains
  
  mlmdatadir = $(datadir)/couriermlm
- mlmdata_DATA = adminrequest.tmpl confsubj.tmpl digestsubj.tmpl fetch.tmpl \
-@@ -1673,27 +1671,10 @@ install-exec-hook:
+ mlmdata_DATA = \
+@@ -499,7 +496,7 @@ mlmdata_DATA = \
+ 	webmlmsublist.tmpl.html \
+ 	webmlm.tmpl.html
+ 
+-extracmdlib = courierpop3d imaplogin
++extracmdlib = 
+ cmdlibdir = @libexecdir@/courier
+ 
+ # Subdirectories
+@@ -1652,6 +1649,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
+ courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT)
+ 	cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
+ 
++courier-showconfig$(EXEEXT): showconfig$(EXEEXT)
++	cp -f showconfig$(EXEEXT) courier-showconfig$(EXEEXT)
++
++courier-showmodules$(EXEEXT): showmodules$(EXEEXT)
++	cp -f showmodules$(EXEEXT) courier-showmodules$(EXEEXT)
++
+ sort.h:
+ 	echo '#define SORT "$(SORT)"' >sort.h
+ 
+@@ -1813,33 +1816,16 @@ install-exec-hook:
  		$(localstatedir)/track\
  		$(localstatedir)/msgs $(localstatedir)/msgq ; do \
  			$(mkinstalldirs) $(DESTDIR)$$d || :; done
@@ -77,16 +108,22 @@ $NetBSD: patch-aa,v 1.2 2006/06/09 22:12:18 jlam Exp $
  		; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
  		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
 -	rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg
--	$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
+ 	$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
 -	mkdir -p $(DESTDIR)$(sysconfdir)/shared
 -	chmod 755 $(DESTDIR)$(sysconfdir)/shared
 -	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
 -	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
-+	$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/courierwebadmin
  
  install-data-hook:
  	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
-@@ -1711,10 +1692,6 @@ install-data-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/smtpaccess
+-	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliasdir
+ 	echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildrop
++	echo @MAILDROP@ >$(DESTDIR)$(sysconfdir)/maildropfilter
+ 	test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
+ 		echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
+ 	test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
+@@ -1851,10 +1837,6 @@ install-data-hook:
  	rm -f $(DESTDIR)$(bindir)/rmail
  	$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
  	-$(mkinstalldirs) $(DESTDIR)@mandir@/man8
diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab
index 82e2eb8d810..6d9b235f678 100644
--- a/mail/courier-mta/patches/patch-ab
+++ b/mail/courier-mta/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2007/08/10 17:57:04 jlam Exp $
 
---- courier/configure.orig	2006-02-25 12:28:52.000000000 -0500
+--- courier/configure.orig	2007-06-23 07:56:05.000000000 -0400
 +++ courier/configure
-@@ -22684,9 +22684,9 @@ done
+@@ -21745,9 +21745,9 @@ done
  
  if test "$testmode" = "0"
  then
diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac
index e8f2bf1e50e..26d8a4e9220 100644
--- a/mail/courier-mta/patches/patch-ac
+++ b/mail/courier-mta/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2006/06/09 22:12:18 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2007/08/10 17:57:04 jlam Exp $
 
---- courier/doc/Makefile.in.orig	2006-04-12 19:26:24.000000000 -0400
+--- courier/doc/Makefile.in.orig	2007-05-12 23:03:54.000000000 -0400
 +++ courier/doc/Makefile.in
 @@ -141,7 +141,7 @@ target_alias = @target_alias@
  version = @version@
  htmldocdir = @datadir@/htmldoc
  CLEANFILES = permissions.dat
--miscfiles = japanese_flag.png bg.gif icon.gif manpage.css \
-+miscfiles = japanese_flag.png bg.gif icon.gif \
+-miscfiles = japanese_flag.png chinese_flag.png bg.gif icon.gif manpage.css \
++miscfiles = japanese_flag.png chinese_flag.png bg.gif icon.gif \
  		draft-varshavchik-exdata-smtpext.txt \
  		draft-varshavchik-verp-smtpext.txt \
  		draft-varshavchik-security-smtpext.txt \
-@@ -179,65 +179,37 @@ htmlin = \
+@@ -179,66 +179,39 @@ htmlin = \
  		courier.html \
  		courierldapaliasd.html \
  		couriermlm.html \
@@ -56,13 +56,14 @@ $NetBSD: patch-ac,v 1.2 2006/06/09 22:12:18 jlam Exp $
 -		reformime.html \
  		sendmail.html \
  		submit.html \
- 		testmxlookup.html
+ 		testmxlookup.html \
+ 		webmlmd.html
  
  htmldoc_DATA = $(nohtmlin) $(htmlin)
 -man1 = sendmail.1 preline.1 maildirmake.1 cancelmsg.1 lockmail.1 maildrop.1 \
 -	mailq.1 mailbot.1 makemime.1 mimegpg.1 maildiracl.1 \
 -	makedat.1 reformail.1 reformime.1 couriermlm.1 testmxlookup.1 \
--	dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1
+-	dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 webmlmd.1
 -
 -man5 = dot-courier.5 maildir.5
 -man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \
@@ -70,25 +71,25 @@ $NetBSD: patch-ac,v 1.2 2006/06/09 22:12:18 jlam Exp $
 +man1 = sendmail.1 preline.1 cancelmsg.1 \
 +	mailq.1 \
 +	couriermlm.1 testmxlookup.1 \
-+	dot-forward.1
++	dot-forward.1 webmlmd.1
  
 -man8 = aliaslookup.8 courier.8 courierldapaliasd.8 courierpop3d.8 \
--	deliverquota.8 \
 +man5 = dot-courier.5
 +man7 = localmailfilter.7
 +
 +man8 = aliaslookup.8 courier.8 courierldapaliasd.8 \
+ 	deliverquota.8 \
  	esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
 -	mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
 +	mkesmtpdcert.8 \
  	makealiases.8 makepercentrelay.8 makesmtpaccess.8 \
 -	pop3d.8 submit.8 imapd.8
-+	pop3d.8 submit.8
++	submit.8
  
  BUILT_SOURCES = \
  	aliaslookup.html aliaslookup.8 \
-@@ -263,7 +235,7 @@ BUILT_SOURCES = \
- 	testmxlookup.html testmxlookup.1
+@@ -265,7 +238,7 @@ BUILT_SOURCES = \
+ 	webmlmd.html.in webmlmd.1.in
  
  EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
 -man_LINKS = $(man8dir)/courierpop3login.8 \
@@ -96,7 +97,7 @@ $NetBSD: patch-ac,v 1.2 2006/06/09 22:12:18 jlam Exp $
  	$(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
  	$(man8dir)/makesmtpaccess-msa.8 \
  	$(man8dir)/esmtpd-msa.8
-@@ -1125,8 +1097,7 @@ preline.1: preline.1.in
+@@ -1139,8 +1112,7 @@ preline.1: preline.1.in
  
  install-man-extra:
  	cd $(DESTDIR)$(man8dir) ; \
diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad
index d8fcaea4963..b60bae8843b 100644
--- a/mail/courier-mta/patches/patch-ad
+++ b/mail/courier-mta/patches/patch-ad
@@ -1,13 +1,18 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2007/08/10 17:57:04 jlam Exp $
 
---- courier/filters/Makefile.in.orig	2006-01-29 12:33:24.000000000 -0500
+--- courier/filters/Makefile.in.orig	2007-02-25 23:21:06.000000000 -0500
 +++ courier/filters/Makefile.in
-@@ -234,7 +234,7 @@ htmldocdir = @datadir@/htmldoc
+@@ -229,11 +229,12 @@ SUBDIRS = libfilter perlfilter
+ CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
+ 	pidfile.h permissions.dat
+ 
++pkglibexecdir = $(libexecdir)/courier
+ htmldocdir = @datadir@/htmldoc
  htmldoc_DATA = courierfilter.html courierperlfilter.html dupfilter.html
  databindir = $(datadir)
  databin_SCRIPTS = filterctl
 -filterbindir = $(libexecdir)/filters
-+filterbindir = $(libexecdir)/courier/filters
++filterbindir = $(pkglibexecdir)/filters
  filtersocketdir = $(localstatedir)/filters
  allfiltersocketdir = $(localstatedir)/allfilters
  filterconfdir = $(sysconfdir)/filters
diff --git a/mail/courier-mta/patches/patch-ae b/mail/courier-mta/patches/patch-ae
index ea6fdda4c19..dc23360bec4 100644
--- a/mail/courier-mta/patches/patch-ae
+++ b/mail/courier-mta/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2007/08/10 17:57:04 jlam Exp $
 
 --- courier/filters/filterctl.in.orig	2004-01-31 23:46:27.000000000 -0500
 +++ courier/filters/filterctl.in
-@@ -12,7 +12,7 @@ sysconfdir="@sysconfdir@"
+@@ -11,8 +11,9 @@ libexecdir="@libexecdir@"
+ sysconfdir="@sysconfdir@"
  localstatedir="@localstatedir@"
  piddir="@piddir@"
++pkglibexecdir="@libexecdir@/courier"
  
 -filterbindir="${libexecdir}/filters"
-+filterbindir="${libexecdir}/courier/filters"
++filterbindir="${pkglibexecdir}/filters"
  filteractivedir="${sysconfdir}/filters/active"
  pidfile="${piddir}/courierfilter.pid"
  
diff --git a/mail/courier-mta/patches/patch-af b/mail/courier-mta/patches/patch-af
index 295e5ba4117..f4ee1268a0c 100644
--- a/mail/courier-mta/patches/patch-af
+++ b/mail/courier-mta/patches/patch-af
@@ -1,13 +1,14 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-af,v 1.2 2007/08/10 17:57:05 jlam Exp $
 
---- courier/filters/perlfilter/Makefile.in.orig	2006-02-05 19:35:20.000000000 -0500
+--- courier/filters/perlfilter/Makefile.in.orig	2007-02-25 23:21:34.000000000 -0500
 +++ courier/filters/perlfilter/Makefile.in
-@@ -206,7 +206,7 @@ target_alias = @target_alias@
+@@ -205,7 +205,8 @@ target_alias = @target_alias@
  EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl
  BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c
  CLEANFILES = $(BUILT_SOURCES) permissions.dat
 -filterbindir = $(libexecdir)/filters
-+filterbindir = $(libexecdir)/courier/filters
++pkglibexecdir = $(libexecdir)/courier
++filterbindir = $(pkglibexecdir)/filters
  scriptdir = $(datadir)
  script_SCRIPTS = perlfilter-wrapper.pl perlfilter-example.pl
  filtersocketdir = $(localstatedir)/filters
diff --git a/mail/courier-mta/patches/patch-ag b/mail/courier-mta/patches/patch-ag
deleted file mode 100644
index fcd352e70fb..00000000000
--- a/mail/courier-mta/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/module.esmtp/mkesmtpdcert.in.orig	2000-09-18 13:24:01.000000000 -0400
-+++ courier/module.esmtp/mkesmtpdcert.in
-@@ -17,6 +17,7 @@ then
- 	exit 1
- fi
- 
-+umask 077
- cp /dev/null @datadir@/esmtpd.pem
- chmod 600 @datadir@/esmtpd.pem
- chown @mailuser@ @datadir@/esmtpd.pem
diff --git a/mail/courier-mta/patches/patch-ah b/mail/courier-mta/patches/patch-ah
index 3b674239007..c09df25f681 100644
--- a/mail/courier-mta/patches/patch-ah
+++ b/mail/courier-mta/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2007/08/10 17:57:05 jlam Exp $
 
---- courier/module.local/deliver.c.orig	2005-02-03 21:44:59.000000000 -0500
+--- courier/module.local/deliver.c.orig	2006-05-28 11:29:52.000000000 -0400
 +++ courier/module.local/deliver.c
-@@ -633,7 +633,7 @@ static int docommand(const char *extensi
+@@ -635,7 +635,7 @@ static int docommand(const char *extensi
  		const char *defaultmail,
  		int recursion_level)
  {
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
  const char *p;
  const char *hostp;
  pid_t	pid;
-@@ -725,7 +725,9 @@ const char *shell=getenv("SHELL");
+@@ -727,7 +727,9 @@ const char *shell=getenv("SHELL");
  	envs[17]=courier_malloc(strlen(shell)
  				+sizeof("SHELL="));
  	strcat(strcpy(envs[17], "SHELL="), shell);
diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj
index 1bd9627cab6..89bfbc3f550 100644
--- a/mail/courier-mta/patches/patch-aj
+++ b/mail/courier-mta/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
+$NetBSD: patch-aj,v 1.3 2007/08/10 17:57:05 jlam Exp $
 
---- courier/perms.sh.in.orig	2006-04-12 20:21:48.000000000 -0400
+--- courier/perms.sh.in.orig	2007-06-15 22:21:24.000000000 -0400
 +++ courier/perms.sh.in
-@@ -10,115 +10,45 @@ prefix="@prefix@"
+@@ -10,119 +10,47 @@ prefix="@prefix@"
  exec_prefix="@exec_prefix@"
  
  PERMS="
@@ -35,6 +35,7 @@ $NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
 -@sysconfdir@/imapd.cnf		600	config
 -@sysconfdir@/sqwebmaild.dist	644	config
 -@sysconfdir@/webmail.authpam	644	config
+-@sysconfdir@/webmlmrc.dist	644	config
 -@sysconfdir@/quotawarnmsg.example	444
 -@sysconfdir@/rfcerrheader.txt	444	config
 -@sysconfdir@/rfcerr2045.txt	444	config
@@ -57,11 +58,10 @@ $NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
 -@libexecdir@/courier/pcpd		555	x	bin	bin
 -@libexecdir@/courier/webmail		700	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
-+@libexecdir@/courier/cgi-bin		700	x	root	bin
-+@libexecdir@/courier/cgi-bin/courierwebadmin	4555	x	root	bin
+ @libexecdir@/courier/webmail/webadmin	4555	x	root	bin
  
 -@sbindir@			755	x	bin	bin
  @sbindir@/courier		555
@@ -95,6 +95,8 @@ $NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
 -@bindir@/mimegpg		555
  @bindir@/couriermlm		555
  @bindir@/dotforward		555
+ @bindir@/webmlmd		555
+ @bindir@/webmlmd.rc		555
  
 -@datadir@/makedat		555	x	bin	bin
 -@bindir@/makedat		555
@@ -120,13 +122,13 @@ $NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
  @datadir@/couriermlm		755
  
  @datadir@/couriermlm/adminrequest.tmpl	644
-@@ -168,11 +98,20 @@ do
+@@ -190,11 +118,20 @@ do
  	if test "$USER" = ""
  	then
  		USER="@mailuser@"
 +	elif test "$USER" = "root"
 +	then
-+		USER="@ROOT_USER@"
++		USER="@REAL_ROOT_USER@"
 +	elif test "$USER" = "bin"
 +	then
 +		USER="@ROOT_USER@"
@@ -141,7 +143,7 @@ $NetBSD: patch-aj,v 1.2 2006/06/09 22:12:18 jlam Exp $
  	fi
  
  	case $FILE in
-@@ -193,26 +132,7 @@ do
+@@ -215,26 +152,7 @@ do
  	echo $FILE $MODE $USER $GROUP $SPECIAL
  done
  
diff --git a/mail/courier-mta/patches/patch-ak b/mail/courier-mta/patches/patch-ak
deleted file mode 100644
index 3d1525e5292..00000000000
--- a/mail/courier-mta/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
-
---- courier/webadmin/admin-47webmail.pl.orig	2005-02-15 21:43:31.000000000 -0500
-+++ courier/webadmin/admin-47webmail.pl
-@@ -123,7 +123,7 @@ if ($cgi->param("submit"))
-     {
- 	DeleteConfigFile("calendarmode");
-     }
--    changed("test -x ${libexecdir}/courier/pcpd || exit 0; ${sbindir}/webmaild stop; ${sbindir}/webmaild start");
-+    changed("test -x ${libexecdir}/courier/pcpd || exit 0; ${sbindir}/sqwebmaild stop; ${sbindir}/sqwebmaild start");
-     $errmsg="\@SAVED\@";
- }
- 
diff --git a/mail/courier-mta/patches/patch-al b/mail/courier-mta/patches/patch-al
new file mode 100644
index 00000000000..d77d4d8f40d
--- /dev/null
+++ b/mail/courier-mta/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2007/08/10 17:57:05 jlam Exp $
+
+--- courier/courier.c.orig	2006-05-27 00:52:51.000000000 -0400
++++ courier/courier.c
+@@ -197,7 +197,7 @@ int main(int argc, char **argv)
+ #endif
+ 				execl( DATADIR "/courierctl.start",
+ 					"courierctl.start", (char *)0);
+-				perror("exec");
++				perror("exec: " DATADIR "/courierctl.start");
+ 				_exit(1);
+ 			}
+ 			_exit(0);
diff --git a/mail/courier-mta/patches/patch-am b/mail/courier-mta/patches/patch-am
new file mode 100644
index 00000000000..947a232351f
--- /dev/null
+++ b/mail/courier-mta/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1 2007/08/10 17:57:05 jlam Exp $
+
+--- courier/cmlm2.C.orig	2007-04-30 23:01:57.000000000 -0400
++++ courier/cmlm2.C
+@@ -10,6 +10,9 @@
+ #include	"rfc822/rfc2047.h"
+ #include	"unicode/unicode.h"
+ #include	<fcntl.h>
++#if HAVE_LANGINFO_H
++#include	<langinfo.h>
++#endif
+ #include	<unistd.h>
+ 
+ #include	<fstream>
diff --git a/mail/courier-mta/patches/patch-an b/mail/courier-mta/patches/patch-an
new file mode 100644
index 00000000000..b0cf2b5bf62
--- /dev/null
+++ b/mail/courier-mta/patches/patch-an
@@ -0,0 +1,42 @@
+$NetBSD: patch-an,v 1.1 2007/08/10 17:57:05 jlam Exp $
+
+--- courier/webmlmd.C.orig	2007-06-15 22:21:24.000000000 -0400
++++ courier/webmlmd.C
+@@ -953,10 +953,10 @@ static void sendsubunsub(std::string ext
+ 
+ 	if (ctlmsg.start(ext, address, "ctlmsg"))
+ 	{
+-		FILE *stdin=ctlmsg.stdin();
++		FILE *standard_input=ctlmsg.standard_input();
+ 
+ 		ctlmsg.mk_received_header();
+-		fprintf(stdin, "\nSubscription request received.\n");
++		fprintf(standard_input, "\nSubscription request received.\n");
+ 
+ 		if (ctlmsg.wait())
+ 		{
+@@ -1100,10 +1100,10 @@ static void listrequest2(std::string lis
+ 			if (confirm.start(method + "-" + token, "",
+ 					  "ctlmsg"))
+ 			{
+-				FILE *stdin=confirm.stdin();
++				FILE *standard_input=confirm.standard_input();
+ 
+ 				confirm.mk_received_header();
+-				fprintf(stdin,
++				fprintf(standard_input,
+ 					"Subject: yes -- confirmed by WebMLM\n"
+ 					"\n"
+ 					"Confirmed\n");
+@@ -1117,9 +1117,9 @@ static void listrequest2(std::string lis
+ 				char buf[1024];
+ 				bool isfirst=true;
+ 
+-				FILE *stdout=confirm.stdout();
++				FILE *standard_output=confirm.standard_output();
+ 
+-				while (fgets(buf, sizeof(buf), stdout))
++				while (fgets(buf, sizeof(buf), standard_output))
+ 				{
+ 					if (isfirst)
+ 					{
diff --git a/mail/courier-mta/patches/patch-ao b/mail/courier-mta/patches/patch-ao
new file mode 100644
index 00000000000..2db7ab6fd18
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2007/08/10 17:57:05 jlam Exp $
+
+--- courier/webmlmdcmlm.H.orig	2007-05-19 20:04:55.000000000 -0400
++++ courier/webmlmdcmlm.H
+@@ -62,8 +62,8 @@ namespace webmlmd {
+ 			   );
+ 		bool wait();
+ 
+-		FILE *stdin() { return stdin_filep.fp; }
+-		FILE *stdout() { return stdout_filep.fp; }
++		FILE *standard_input() { return stdin_filep.fp; }
++		FILE *standard_output() { return stdout_filep.fp; }
+ 
+ 		void mk_received_header();
+ 
diff --git a/mail/courier-mta/patches/patch-ap b/mail/courier-mta/patches/patch-ap
new file mode 100644
index 00000000000..e9d3db4e134
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ap
@@ -0,0 +1,30 @@
+$NetBSD: patch-ap,v 1.1 2007/08/10 17:57:06 jlam Exp $
+
+--- courier/webmlmdmod.C.orig	2007-05-19 20:04:55.000000000 -0400
++++ courier/webmlmdmod.C
+@@ -286,10 +286,10 @@ std::string webmlmd::do_mod_accept(std::
+ 
+ 	if (ctlmsg.start("moderate", "", "ctlmsg"))
+ 	{
+-		FILE *stdin=ctlmsg.stdin();
++		FILE *standard_input=ctlmsg.standard_input();
+ 
+ 		ctlmsg.mk_received_header();
+-		fprintf(stdin, "Subject: yes\n\n"
++		fprintf(standard_input, "Subject: yes\n\n"
+ 			"==CUT HERE==\n\n==CUT HERE==\n\n"
+ 			"[%s]\n"
+ 			"[%s]\n",
+@@ -329,10 +329,10 @@ std::string webmlmd::do_mod_reject(std::
+ 
+ 	if (ctlmsg.start("moderate", "", "ctlmsg"))
+ 	{
+-		FILE *stdin=ctlmsg.stdin();
++		FILE *standard_input=ctlmsg.standard_input();
+ 
+ 		ctlmsg.mk_received_header();
+-		fprintf(stdin, "Subject: %s\n\n"
++		fprintf(standard_input, "Subject: %s\n\n"
+ 			"==CUT HERE==\n\n%s==CUT HERE==\n\n"
+ 			"[%s]\n"
+ 			"[%s]\n",
diff --git a/mail/courier-mta/patches/patch-aq b/mail/courier-mta/patches/patch-aq
new file mode 100644
index 00000000000..c28cb8240ab
--- /dev/null
+++ b/mail/courier-mta/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1 2007/08/10 17:57:06 jlam Exp $
+
+--- courier/webmlmdsublist.C.orig	2007-06-15 22:21:24.000000000 -0400
++++ courier/webmlmdsublist.C
+@@ -319,7 +319,7 @@ static void dodel(WSubList &sub_list)
+ 
+ 	unsubscribe.mk_received_header();
+ 
+-	FILE *fp=unsubscribe.stdin();
++	FILE *fp=unsubscribe.standard_input();
+ 
+ 	fprintf(fp,
+ 		"Subject: admin unsubscribe\n"
+@@ -578,7 +578,7 @@ HANDLER("SUBINFO", emit_subinfo)
+ 
+ 	char linebuf[256];
+ 
+-	while (fgets(linebuf, sizeof(linebuf), subinfo.stdout()))
++	while (fgets(linebuf, sizeof(linebuf), subinfo.standard_output()))
+ 	{
+ 		std::cout << webmlmd::html_escape(linebuf);
+ 	}