Update mail/sqwebmail to 3.6.2. Changes from version 3.3.1 include:

Split sqwebmail into sqwebmail and sqwebmaild.  sqwebmaild is now a
root daemon process that listens on a UNIX domain socket.  sqwebmail
is a tiny, unprivileged cgi-bin stub that forwards the HTTP request
to the daemon process.  The stub passes the client's file descriptor
to sqwebmaild, on platforms that support passing file descriptors,
else it proxies http traffic in both directions.

Replace GIFs with PNGs

Do GPG functions via a library instead of invoking mimegpg.

RFC 2231 support

5 files changed, 37 insertions, 88 deletions

diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
index d20c65eb161..9caf52c9b71 100644
--- a/mail/sqwebmail/patches/patch-aa
+++ b/mail/sqwebmail/patches/patch-aa
@@ -1,38 +1,33 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/23 23:41:43 jlam Exp $
 
---- Makefile.in.orig	Fri Jan 18 22:54:52 2002
+--- Makefile.in.orig	Thu Nov 27 16:46:50 2003
 +++ Makefile.in
-@@ -28,7 +28,7 @@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = $(prefix)/share/examples/courier
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -98,16 +98,16 @@
- @HAS_USERDB_FALSE@userdb_data = 
+@@ -156,9 +156,9 @@ sysconf_DATA = authmodulelist
+ @HAS_USERDB_TRUE@userdb_data = makeuserdb.8 userdb.8 userdbpw.8
  
  scriptbindir = $(sbindir)
 -scriptbin_SCRIPTS = $(userdb_scripts)
-+scriptbin_SCRIPTS = 
++scriptbin_SCRIPTS =
+ 
+-pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
++pkglibPROGRAMS = reformime makemime pcpd
  
  pkglibexecdir = $(libexecdir)/sqwebmail
--pkglibexec_PROGRAMS = maildirmake reformime makemime mimegpg pcpd
-+pkglibexec_PROGRAMS = mimegpg pcpd
+ pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@
+@@ -168,10 +168,10 @@ EXTRA_PROGRAMS = 
+ CLEANFILES = $(userdb_scripts) $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA)
  
  pkgman8dir = @mandir@/man8
 -pkgman8_DATA = deliverquota.8 $(userdb_data)
-+pkgman8_DATA = 
++pkgman8_DATA =
  
  pkgman1dir = @mandir@/man1
 -pkgman1_DATA = maildirmake.1
-+pkgman1_DATA = 
- 
- pcpd_SOURCES = 
- 
-@@ -628,50 +628,24 @@
++pkgman1_DATA =
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -773,44 +773,21 @@ makemime: rfc2045/makemime
  # Install SqWebMail setuid to root, if we're running as root
  #
  
@@ -41,10 +36,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $
  	$(mkinstalldirs) $(DESTDIR)$(cgibindir)
  	test -w $(DESTDIR)$(cgibindir) || exit 0; \
  		$(INSTALL_PROGRAM) sqwebmail/sqwebmail \
- 			$(DESTDIR)$(cgibindir)/sqwebmail ; \
--		test -w /etc || continue ; \
- 			chown root $(DESTDIR)$(cgibindir)/sqwebmail ; \
- 			chmod u+s $(DESTDIR)$(cgibindir)/sqwebmail
+ 			$(DESTDIR)$(cgibindir)/sqwebmail
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+ 	$(INSTALL_PROGRAM) sqwebmail/sqwebmaild $(DESTDIR)$(pkglibexecdir)/sqwebmaild
 -	$(mkinstalldirs) $(DESTDIR)$(libexecdir)/authlib
 -	for f in `cat authlib/installlist` dummy ; do \
 -		test "$$f" = "dummy" && continue ; \
@@ -70,20 +64,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $
 -		chmod 700 $(DESTDIR)@authdaemonvar@
 +
 +install-data-local:
- 	-$(mkinstalldirs) $(DESTDIR)@imagedir@
- 	-for f in `cat sqwebmail/images/filelist` ; do \
+ 	$(mkinstalldirs) $(DESTDIR)@imagedir@
+ 	for f in `cat sqwebmail/images/filelist` ; do \
  		$(INSTALL_DATA) $(srcdir)/sqwebmail/images/$$f $(DESTDIR)@imagedir@/$$f ;\
  		done
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-	cp /dev/null $(DESTDIR)$(sysconfdir)/nodsn
  	@cat sqwebmail/sqwebmail.msg
 -	@cat authlib/authdaemon.msg
  
--uninstall-local: uninstall-userdb-local uninstall-userdb-script
-+uninstall-local:
+ uninstall-local: uninstall-userdb-local uninstall-userdb-script
  	test -w $(DESTDIR)$(cgibindir) || exit 0; \
