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

* Missing </table> when displaying folder list.

* Use SQWEBMAIL_RANDSEED if it's set, instead of sendit.sh's inode.

* Remove hardcoded reference to TIMEOUTHARD

* Global footer wasn't being added correctly to HTML-formatted mail.

* Fixes to inferred HTML formatting.

* Fix signing of multipart messages that contain 8 bit content.

11 files changed, 35 insertions, 134 deletions

diff --git a/mail/sqwebmail/INSTALL b/mail/sqwebmail/INSTALL
deleted file mode 100644
index 314c296a52e..00000000000
--- a/mail/sqwebmail/INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: INSTALL,v 1.4 2007/10/09 19:19:10 martti Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	if ${TEST} -d "@VARBASE@/sqwebmail"; then
-		${CAT} << EOF
-===========================================================================
-
-If you are upgrading SqWebMail from a previous version, please note
-that the Courier directory for keeping local state has moved.  In
-order to preserve your existing users' calendar information, you will
-need to move:
-
-	@VARBASE@/sqwebmail
-to
-	@SQWEBMAIL_STATEDIR@/sqwebmail
-
-===========================================================================
-EOF
-	fi
-	;;
-esac
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 6c73ad57d0c..d828db67128 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2007/09/22 04:42:04 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2007/10/15 15:38:52 jlam Exp $
 
-DISTNAME=	sqwebmail-5.1.6
-PKGREVISION=	4
+DISTNAME=	sqwebmail-5.2.0
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,8 +9,8 @@ MAINTAINER=	jlam@pkgsrc.org
 COMMENT=	Webmail CGI for access to maildir-style mailboxes
 HOMEPAGE=	http://www.courier-mta.org/sqwebmail/
 
-DEPENDS+=	courier-maildir>=0.53.1:../../mail/courier-maildir
-DEPENDS+=	maildrop>=2.0.1:../../mail/maildrop
+DEPENDS+=	courier-maildir>=0.57.1../../mail/courier-maildir
+DEPENDS+=	maildrop>=2.0.4nb2:../../mail/maildrop
 
 USE_TOOLS+=		env gmake gzip:run perl:run
 USE_LANGUAGES=		c c++
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 896a46fab9d..50e6588f3ad 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.19 2007/09/11 17:50:14 jlam Exp $
+$NetBSD: distinfo,v 1.20 2007/10/15 15:38:52 jlam Exp $
 
-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) = c76190e8c7184ca5699f07dcf02656bc63dc1e39
-SHA1 (patch-ah) = 5f88760e7d69fbad6894557283c069e0c9592044
+SHA1 (sqwebmail-5.2.0.tar.bz2) = 3032f673e9033c7d26a30bc50e24f2897e7ea22d
+RMD160 (sqwebmail-5.2.0.tar.bz2) = b0ba837df30605e6f337c3f0b04200d14bd618cc
+Size (sqwebmail-5.2.0.tar.bz2) = 3926342 bytes
+SHA1 (patch-aa) = 1f25c41ecdf0378f8ee57a9531f787c58ed7d37a
+SHA1 (patch-ad) = ae222755e2291636c3d8b9f5328b3001cf713ddc
+SHA1 (patch-ah) = 762491372570553cc00af0e0d5198b728707eccb
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = 510c91faf9d0cd584b5ec9da07a034a7d89d62f3
-SHA1 (patch-ak) = e84966ea5ed5cee58bbde380f0d9ace31034e1ba
-SHA1 (patch-am) = 8d78356319eead76a9170bf8183ddddb34481552
-SHA1 (patch-an) = 288dfa758d39c8e0efde2ff8b9325268b3910265
-SHA1 (patch-ao) = 20ecff27f7945facd53ab940ec8845b88e2f092c
+SHA1 (patch-aj) = fe79e0bdec04d29514c77a7110369f1ded76af77
+SHA1 (patch-am) = d5e654e23473fc3ff613020b0ec99f6eba7b99ea
diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
index 453f8338f92..822cc3d34d5 100644
--- a/mail/sqwebmail/patches/patch-aa
+++ b/mail/sqwebmail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2007/08/10 17:57:14 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
 
---- Makefile.in.orig	2007-04-22 14:40:39.000000000 -0400
+--- Makefile.in.orig	Sat Sep 29 14:52:57 2007
 +++ Makefile.in
-@@ -239,18 +239,18 @@ EXTRA_DIST = INSTALL.html README NEWS RE
+@@ -244,19 +244,19 @@ EXTRA_DIST = INSTALL.html README NEWS RE
  
  scriptbindir = $(sbindir)
  scriptbin_SCRIPTS = \
