Update to 0.43. From the changelog:

-Added per-post sender confirmation patch from Tullio Andreatta.
 See the documentation for ezmlm-make -y for details.
-Changed all example domain names in text files to the RFC 2606 mandated
 example.com domain name.
-Several documentation and comment fixes.  Thanks Tullio Andreatta.
-Added conf-sub control file, used to choose which subscriber
 mechanism to use.  This replaces the "make std/mysql/pgsql" mechanism.
 Adapted from patch by Tullio Andreatta.
-Got rid of the frivolous uses of /bin/sh to exec ezmlm-send.
-Always reject bounce messages in ezmlm-reject.
-Substitute <#r#> in (un)subscribe confirm messages with just the local
part of the reply address (for web-based confirmation).

7 files changed, 36 insertions, 19 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index cf29a8c196d..aaf549a879b 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2004/08/10 05:59:01 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/21 03:42:25 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
 
-DISTNAME=		ezmlm-idx-0.421
-SITES_${DISTNAME}.tar.gz=	http://www.ezmlm.org/archive/0.421/
+DISTNAME=		ezmlm-idx-0.43
+SITES_${DISTNAME}.tar.gz=	http://www.ezmlm.org/archive/0.43/
 
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://www.ezmlm.org/
diff --git a/mail/ezmlm-idx/PLIST.idx b/mail/ezmlm-idx/PLIST.idx
index 2ac4f4e8a6e..6054b0ce73c 100644
--- a/mail/ezmlm-idx/PLIST.idx
+++ b/mail/ezmlm-idx/PLIST.idx
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST.idx,v 1.2 2003/03/21 17:31:37 jmmv Exp $
+@comment $NetBSD: PLIST.idx,v 1.3 2004/12/21 03:42:25 schmonz Exp $
 bin/ezmlm-accept
 bin/ezmlm-archive
 bin/ezmlm-check
 bin/ezmlm-clean
+bin/ezmlm-confirm
 bin/ezmlm-cron
 bin/ezmlm-gate
 bin/ezmlm-get
@@ -20,6 +21,7 @@ man/cat1/ezmlm-accept.0
 man/cat1/ezmlm-archive.0
 man/cat1/ezmlm-check.0
 man/cat1/ezmlm-clean.0
+man/cat1/ezmlm-confirm.0
 man/cat1/ezmlm-cron.0
 man/cat1/ezmlm-gate.0
 man/cat1/ezmlm-get.0
@@ -40,6 +42,7 @@ man/man1/ezmlm-accept.1
 man/man1/ezmlm-archive.1
 man/man1/ezmlm-check.1
 man/man1/ezmlm-clean.1
+man/man1/ezmlm-confirm.1
 man/man1/ezmlm-cron.1
 man/man1/ezmlm-gate.1
 man/man1/ezmlm-get.1
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index 373ed65629d..722d237e460 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2004/07/19 23:50:22 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2004/12/21 03:42:25 schmonz Exp $
 
-SHA1 (ezmlm-idx-0.421.tar.gz) = d7c2c7c87d58ae1c3aeb26f6fa34101fdfa71ab6
-Size (ezmlm-idx-0.421.tar.gz) = 540727 bytes
+SHA1 (ezmlm-idx-0.43.tar.gz) = 5b4ee602d1b609abfa622b062cfd0c6aecee28a6
+Size (ezmlm-idx-0.43.tar.gz) = 548053 bytes
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 Size (ezmlm-0.53.tar.gz) = 62693 bytes
-SHA1 (patch-aa) = e4b25f667ade7ffc853b1f116c5de44a015f9aeb
-SHA1 (patch-ab) = 3d51bc1ab750f5c9324815070f392f6f6aaa2da1
+SHA1 (patch-aa) = bf9262314857af39cc279e3c0e6d4ffef1138490
+SHA1 (patch-ab) = f5fa8156040ae1abd24a4c57a9d773de7fbadd57
+SHA1 (patch-ac) = e1e275e9b13a682beae6442815f6731c647691e1
diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk
index 284e2fdc405..171dfed00fa 100644
--- a/mail/ezmlm-idx/options.mk
+++ b/mail/ezmlm-idx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
+# $NetBSD: options.mk,v 1.5 2004/12/21 03:42:25 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm-idx
 PKG_SUPPORTED_OPTIONS=	mysql pgsql
