Update mail/sqwebmail to 5.1.6. Changes from version 5.1.2 include:

+ Move a few more things around so that it looks more like a default
  installation of Courier.  In particular, the "cgi-bin" directory has
  been renamed "webmail", and sbin/sqwebmaild to sbin/webmaild.

* Use address returned from authlib as return address of sent messages.
* Forbid rename folder if new folder name contains a dot.
* Quietly prune trailing ':' from the tail end of a header name.
* Trim whitespace from login username and new folder names.

10 files changed, 101 insertions, 60 deletions

diff --git a/mail/sqwebmail/MESSAGE b/mail/sqwebmail/MESSAGE
index ce442d873fa..1e7cbbacbe8 100644
--- a/mail/sqwebmail/MESSAGE
+++ b/mail/sqwebmail/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2006/04/28 18:16:25 jlam Exp $
+$NetBSD: MESSAGE,v 1.8 2007/08/10 17:57:13 jlam Exp $
 
 You must create a cron job that runs at regular intervals (one hour is
 fine) that executes the following Perl script to clean the SqWebMail
@@ -10,11 +10,11 @@ user cache:
 There are two things which must be done to make SqWebMail accessible
 through your HTTP server:
 
-  (1) Copy the ``sqwebmail'' CGI binary to the appropriate place in your
-      HTTP document root, e.g. ${PREFIX}/libexec/cgi-bin, then Maildir
-      accounts would be accessible through:
+  (1) Copy the ``webmail'' CGI binary to the appropriate place in your
+      HTTP document root, e.g. ${PREFIX}/libexec/cgi-bin.  Maildir
+      accounts would be accessible through, e.g.:
 
-        http://your.domain.com/cgi-bin/sqwebmail
+        http://your.domain.com/cgi-bin/webmail
 
   (2) Make URLs with path ``${IMAGEURL}/'' resolve to the images located
       in the ${IMAGEDIR} directory.
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index b16d6998aaa..6f8ad315230 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2007/08/02 22:07:32 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2007/08/10 17:57:13 jlam Exp $
 
-DISTNAME=	sqwebmail-5.1.2
-PKGREVISION=	1
+DISTNAME=	sqwebmail-5.1.6
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -55,7 +54,7 @@ CONFIGURE_ARGS+=	--localstatedir=${SQWEBMAIL_STATEDIR:Q}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 
-CONFIGURE_ARGS+=	--enable-cgibindir=${PREFIX}/libexec/courier/cgi-bin
+CONFIGURE_ARGS+=	--enable-cgibindir=${LIBEXECDIR:Q}/webmail
 CONFIGURE_ARGS+=	--enable-https=auto
 CONFIGURE_ARGS+=	--enable-imagedir=${SQWEBMAIL_IMAGEDIR:Q}
 CONFIGURE_ARGS+=	--enable-imageurl=${SQWEBMAIL_IMAGEURL:Q}
@@ -63,17 +62,17 @@ CONFIGURE_ARGS+=	--enable-mimetypes=${MIME_TYPES:Q}
 CONFIGURE_ARGS+=	--with-cachedir=${SQWEBMAIL_CACHEDIR:Q}
 CONFIGURE_ARGS+=	--with-cacheowner=${ROOT_USER:Q}
 CONFIGURE_ARGS+=	--with-calendardir=${SQWEBMAIL_CALENDARDIR:Q}
-CONFIGURE_ARGS+=	--with-ispell="${LOCALBASE}/bin/ispell"
+CONFIGURE_ARGS+=	--with-ispell="${PREFIX}/bin/ispell"
 CONFIGURE_ARGS+=	--with-mailer="${SENDMAIL} -oi -t"
 CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP:Q}
-CONFIGURE_ARGS+=	--with-piddir=${VARBASE}/run
+CONFIGURE_ARGS+=	--with-piddir=${VARBASE:Q}/run
 
 CONFIGURE_ENV+=		GZIP=${TOOLS_PATH.gzip:Q}