@@ -11,9 +11,10 @@ $NetBSD: patch-aa,v 1.8 2007/08/10 17:57:14 jlam Exp $
  
 -pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
 -pkglibexecdir = $(libexecdir)/sqwebmail
--libexec_SCRIPTS = sqwebmaild.rc
 +pkglibPROGRAMS = pcpd
 +pkglibexecdir = $(libexecdir)/courier
+ pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@
+-libexec_SCRIPTS = sqwebmaild.rc
 +libexec_SCRIPTS = 
  CLEANFILES = $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) \
  	sharedindexinstall sharedindexsplit
@@ -27,7 +28,7 @@ $NetBSD: patch-aa,v 1.8 2007/08/10 17:57:14 jlam Exp $
  @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
+@@ -836,6 +836,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
  sqwebmaild.dist: sqwebmail/sqwebmaild.dist
  	cp sqwebmail/sqwebmaild.dist .
  
@@ -37,7 +38,7 @@ $NetBSD: patch-aa,v 1.8 2007/08/10 17:57:14 jlam Exp $
  pcpd: pcp/pcpd
  	cp pcp/pcpd .
  
-@@ -858,7 +861,7 @@ install-exec-local:
+@@ -871,7 +874,7 @@ install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(cgibindir)
  	test -w $(DESTDIR)$(cgibindir) || exit 0; \
  		$(INSTALL_PROGRAM) sqwebmail/sqwebmail \
diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad
index 8b3f051d027..1f0c1b2ab95 100644
--- a/mail/sqwebmail/patches/patch-ad
+++ b/mail/sqwebmail/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2007/09/11 17:50:14 jlam Exp $
+$NetBSD: patch-ad,v 1.10 2007/10/15 15:38:52 jlam Exp $
 
---- sqwebmail/Makefile.in.orig	2007-04-22 14:18:04.000000000 -0400
+--- sqwebmail/Makefile.in.orig	Sat Sep 29 14:53:23 2007
 +++ sqwebmail/Makefile.in
-@@ -991,7 +991,7 @@ install-perms-local: install-perms-cache
+@@ -1012,7 +1012,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.9 2007/09/11 17:50:14 jlam Exp $
  	echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
  	echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
  	echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
-@@ -999,7 +999,7 @@ htmllibdir.h: config.status
+@@ -1020,7 +1020,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.9 2007/09/11 17:50:14 jlam Exp $
  		; then \
  		echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
  		; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
-@@ -1036,9 +1036,6 @@ install-perms-cache:
+@@ -1057,9 +1057,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 d03df23ed43..8ea7cd53783 100644
--- a/mail/sqwebmail/patches/patch-ah
+++ b/mail/sqwebmail/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2007/08/10 17:57:14 jlam Exp $
+$NetBSD: patch-ah,v 1.6 2007/10/15 15:38:52 jlam Exp $
 
---- sqwebmail/configure.orig	2007-04-22 14:18:04.000000000 -0400
+--- sqwebmail/configure.orig	Sat Sep 29 14:53:22 2007
 +++ sqwebmail/configure
-@@ -19225,7 +19225,7 @@ fi;
+@@ -19893,7 +19893,7 @@ fi
  
  
  
diff --git a/mail/sqwebmail/patches/patch-aj b/mail/sqwebmail/patches/patch-aj
index c5b184b2b6a..e4064bc3f83 100644
--- a/mail/sqwebmail/patches/patch-aj
+++ b/mail/sqwebmail/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.6 2007/08/10 17:57:14 jlam Exp $
+$NetBSD: patch-aj,v 1.7 2007/10/15 15:38:52 jlam Exp $
 
---- INSTALL.html.orig	2007-03-15 22:05:22.000000000 -0400
+--- INSTALL.html.orig	Mon Sep  3 16:05:20 2007
 +++ INSTALL.html
-@@ -806,7 +806,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
+@@ -809,7 +809,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
    configuration files are installed in
    <code>/usr/lib/sqwebmail</code> (the default).</p>
  