- 		rm -f $(DESTDIR)$(cgibindir)/sqwebmail
--	. authlib/authpwdprogs ; \
--	for f in `cat authlib/installlist authlib/installlist.sh ; echo $$PWPROGS $$PWSCRIPTS` ; do \
--			rm -f $(DESTDIR)$(libexecdir)/authlib/$$f ; done
- 	for f in `cat sqwebmail/images/filelist` ; do \
- 		rm -f $(DESTDIR)@imagedir@/$$f ;\
- 		done
diff --git a/mail/sqwebmail/patches/patch-ab b/mail/sqwebmail/patches/patch-ab
index 22b1b82cecf..675437f3f45 100644
--- a/mail/sqwebmail/patches/patch-ab
+++ b/mail/sqwebmail/patches/patch-ab
@@ -1,30 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2004/02/23 23:41:43 jlam Exp $
 
---- authlib/Makefile.in.orig	Fri Jan 18 22:54:59 2002
+--- authlib/Makefile.in.orig	Sat Nov 15 13:33:23 2003
 +++ authlib/Makefile.in
-@@ -2056,23 +2056,9 @@
+@@ -1279,7 +1279,7 @@ info: info-am
  
- # automake still a bit stupid...
+ info-am:
  
--install-data-local: install-authldaprc install-authdaemonrc install-authmysqlrc install-authpgsqlrc
--	test "$(man_LINKS)" = "" && exit 0; \
--	$(mkinstalldirs) $(DESTDIR)$(man7dir) ; \
--	for f in $(man_MANS) "" ; do \
--		test "$$f" = "" && continue ; \
--		$(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \
--	cd $(DESTDIR)$(man7dir) || exit 1 ; \
--		for f in $(man_LINKS) "" ; do \
--			test "$$f" = "" && continue ; \
--			rm -f $$f; $(LN_S) authlib.7 $$f ; \
--			test -w /etc && chown bin $$f && chgrp bin $$f ; \
--			done ; exit 0
-+install-data-local:
+-install-data-am: install-data-local
++install-data-am:
  
--uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
--	cd $(DESTDIR)$(man7dir) 2>/dev/null || exit 0 ; \
--		test "$(man_LINKS)" = "" && exit 0; \
--		rm -f $(man_LINKS) $(man_MANS)
-+uninstall-local:
+ install-exec-am:
  
- authlib.html: authlib.html.in
- 	CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/mail/sqwebmail/patches/patch-ac b/mail/sqwebmail/patches/patch-ac
deleted file mode 100644
index c5ca9161970..00000000000
--- a/mail/sqwebmail/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $
-
---- authlib/cryptpassword.c.orig	Wed Jun 20 21:44:04 2001
-+++ authlib/cryptpassword.c
-@@ -6,6 +6,7 @@
- #if	HAVE_CONFIG_H
- #include	"config.h"
- #endif
-+#include	<stdlib.h>
- #include	<string.h>
- #if	HAVE_UNISTD_H
- #include	<unistd.h>
diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad
index d80c380b9ed..e5e32d08717 100644
--- a/mail/sqwebmail/patches/patch-ad
+++ b/mail/sqwebmail/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2004/02/23 23:41:43 jlam Exp $
 
---- sqwebmail/Makefile.in.orig	Tue Jan 22 19:05:17 2002
+--- sqwebmail/Makefile.in.orig	Thu Nov 27 16:47:01 2003
 +++ sqwebmail/Makefile.in
-@@ -677,7 +677,7 @@
+@@ -817,7 +817,7 @@ install-perms-local: install-perms-cache
  
  htmllibdir.h: config.status
  	echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
@@ -11,8 +11,8 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $
  	echo '#define NOCHANGINGFROM "$(sysconfdir)/nochangingfrom"' >>htmllibdir.h
  	echo '#define USEXSENDER "$(sysconfdir)/usexsender"' >>htmllibdir.h
  	echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
-@@ -695,7 +695,7 @@
- 		; echo '#define MIMEGPG "$(pkglibexecdir)/mimegpg"' >>htmllibdir.h \
+@@ -835,7 +835,7 @@ htmllibdir.h: config.status
+ 		; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \
  		; fi
  	echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h
 -	echo '#define LDAPSEARCH "$(scriptdir)/ldapsearch"' >>htmllibdir.h
diff --git a/mail/sqwebmail/patches/patch-ae b/mail/sqwebmail/patches/patch-ae
deleted file mode 100644
index ed43ad94307..00000000000
--- a/mail/sqwebmail/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/01/25 00:19:00 jlam Exp $
-
---- ldapaddressbook/ldapsearch.in.orig	Sat Jun  3 01:40:27 2000
-+++ ldapaddressbook/ldapsearch.in
-@@ -15,4 +15,4 @@
- # This example sets the search timeout to 60 seconds, and a maximum of 20
- # hits returned.
- 
--exec @ldapsearch@ -l 60 -z 20 "$@"
-+exec @ldapsearch@ -l 60 -z 20 "$@" | @SED@ -e "s,^\([^ ]*\): ,\1=,"