@@ -22,7 +22,7 @@ PKG_FAIL_REASON+=       "MySQL and PostgreSQL cannot both be compiled in." \
 post-configure:
 	${ECHO} -I${BUILDLINK_PREFIX.mysql-client}/include/mysql > ${WRKSRC}/sub_mysql/conf-sqlcc
 	${ECHO} -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql -lmysqlclient > ${WRKSRC}/sub_mysql/conf-sqlld
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} mysql
+	${ECHO} mysql > ${WRKSRC}/conf-sub
 .  else
 PKG_FAIL_REASON+=	"mysql: can't define post-configure target"
 .  endif
@@ -37,7 +37,7 @@ PKG_FAIL_REASON+=	"mysql: can't define post-configure target"
 post-configure:
 	${ECHO} -I${PGSQL_PREFIX}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc
 	${ECHO} -L${PGSQL_PREFIX}/lib -Wl,-R${PGSQL_PREFIX}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pgsql
+	${ECHO} pgsql > ${WRKSRC}/conf-sub
 .  else
 PKG_FAIL_REASON+=	"pgsql: can't define post-configure target"
 .  endif
diff --git a/mail/ezmlm-idx/patches/patch-aa b/mail/ezmlm-idx/patches/patch-aa
index 436b2a81671..241a9df0c86 100644
--- a/mail/ezmlm-idx/patches/patch-aa
+++ b/mail/ezmlm-idx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/07/19 23:50:22 schmonz Exp $
+$NetBSD: patch-aa,v 1.3 2004/12/21 03:42:25 schmonz Exp $
 
---- idx.h.orig	2004-06-03 01:17:13.000000000 -0400
+--- idx.h.orig	2004-11-25 11:41:02.000000000 -0500
 +++ idx.h
-@@ -237,7 +237,7 @@
+@@ -244,7 +244,7 @@
  /* ezmlm-make looks first (unless the -c switch is specified) before  */
  /* falling back to the (usually unchanged) version in the ezmlm bin   */
  /* directory. */
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2004/07/19 23:50:22 schmonz Exp $
  
  /* same name added to auto_bin. Note leading slash! */
  #define TXT_EZMLMRC "/ezmlmrc"
-@@ -252,7 +252,7 @@
+@@ -259,7 +259,7 @@
  #define TXT_LOOPNUM "loopnum"
  
  /* ezmlm-cgi config file for normal SUID root install */
diff --git a/mail/ezmlm-idx/patches/patch-ab b/mail/ezmlm-idx/patches/patch-ab
index c3b422638e5..0e0747adf58 100644
--- a/mail/ezmlm-idx/patches/patch-ab
+++ b/mail/ezmlm-idx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2003/03/21 17:31:37 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2004/12/21 03:42:25 schmonz Exp $
 
---- BIN.orig	2003-03-21 18:19:14.000000000 +0100
+--- BIN.orig	2004-12-20 22:13:47.000000000 -0500
 +++ BIN
-@@ -21,9 +21,6 @@ c:::755:/:ezmlm-split:
+@@ -22,9 +22,6 @@ c:::755:/:ezmlm-split:
  c:::755:/:ezmlm-moderate:
  c:::755:/:ezmlm-sub:
  c:::755:/:ezmlm-unsub:
diff --git a/mail/ezmlm-idx/patches/patch-ac b/mail/ezmlm-idx/patches/patch-ac
new file mode 100644
index 00000000000..604d305dc8f
--- /dev/null
+++ b/mail/ezmlm-idx/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/12/21 03:42:25 schmonz Exp $
+
+--- Makefile.orig	2004-12-20 22:32:47.000000000 -0500
++++ Makefile
+@@ -1201,7 +1201,7 @@ ezmlmsubrc.0 ezmlm-mktab.0 ezmlm-split.0
+ getopt.0 now.0 sgetopt.0 stralloc.0 subfd.0 subgetopt.0 substdio.0 \
+ substdio_copy.0 substdio_in.0 substdio_out.0 surf.0 surfpcs.0 wait.0 \
+ ezmlm-clean.0 ezmlm-moderate.0 ezmlm-store.0 ezmlm-request.0 ezmlmrc.0 \
+-ezmlm-limit.0
++ezmlm-limit.0 ezmlm-confirm.0
+ 
+ mime.a: \
+ makelib concatHDR.o decodeHDR.o unfoldHDR.o \