-CONFIGURE_ENV+=		GPG="${LOCALBASE}/bin/gpg"
-CONFIGURE_ENV+=		ldapsearch="${LOCALBASE}/bin/ldapsearch"
+CONFIGURE_ENV+=		GPG=${PREFIX:Q}/bin/gpg
+CONFIGURE_ENV+=		ldapsearch=${PREFIX:Q}/bin/ldapsearch
 
 REQD_DIRS+=		${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
-REQD_DIRS_PERMS+=	${LIBEXECDIR}/cgi-bin				\
+REQD_DIRS_PERMS+=	${LIBEXECDIR}/webmail				\
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 MAKE_DIRS+=		${VARBASE}/run ${LOCALSTATEDIR}
 OWN_DIRS+=		${SQWEBMAIL_STATEDIR}
@@ -111,10 +110,10 @@ post-build:
 	${ECHO} "local" > ${WRKDIR}/calendarmode
 
 # The sqwebmail install target incorrectly overwrites the mode on
-# cgi-bin directory, so fix it back to the right value.
+# the webmail directory, so fix it back to the right value.
 #
 fix-perms:
-	${CHMOD} 0700 ${LIBEXECDIR}/cgi-bin
+	${CHMOD} 0700 ${LIBEXECDIR}/webmail
 
 post-install: fix-perms
 	${LN} -s ${PREFIX}/share/courier/sqwebmail/webgpg ${PREFIX}/sbin
diff --git a/mail/sqwebmail/PLIST b/mail/sqwebmail/PLIST
index e72037cbfa9..27867ab4fd8 100644
--- a/mail/sqwebmail/PLIST
+++ b/mail/sqwebmail/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2006/06/09 22:12:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/08/10 17:57:13 jlam Exp $
 bin/mimegpg
-libexec/courier/cgi-bin/sqwebmail
 libexec/courier/pcpd
 libexec/courier/sqwebmaild
 libexec/courier/sqwebpasswd
+libexec/courier/webmail/webmail
 man/man1/mimegpg.1
-sbin/sqwebmaild
+sbin/webmaild
 sbin/webgpg
 share/courier/sqwebmail/cleancache.pl
 share/courier/sqwebmail/html/en
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index cc37e36602c..c5f1e9305d8 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.15 2006/06/09 22:12:01 jlam Exp $
+$NetBSD: distinfo,v 1.16 2007/08/10 17:57:13 jlam Exp $
 
-SHA1 (sqwebmail-5.1.2.tar.bz2) = 0ddcf4f9b53304a356ba40e4ae3ea27bb9118108
-RMD160 (sqwebmail-5.1.2.tar.bz2) = af66ac38d40ef69da4aa57450915ba954c45703a
-Size (sqwebmail-5.1.2.tar.bz2) = 3743815 bytes
-SHA1 (patch-aa) = 5f263487244e8127845050a19d3b68356f846aa2
-SHA1 (patch-ad) = 5aad3cb93e747f7522c023e46496b8ba956ea664
-SHA1 (patch-ah) = b4f198638e3c9e6b4cd0a88f058b85a196c7ac9d
+SHA1 (sqwebmail-5.1.6.tar.bz2) = 04ecff69dfcd01fc947adfafe39d8f2bd80254e6
+RMD160 (sqwebmail-5.1.6.tar.bz2) = 231c0f972a7423c231ff7db8bacc6417aae5354a
+Size (sqwebmail-5.1.6.tar.bz2) = 3809004 bytes
+SHA1 (patch-aa) = 85ce29b1be7335d547740783eb726d25cc4f0765
+SHA1 (patch-ad) = 813bab377ad047599af8846631e16a240f2fd7ec
+SHA1 (patch-ah) = 5f88760e7d69fbad6894557283c069e0c9592044
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = 2ad7d2500a54ca4f94ba00aaab89df29adcf864e
+SHA1 (patch-aj) = 510c91faf9d0cd584b5ec9da07a034a7d89d62f3
+SHA1 (patch-am) = 8d78356319eead76a9170bf8183ddddb34481552
diff --git a/mail/sqwebmail/files/sqwebmail.sh b/mail/sqwebmail/files/sqwebmail.sh
index a16ff572e4d..5a5179fb729 100644
--- a/mail/sqwebmail/files/sqwebmail.sh
+++ b/mail/sqwebmail/files/sqwebmail.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sqwebmail.sh,v 1.7 2006/11/20 11:45:14 cube Exp $
+# $NetBSD: sqwebmail.sh,v 1.8 2007/08/10 17:57:14 jlam Exp $
 #
 # Courier SqWebMail services daemon
 #
@@ -17,11 +17,12 @@ ctl_command="@PREFIX@/sbin/sqwebmaild"
 pidfile="@VARBASE@/run/sqwebmaild.pid"
 required_files="@PKG_SYSCONFDIR@/calendarmode @PKG_SYSCONFDIR@/sqwebmaild"
 
-start_precmd="sqwebmail_prestart"
-start_cmd="sqwebmail_doit start"
-stop_cmd="sqwebmail_doit stop"
+start_precmd="${name}_prestart"
+start_cmd="${name}_doit start"
+stop_cmd="${name}_doit stop"
 
-mkdir_perms() {
+mkdir_perms()
+{
 	dir="$1"; user="$2"; group="$3"; mode="$4"
 	@TEST@ -d $dir || @MKDIR@ $dir
 	@CHOWN@ $user $dir
diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
index dbbb7cb20c2..453f8338f92 100644
--- a/mail/sqwebmail/patches/patch-aa
+++ b/mail/sqwebmail/patches/patch-aa
@@ -1,14 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2006/01/03 05:59:12 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2007/08/10 17:57:14 jlam Exp $
 
---- Makefile.in.orig	2005-12-25 17:02:47.000000000 -0500
+--- Makefile.in.orig	2007-04-22 14:40:39.000000000 -0400
 +++ Makefile.in
-@@ -237,19 +237,18 @@ EXTRA_DIST = INSTALL.html README NEWS RE
- 	pgpkeys.txt
+@@ -239,18 +239,18 @@ EXTRA_DIST = INSTALL.html README NEWS RE
  
  scriptbindir = $(sbindir)
--scriptbin_SCRIPTS = \
+ scriptbin_SCRIPTS = \
 -	sharedindexinstall sharedindexsplit
-+scriptbin_SCRIPTS = sqwebmaild.rc
++	webmaild.rc
  
 -pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
 -pkglibexecdir = $(libexecdir)/sqwebmail
@@ -21,10 +20,29 @@ $NetBSD: patch-aa,v 1.7 2006/01/03 05:59:12 jlam Exp $
  
  pkgman8dir = @mandir@/man8
 -pkgman8_DATA = deliverquota.8
-+pkgman8_DATA =
++pkgman8_DATA = 
  pkgman1dir = @mandir@/man1
 -pkgman1_DATA = maildirmake.1
-+pkgman1_DATA =
- @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/main.html
++pkgman1_DATA = 
+ @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index2.html
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -823,6 +823,9 @@ uninstall-info: uninstall-info-recursive
+ sqwebmaild.dist: sqwebmail/sqwebmaild.dist
+ 	cp sqwebmail/sqwebmaild.dist .
+ 
++webmaild.rc: sqwebmaild.rc
++	cp sqwebmaild.rc webmaild.rc
++
+ pcpd: pcp/pcpd
+ 	cp pcp/pcpd .
+ 
+@@ -858,7 +861,7 @@ install-exec-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(cgibindir)
+ 	test -w $(DESTDIR)$(cgibindir) || exit 0; \
+ 		$(INSTALL_PROGRAM) sqwebmail/sqwebmail \
+-			$(DESTDIR)$(cgibindir)/sqwebmail
++			$(DESTDIR)$(cgibindir)/webmail
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+ 	$(INSTALL_PROGRAM) sqwebmail/sqwebmaild $(DESTDIR)$(pkglibexecdir)/sqwebmaild
+ 
diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad
index bf7a257e8ae..ec97d090976 100644
--- a/mail/sqwebmail/patches/patch-ad
+++ b/mail/sqwebmail/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2006/06/09 22:12:01 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2007/08/10 17:57:14 jlam Exp $
 
---- sqwebmail/Makefile.in.orig	2006-05-24 19:48:14.000000000 -0400
+--- sqwebmail/Makefile.in.orig	2007-04-22 14:18:04.000000000 -0400
 +++ sqwebmail/Makefile.in
-@@ -992,7 +992,7 @@ install-perms-local: install-perms-cache
+@@ -991,7 +991,7 @@ install-perms-local: install-perms-cache
  
  htmllibdir.h: config.status
  	echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.7 2006/06/09 22:12:01 jlam Exp $
  	echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
  	echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
  	echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
-@@ -1000,7 +1000,7 @@ htmllibdir.h: config.status
+@@ -999,7 +999,7 @@ htmllibdir.h: config.status
  	echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
  	echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
  	echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.7 2006/06/09 22:12:01 jlam Exp $
  		; then \
  		echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
  		; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
-@@ -1009,7 +1009,7 @@ htmllibdir.h: config.status
+@@ -1008,7 +1008,7 @@ htmllibdir.h: config.status
  		; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \
  		; fi
  	echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.7 2006/06/09 22:12:01 jlam Exp $
  	echo '#define AUTHCHARSET "$(sysconfdir)/authcharset"' >>htmllibdir.h
  
  ldapsearch: ../ldapaddressbook/ldapsearch
-@@ -1037,9 +1037,6 @@ install-perms-cache:
+@@ -1036,9 +1036,6 @@ install-perms-cache:
  	@echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
  
  cache-reminder:
diff --git a/mail/sqwebmail/patches/patch-ah b/mail/sqwebmail/patches/patch-ah
index 74216c5814e..d03df23ed43 100644
--- a/mail/sqwebmail/patches/patch-ah
+++ b/mail/sqwebmail/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2006/06/09 22:12:01 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2007/08/10 17:57:14 jlam Exp $
 
---- sqwebmail/configure.orig	2006-05-24 19:48:13.000000000 -0400
+--- sqwebmail/configure.orig	2007-04-22 14:18:04.000000000 -0400
 +++ sqwebmail/configure
-@@ -20269,7 +20269,7 @@ fi;
+@@ -19225,7 +19225,7 @@ fi;
  
  
  
diff --git a/mail/sqwebmail/patches/patch-aj b/mail/sqwebmail/patches/patch-aj
index 35af1e6c656..c5b184b2b6a 100644
--- a/mail/sqwebmail/patches/patch-aj
+++ b/mail/sqwebmail/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.5 2006/04/28 18:16:25 jlam Exp $
+$NetBSD: patch-aj,v 1.6 2007/08/10 17:57:14 jlam Exp $
 
---- INSTALL.html.orig	2006-02-25 12:13:16.000000000 -0500
+--- INSTALL.html.orig	2007-03-15 22:05:22.000000000 -0400
 +++ INSTALL.html
-@@ -707,7 +707,7 @@ Qmail box.</p>
- installation. The following presumes that SqWebMail's configuration files are
- installed in <code>/usr/lib/sqwebmail</code> (the default).</p>
+@@ -806,7 +806,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
+   configuration files are installed in
+   <code>/usr/lib/sqwebmail</code> (the default).</p>
  
--<p><code>/usr/lib/sqwebmail/etc/hostname</code> - when SqWebMail is installed
-+<p><code>/usr/lib/sqwebmail/etc/defaultdomain</code> - when SqWebMail is installed
- with a basic configuration for a single domain, SqWebMail sets the domain in
- the return address for outgoing messages to the defined system hostname. If
- this file exists it will be used instead of the defined system hostname.</p>
+-  <p><code>/usr/lib/sqwebmail/etc/hostname</code> - when SqWebMail
++  <p><code>/usr/lib/sqwebmail/etc/defaultdomain</code> - when SqWebMail
+   is installed with a basic configuration for a single domain,
+   SqWebMail sets the domain in the return address for outgoing
+   messages to the defined system hostname. If this file exists it
diff --git a/mail/sqwebmail/patches/patch-am b/mail/sqwebmail/patches/patch-am
new file mode 100644
index 00000000000..da952e37d65
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2007/08/10 17:57:14 jlam Exp $
+
+--- pcp/configure.orig	2007-08-09 13:50:02.000000000 -0400
++++ pcp/configure
+@@ -26852,14 +26852,15 @@ LIBS="$saveLIBS"
+ echo $NETLIBS >pcp.libs
+ 
+ 
+-if test -d ${srcdir}/../courier
++if true || test -d ${srcdir}/../courier
+ then
+         scriptdir="$datadir/sqwebmail"
+ else
+         scriptdir="$prefix"
+ fi
+ 
+-SENDIT="$scriptdir/sendit.sh"
++# sendit.sh can be customized, so we call it from $(sysconfdir).
++SENDIT="$sysconfdir/sendit.sh"
+ 
+ 
+ echo "$as_me:$LINENO: checking for ANSI C header files" >&5