diff --git a/mail/sqwebmail/patches/patch-ak b/mail/sqwebmail/patches/patch-ak
deleted file mode 100644
index 5c8140d720e..00000000000
--- a/mail/sqwebmail/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2007/09/06 04:05:41 jlam Exp $
-
---- sqwebmail/folder.c.orig	2007-02-24 14:05:45.000000000 -0500
-+++ sqwebmail/folder.c
-@@ -270,7 +270,7 @@ void folder_delmsgs(const char *dir, siz
- 	} 
- 	else if (*cgi("cmdpurgeall")) 
- 	{
--	    char *deldir;
-+	    char *cur, *deldir;
- 	    struct maildir_info minfo;
- 
- 	    if (maildir_info_imap_find(&minfo, dir, login_returnaddr())<0) 
-@@ -288,7 +288,7 @@ void folder_delmsgs(const char *dir, siz
- 		return;
- 	    }
- 	    
--	    char *cur = malloc(strlen(deldir)+5);
-+	    cur = malloc(strlen(deldir)+5);
- 	    strcpy(cur, deldir);
- 	    strcat(cur, "/cur");
- 
diff --git a/mail/sqwebmail/patches/patch-am b/mail/sqwebmail/patches/patch-am
index da952e37d65..f85bee8d774 100644
--- a/mail/sqwebmail/patches/patch-am
+++ b/mail/sqwebmail/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2007/08/10 17:57:14 jlam Exp $
+$NetBSD: patch-am,v 1.2 2007/10/15 15:38:52 jlam Exp $
 
---- pcp/configure.orig	2007-08-09 13:50:02.000000000 -0400
+--- pcp/configure.orig	Sun Jul 22 01:27:29 2007
 +++ pcp/configure
-@@ -26852,14 +26852,15 @@ LIBS="$saveLIBS"
+@@ -28669,14 +28669,15 @@ LIBS="$saveLIBS"
  echo $NETLIBS >pcp.libs
  
  
@@ -19,4 +19,4 @@ $NetBSD: patch-am,v 1.1 2007/08/10 17:57:14 jlam Exp $
 +SENDIT="$sysconfdir/sendit.sh"
  
  
- echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
diff --git a/mail/sqwebmail/patches/patch-an b/mail/sqwebmail/patches/patch-an
deleted file mode 100644
index 69b9afd1a24..00000000000
--- a/mail/sqwebmail/patches/patch-an
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/09/06 04:05:42 jlam Exp $
-
---- sqwebmail/newmsg.c.orig	2007-02-24 14:05:45.000000000 -0500
-+++ sqwebmail/newmsg.c
-@@ -72,12 +72,15 @@ static void newmsg_header(const char *la
- {
- int		hdrmaxlen=512;
- const char	*p=getarg("HDRMAXLEN");
-+#if	HAVE_SQWEBMAIL_UNICODE
-+const struct unicode_info *uiptr;
-+#endif
- 
- 	if (p && (atoi(p) > hdrmaxlen))
- 		hdrmaxlen=atoi(p);
- 
- #if	HAVE_SQWEBMAIL_UNICODE
--const struct unicode_info *uiptr=unicode_find(sqwebmail_content_charset);
-+	uiptr=unicode_find(sqwebmail_content_charset);
- #endif
- 	printf("<tr><th align=\"right\"><p class=\"new-message-header\">"
- 	       "<span class=\"new-message-header-%s\">%s</span></p></th>"
-@@ -493,6 +496,7 @@ void newmsg_init(const char *folder, con
- 	char	*draftmessagefilename;
- 	const	char *p;
- 	FILE	*fp;
-+	int	wbnochangingfrom;
- 	int	attachcnt=0;
- 	char	*cursubj, *curto, *curcc, *curbcc, *curfrom, *curreplyto;
- 
-@@ -642,7 +646,7 @@ void newmsg_init(const char *folder, con
- 	printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" class=\"new-message-box\"><tr><td>\n");
- 
- 	printf("<table border=\"0\" width=\"100%%\">\n");
--	int wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom");
-+	wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom");
- 	if (wbnochangingfrom < 2)
- 		newmsg_header_rfc822(fromlab, "headerfrom", curfrom,
- 			*cgi("from") ? cgi("from"):
diff --git a/mail/sqwebmail/patches/patch-ao b/mail/sqwebmail/patches/patch-ao
deleted file mode 100644
index c0e7b02f10e..00000000000
--- a/mail/sqwebmail/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2007/09/07 14:52:28 jlam Exp $
-
---- cgi/cgidaemond.c.orig	2007-03-15 21:37:28.000000000 -0400
-+++ cgi/cgidaemond.c
-@@ -33,6 +33,9 @@
- #include	<sys/types.h>
- #include	<sys/stat.h>
- #include        <sys/socket.h>
-+#if	HAVE_SYS_UIO_H
-+#include        <sys/uio.h>
-+#endif
- #include        <sys/un.h>
- 
- static int read_environ(int);