Update mailman to 2.1.10 as a security fix for CVE-2008-0564

http://secunia.com/advisories/28794/

Includes many bug fixes, see share/doc/mailman/NEWS for details.

5 files changed, 261 insertions, 82 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 155f7aa032b..34b49767209 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2008/05/29 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2008/06/29 07:47:03 kim Exp $
 
-DISTNAME=	mailman-2.1.9
+DISTNAME=	mailman-2.1.10
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailman/}
 EXTRACT_SUFX=	.tgz
@@ -66,9 +66,6 @@ DEINSTALL_TEMPLATES+=	${FILESDIR}/DEINSTALL
 
 PYTHON_PATCH_SCRIPTS+=	Mailman/Archiver/pipermail.py
 PYTHON_PATCH_SCRIPTS+=	Mailman/Post.py
-PYTHON_PATCH_SCRIPTS+=	admin/bin/faq2ht.py
-PYTHON_PATCH_SCRIPTS+=	admin/bin/mm2do
-PYTHON_PATCH_SCRIPTS+=	admin/www/reset_pw.py
 PYTHON_PATCH_SCRIPTS+=	bin/msgfmt.py
 
 CONFIGURE_ARGS+=	--with-cgi-gid=${MAILMAN_CGIGROUP:Q}
@@ -115,7 +112,7 @@ post-install:
 	cd ${WRKSRC} && for i in [A-IN-U]*; do \
 		${INSTALL_DATA} $$i ${DOCDIR}/; \
 	done
-	cd ${WRKSRC}/admin/www && for i in \
+	cd ${WRKSRC}/doc && for i in \
 	    mailman-*.ps mailman-*.pdf mailman-*.txt; do \
 		${INSTALL_DATA} $$i ${DOCDIR}/; \
 	done
@@ -124,7 +121,6 @@ post-install:
 	${CHOWN} -R root:${MAILMAN_GROUP} ${EXECDIR}
 	${CHMOD} -R g+w ${EXECDIR}
 	${CHMOD} g+s ${EXECDIR}/cgi-bin/*
-	${RM} -f ${EXECDIR}/Mailman/mm_cfg.pyc
 	${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/lib/mailman/bin ${PREFIX}/lib/mailman/cron ${PREFIX}/lib/mailman/scripts
 
 .include "../../lang/python/application.mk"
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
index 9718ce8228d..015392ba651 100644
--- a/mail/mailman/PLIST
+++ b/mail/mailman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/09/25 18:56:44 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/06/29 07:47:03 kim Exp $
 lib/mailman/Mailman/Archiver/Archiver.py
 lib/mailman/Mailman/Archiver/Archiver.pyc
 lib/mailman/Mailman/Archiver/HyperArch.py
@@ -303,6 +303,8 @@ lib/mailman/bin/convert.py
 lib/mailman/bin/convert.pyc
 lib/mailman/bin/discard
 lib/mailman/bin/dumpdb
+lib/mailman/bin/export.py
+lib/mailman/bin/export.pyc
 lib/mailman/bin/find_member
 lib/mailman/bin/fix_url.py
 lib/mailman/bin/fix_url.pyc
@@ -359,8 +361,8 @@ lib/mailman/icons/mailman-large.jpg
 lib/mailman/icons/mailman.jpg
 lib/mailman/icons/mm-icon.png
 lib/mailman/mail/mailman
-lib/mailman/messages/ar/LC_MESSAGES/mailman.po
 lib/mailman/messages/ar/LC_MESSAGES/mailman.mo
+lib/mailman/messages/ar/LC_MESSAGES/mailman.po
 lib/mailman/messages/ca/LC_MESSAGES/mailman.mo
 lib/mailman/messages/ca/LC_MESSAGES/mailman.po
 lib/mailman/messages/cs/LC_MESSAGES/mailman.mo
@@ -384,6 +386,10 @@ lib/mailman/messages/fi/README.fi
 lib/mailman/messages/fr/LC_MESSAGES/mailman.mo
 lib/mailman/messages/fr/LC_MESSAGES/mailman.po
 lib/mailman/messages/fr/README.fr
+lib/mailman/messages/gl/LC_MESSAGES/mailman.mo
+lib/mailman/messages/gl/LC_MESSAGES/mailman.po
+lib/mailman/messages/he/LC_MESSAGES/mailman.mo
+lib/mailman/messages/he/LC_MESSAGES/mailman.po
 lib/mailman/messages/hr/LC_MESSAGES/mailman.mo
 lib/mailman/messages/hr/LC_MESSAGES/mailman.po
 lib/mailman/messages/hu/LC_MESSAGES/mailman.mo
@@ -418,6 +424,9 @@ lib/mailman/messages/ro/LC_MESSAGES/mailman.po
 lib/mailman/messages/ru/LC_MESSAGES/mailman.mo
 lib/mailman/messages/ru/LC_MESSAGES/mailman.po
 lib/mailman/messages/ru/README.ru
+lib/mailman/messages/sk/LC_MESSAGES/mailman.mo
+lib/mailman/messages/sk/LC_MESSAGES/mailman.po
+lib/mailman/messages/sk/README.sk
 lib/mailman/messages/sl/LC_MESSAGES/mailman.mo
 lib/mailman/messages/sl/LC_MESSAGES/mailman.po
 lib/mailman/messages/sr/LC_MESSAGES/mailman.mo
@@ -429,12 +438,12 @@ lib/mailman/messages/tr/LC_MESSAGES/mailman.mo
 lib/mailman/messages/tr/LC_MESSAGES/mailman.po
 lib/mailman/messages/uk/LC_MESSAGES/mailman.mo
 lib/mailman/messages/uk/LC_MESSAGES/mailman.po
-lib/mailman/messages/vi/LC_MESSAGES/mailman.po
 lib/mailman/messages/vi/LC_MESSAGES/mailman.mo
-lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.po
+lib/mailman/messages/vi/LC_MESSAGES/mailman.po
 lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.mo
-lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.po
+lib/mailman/messages/zh_CN/LC_MESSAGES/mailman.po
 lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.mo
+lib/mailman/messages/zh_TW/LC_MESSAGES/mailman.po
 lib/mailman/pythonlib/email/Charset.py
 lib/mailman/pythonlib/email/Charset.pyc
 lib/mailman/pythonlib/email/Encoders.py
@@ -618,7 +627,10 @@ lib/mailman/support/sitelist.cfg
 lib/mailman/templates/ar/admindbdetails.html
 lib/mailman/templates/ar/admindbpreamble.html
 lib/mailman/templates/ar/admindbsummary.html
+lib/mailman/templates/ar/adminsubscribeack.txt
+lib/mailman/templates/ar/adminunsubscribeack.txt
 lib/mailman/templates/ar/admlogin.html
+lib/mailman/templates/ar/approve.txt
 lib/mailman/templates/ar/archidxentry.html
 lib/mailman/templates/ar/archidxfoot.html
 lib/mailman/templates/ar/archidxhead.html
@@ -628,32 +640,29 @@ lib/mailman/templates/ar/archtoc.html
 lib/mailman/templates/ar/archtocentry.html
 lib/mailman/templates/ar/archtocnombox.html
 lib/mailman/templates/ar/article.html
-lib/mailman/templates/ar/emptyarchive.html
-lib/mailman/templates/ar/headfoot.html
-lib/mailman/templates/ar/listinfo.html
-lib/mailman/templates/ar/options.html
-lib/mailman/templates/ar/private.html
-lib/mailman/templates/ar/roster.html
-lib/mailman/templates/ar/subscribe.html
-lib/mailman/templates/ar/adminsubscribeack.txt
-lib/mailman/templates/ar/adminunsubscribeack.txt
-lib/mailman/templates/ar/approve.txt
 lib/mailman/templates/ar/bounce.txt
 lib/mailman/templates/ar/checkdbs.txt
 lib/mailman/templates/ar/convert.txt
 lib/mailman/templates/ar/cronpass.txt
 lib/mailman/templates/ar/disabled.txt
+lib/mailman/templates/ar/emptyarchive.html
+lib/mailman/templates/ar/headfoot.html
 lib/mailman/templates/ar/help.txt
 lib/mailman/templates/ar/invite.txt
+lib/mailman/templates/ar/listinfo.html
 lib/mailman/templates/ar/masthead.txt
 lib/mailman/templates/ar/newlist.txt
 lib/mailman/templates/ar/nomoretoday.txt
+lib/mailman/templates/ar/options.html
 lib/mailman/templates/ar/postack.txt
 lib/mailman/templates/ar/postauth.txt
 lib/mailman/templates/ar/postheld.txt
+lib/mailman/templates/ar/private.html
 lib/mailman/templates/ar/probe.txt
 lib/mailman/templates/ar/refuse.txt
+lib/mailman/templates/ar/roster.html
 lib/mailman/templates/ar/subauth.txt
+lib/mailman/templates/ar/subscribe.html
 lib/mailman/templates/ar/subscribeack.txt
 lib/mailman/templates/ar/unsub.txt
 lib/mailman/templates/ar/unsubauth.txt
@@ -708,6 +717,14 @@ lib/mailman/templates/cs/adminsubscribeack.txt
 lib/mailman/templates/cs/adminunsubscribeack.txt
 lib/mailman/templates/cs/admlogin.html
 lib/mailman/templates/cs/approve.txt
+lib/mailman/templates/cs/archidxentry.html
+lib/mailman/templates/cs/archidxfoot.html
+lib/mailman/templates/cs/archidxhead.html
+lib/mailman/templates/cs/archlistend.html
+lib/mailman/templates/cs/archliststart.html
+lib/mailman/templates/cs/archtoc.html
+lib/mailman/templates/cs/archtocentry.html
+lib/mailman/templates/cs/archtocnombox.html
 lib/mailman/templates/cs/article.html
 lib/mailman/templates/cs/bounce.txt
 lib/mailman/templates/cs/checkdbs.txt
@@ -717,14 +734,17 @@ lib/mailman/templates/cs/disabled.txt
 lib/mailman/templates/cs/emptyarchive.html
 lib/mailman/templates/cs/headfoot.html
 lib/mailman/templates/cs/help.txt
+lib/mailman/templates/cs/invite.txt
 lib/mailman/templates/cs/listinfo.html
 lib/mailman/templates/cs/masthead.txt
 lib/mailman/templates/cs/newlist.txt
+lib/mailman/templates/cs/nomoretoday.txt
 lib/mailman/templates/cs/options.html
 lib/mailman/templates/cs/postack.txt
 lib/mailman/templates/cs/postauth.txt
 lib/mailman/templates/cs/postheld.txt
 lib/mailman/templates/cs/private.html
+lib/mailman/templates/cs/probe.txt
 lib/mailman/templates/cs/refuse.txt
 lib/mailman/templates/cs/roster.html
 lib/mailman/templates/cs/subauth.txt
@@ -737,7 +757,10 @@ lib/mailman/templates/cs/verify.txt
 lib/mailman/templates/da/admindbdetails.html
 lib/mailman/templates/da/admindbpreamble.html
 lib/mailman/templates/da/admindbsummary.html
+lib/mailman/templates/da/adminsubscribeack.txt
+lib/mailman/templates/da/adminunsubscribeack.txt
 lib/mailman/templates/da/admlogin.html
+lib/mailman/templates/da/approve.txt
 lib/mailman/templates/da/archidxfoot.html
 lib/mailman/templates/da/archidxhead.html
 lib/mailman/templates/da/archliststart.html
@@ -745,32 +768,29 @@ lib/mailman/templates/da/archtoc.html
 lib/mailman/templates/da/archtocentry.html
 lib/mailman/templates/da/archtocnombox.html
 lib/mailman/templates/da/article.html
-lib/mailman/templates/da/emptyarchive.html
-lib/mailman/templates/da/headfoot.html
-lib/mailman/templates/da/listinfo.html
-lib/mailman/templates/da/options.html
-lib/mailman/templates/da/private.html
-lib/mailman/templates/da/roster.html
-lib/mailman/templates/da/subscribe.html
-lib/mailman/templates/da/approve.txt
-lib/mailman/templates/da/adminsubscribeack.txt
-lib/mailman/templates/da/adminunsubscribeack.txt
 lib/mailman/templates/da/bounce.txt
 lib/mailman/templates/da/checkdbs.txt
 lib/mailman/templates/da/convert.txt
 lib/mailman/templates/da/cronpass.txt
 lib/mailman/templates/da/disabled.txt
+lib/mailman/templates/da/emptyarchive.html
+lib/mailman/templates/da/headfoot.html
 lib/mailman/templates/da/help.txt
 lib/mailman/templates/da/invite.txt
+lib/mailman/templates/da/listinfo.html
 lib/mailman/templates/da/masthead.txt
 lib/mailman/templates/da/newlist.txt
 lib/mailman/templates/da/nomoretoday.txt
+lib/mailman/templates/da/options.html
 lib/mailman/templates/da/postack.txt
 lib/mailman/templates/da/postauth.txt
 lib/mailman/templates/da/postheld.txt
+lib/mailman/templates/da/private.html
 lib/mailman/templates/da/probe.txt
 lib/mailman/templates/da/refuse.txt
+lib/mailman/templates/da/roster.html
 lib/mailman/templates/da/subauth.txt
+lib/mailman/templates/da/subscribe.html
 lib/mailman/templates/da/subscribeack.txt
 lib/mailman/templates/da/unsub.txt
 lib/mailman/templates/da/unsubauth.txt
@@ -1041,6 +1061,7 @@ lib/mailman/templates/fr/postack.txt
 lib/mailman/templates/fr/postauth.txt
 lib/mailman/templates/fr/postheld.txt
 lib/mailman/templates/fr/private.html
+lib/mailman/templates/fr/probe.txt
 lib/mailman/templates/fr/refuse.txt
 lib/mailman/templates/fr/roster.html
 lib/mailman/templates/fr/subauth.txt
@@ -1050,6 +1071,93 @@ lib/mailman/templates/fr/unsub.txt
 lib/mailman/templates/fr/unsubauth.txt
 lib/mailman/templates/fr/userpass.txt
 lib/mailman/templates/fr/verify.txt
+lib/mailman/templates/gl/admindbdetails.html
+lib/mailman/templates/gl/admindbpreamble.html
+lib/mailman/templates/gl/admindbsummary.html
+lib/mailman/templates/gl/adminsubscribeack.txt
+lib/mailman/templates/gl/adminunsubscribeack.txt
+lib/mailman/templates/gl/admlogin.html
+lib/mailman/templates/gl/approve.txt
+lib/mailman/templates/gl/archidxentry.html
+lib/mailman/templates/gl/archidxfoot.html
+lib/mailman/templates/gl/archidxhead.html
+lib/mailman/templates/gl/archlistend.html
+lib/mailman/templates/gl/archliststart.html
+lib/mailman/templates/gl/archtoc.html
+lib/mailman/templates/gl/archtocentry.html
+lib/mailman/templates/gl/article.html
+lib/mailman/templates/gl/bounce.txt
+lib/mailman/templates/gl/checkdbs.txt
+lib/mailman/templates/gl/convert.txt
+lib/mailman/templates/gl/cronpass.txt
+lib/mailman/templates/gl/disabled.txt
+lib/mailman/templates/gl/emptyarchive.html
+lib/mailman/templates/gl/handle_opts.html
+lib/mailman/templates/gl/headfoot.html
+lib/mailman/templates/gl/help.txt
+lib/mailman/templates/gl/invite.txt
+lib/mailman/templates/gl/listinfo.html
+lib/mailman/templates/gl/masthead.txt
+lib/mailman/templates/gl/newlist.txt
+lib/mailman/templates/gl/nomoretoday.txt
+lib/mailman/templates/gl/options.html
+lib/mailman/templates/gl/postack.txt
+lib/mailman/templates/gl/postauth.txt
+lib/mailman/templates/gl/postheld.txt
+lib/mailman/templates/gl/private.html
+lib/mailman/templates/gl/refuse.txt
+lib/mailman/templates/gl/roster.html
+lib/mailman/templates/gl/subauth.txt
+lib/mailman/templates/gl/subscribe.html
+lib/mailman/templates/gl/subscribeack.txt
+lib/mailman/templates/gl/unsub.txt
+lib/mailman/templates/gl/unsubauth.txt
+lib/mailman/templates/gl/userpass.txt
+lib/mailman/templates/gl/verify.txt
+lib/mailman/templates/he/admindbdetails.html
+lib/mailman/templates/he/admindbpreamble.html
+lib/mailman/templates/he/admindbsummary.html
+lib/mailman/templates/he/adminsubscribeack.txt
+lib/mailman/templates/he/adminunsubscribeack.txt
+lib/mailman/templates/he/admlogin.html
+lib/mailman/templates/he/approve.txt
+lib/mailman/templates/he/archidxentry.html
+lib/mailman/templates/he/archidxfoot.html
+lib/mailman/templates/he/archidxhead.html
+lib/mailman/templates/he/archlistend.html
+lib/mailman/templates/he/archliststart.html
+lib/mailman/templates/he/archtoc.html
+lib/mailman/templates/he/archtocentry.html
+lib/mailman/templates/he/archtocnombox.html
+lib/mailman/templates/he/article.html
+lib/mailman/templates/he/bounce.txt
+lib/mailman/templates/he/checkdbs.txt
+lib/mailman/templates/he/convert.txt
+lib/mailman/templates/he/cronpass.txt
+lib/mailman/templates/he/disabled.txt
+lib/mailman/templates/he/emptyarchive.html
+lib/mailman/templates/he/headfoot.html
+lib/mailman/templates/he/help.txt
+lib/mailman/templates/he/invite.txt
+lib/mailman/templates/he/listinfo.html
+lib/mailman/templates/he/masthead.txt
+lib/mailman/templates/he/newlist.txt
+lib/mailman/templates/he/nomoretoday.txt
+lib/mailman/templates/he/options.html
+lib/mailman/templates/he/postack.txt
+lib/mailman/templates/he/postauth.txt
+lib/mailman/templates/he/postheld.txt
+lib/mailman/templates/he/private.html
+lib/mailman/templates/he/probe.txt
+lib/mailman/templates/he/refuse.txt
+lib/mailman/templates/he/roster.html
+lib/mailman/templates/he/subauth.txt
+lib/mailman/templates/he/subscribe.html
+lib/mailman/templates/he/subscribeack.txt
+lib/mailman/templates/he/unsub.txt
+lib/mailman/templates/he/unsubauth.txt
+lib/mailman/templates/he/userpass.txt
+lib/mailman/templates/he/verify.txt
 lib/mailman/templates/hr/admindbdetails.html
 lib/mailman/templates/hr/admindbpreamble.html
 lib/mailman/templates/hr/admindbsummary.html
@@ -1139,7 +1247,10 @@ lib/mailman/templates/hu/verify.txt
 lib/mailman/templates/ia/admindbdetails.html
 lib/mailman/templates/ia/admindbpreamble.html
 lib/mailman/templates/ia/admindbsummary.html
+lib/mailman/templates/ia/adminsubscribeack.txt
+lib/mailman/templates/ia/adminunsubscribeack.txt
 lib/mailman/templates/ia/admlogin.html
+lib/mailman/templates/ia/approve.txt
 lib/mailman/templates/ia/archidxentry.html
 lib/mailman/templates/ia/archidxfoot.html
 lib/mailman/templates/ia/archidxhead.html
@@ -1149,32 +1260,29 @@ lib/mailman/templates/ia/archtoc.html
 lib/mailman/templates/ia/archtocentry.html
 lib/mailman/templates/ia/archtocnombox.html
 lib/mailman/templates/ia/article.html
-lib/mailman/templates/ia/emptyarchive.html
-lib/mailman/templates/ia/headfoot.html
-lib/mailman/templates/ia/listinfo.html
-lib/mailman/templates/ia/options.html
-lib/mailman/templates/ia/private.html
-lib/mailman/templates/ia/roster.html
-lib/mailman/templates/ia/subscribe.html
-lib/mailman/templates/ia/adminsubscribeack.txt
-lib/mailman/templates/ia/adminunsubscribeack.txt
-lib/mailman/templates/ia/approve.txt
 lib/mailman/templates/ia/bounce.txt
 lib/mailman/templates/ia/checkdbs.txt
 lib/mailman/templates/ia/convert.txt
 lib/mailman/templates/ia/cronpass.txt
 lib/mailman/templates/ia/disabled.txt
+lib/mailman/templates/ia/emptyarchive.html
+lib/mailman/templates/ia/headfoot.html
 lib/mailman/templates/ia/help.txt
 lib/mailman/templates/ia/invite.txt
+lib/mailman/templates/ia/listinfo.html
 lib/mailman/templates/ia/masthead.txt
 lib/mailman/templates/ia/newlist.txt
 lib/mailman/templates/ia/nomoretoday.txt
+lib/mailman/templates/ia/options.html
 lib/mailman/templates/ia/postack.txt
 lib/mailman/templates/ia/postauth.txt
 lib/mailman/templates/ia/postheld.txt
+lib/mailman/templates/ia/private.html
 lib/mailman/templates/ia/probe.txt
 lib/mailman/templates/ia/refuse.txt
+lib/mailman/templates/ia/roster.html
 lib/mailman/templates/ia/subauth.txt
+lib/mailman/templates/ia/subscribe.html
 lib/mailman/templates/ia/subscribeack.txt
 lib/mailman/templates/ia/unsub.txt
 lib/mailman/templates/ia/unsubauth.txt
@@ -1443,6 +1551,7 @@ lib/mailman/templates/pl/archlistend.html
 lib/mailman/templates/pl/archliststart.html
 lib/mailman/templates/pl/archtoc.html
 lib/mailman/templates/pl/archtocentry.html
+lib/mailman/templates/pl/archtocnombox.html
 lib/mailman/templates/pl/article.html
 lib/mailman/templates/pl/bounce.txt
 lib/mailman/templates/pl/checkdbs.txt
@@ -1603,7 +1712,6 @@ lib/mailman/templates/ru/admindbsummary.html
 lib/mailman/templates/ru/adminsubscribeack.txt
 lib/mailman/templates/ru/adminunsubscribeack.txt
 lib/mailman/templates/ru/admlogin.html
-lib/mailman/templates/ru/archtocnombox.html
 lib/mailman/templates/ru/approve.txt
 lib/mailman/templates/ru/archidxentry.html
 lib/mailman/templates/ru/archidxfoot.html
@@ -1612,6 +1720,7 @@ lib/mailman/templates/ru/archlistend.html
 lib/mailman/templates/ru/archliststart.html
 lib/mailman/templates/ru/archtoc.html
 lib/mailman/templates/ru/archtocentry.html
+lib/mailman/templates/ru/archtocnombox.html
 lib/mailman/templates/ru/article.html
 lib/mailman/templates/ru/bounce.txt
 lib/mailman/templates/ru/checkdbs.txt
@@ -1641,6 +1750,50 @@ lib/mailman/templates/ru/unsub.txt
 lib/mailman/templates/ru/unsubauth.txt
 lib/mailman/templates/ru/userpass.txt
 lib/mailman/templates/ru/verify.txt
+lib/mailman/templates/sk/admindbdetails.html
+lib/mailman/templates/sk/admindbpreamble.html
+lib/mailman/templates/sk/admindbsummary.html
+lib/mailman/templates/sk/adminsubscribeack.txt
+lib/mailman/templates/sk/adminunsubscribeack.txt
+lib/mailman/templates/sk/admlogin.html
+lib/mailman/templates/sk/approve.txt
+lib/mailman/templates/sk/archidxentry.html
+lib/mailman/templates/sk/archidxfoot.html
+lib/mailman/templates/sk/archidxhead.html
+lib/mailman/templates/sk/archlistend.html
+lib/mailman/templates/sk/archliststart.html
+lib/mailman/templates/sk/archtoc.html
+lib/mailman/templates/sk/archtocentry.html
+lib/mailman/templates/sk/archtocnombox.html
+lib/mailman/templates/sk/article.html
+lib/mailman/templates/sk/bounce.txt
+lib/mailman/templates/sk/checkdbs.txt
+lib/mailman/templates/sk/convert.txt
+lib/mailman/templates/sk/cronpass.txt
+lib/mailman/templates/sk/disabled.txt
+lib/mailman/templates/sk/emptyarchive.html
+lib/mailman/templates/sk/headfoot.html
+lib/mailman/templates/sk/help.txt
+lib/mailman/templates/sk/invite.txt
+lib/mailman/templates/sk/listinfo.html
+lib/mailman/templates/sk/masthead.txt
+lib/mailman/templates/sk/newlist.txt
+lib/mailman/templates/sk/nomoretoday.txt
+lib/mailman/templates/sk/options.html
+lib/mailman/templates/sk/postack.txt
+lib/mailman/templates/sk/postauth.txt
+lib/mailman/templates/sk/postheld.txt
+lib/mailman/templates/sk/private.html
+lib/mailman/templates/sk/probe.txt
+lib/mailman/templates/sk/refuse.txt
+lib/mailman/templates/sk/roster.html
+lib/mailman/templates/sk/subauth.txt
+lib/mailman/templates/sk/subscribe.html
+lib/mailman/templates/sk/subscribeack.txt
+lib/mailman/templates/sk/unsub.txt
+lib/mailman/templates/sk/unsubauth.txt
+lib/mailman/templates/sk/userpass.txt
+lib/mailman/templates/sk/verify.txt
 lib/mailman/templates/sl/admindbdetails.html
 lib/mailman/templates/sl/admindbpreamble.html
 lib/mailman/templates/sl/admindbsummary.html
@@ -1812,7 +1965,6 @@ lib/mailman/templates/uk/admindbsummary.html
 lib/mailman/templates/uk/adminsubscribeack.txt
 lib/mailman/templates/uk/adminunsubscribeack.txt
 lib/mailman/templates/uk/admlogin.html
-lib/mailman/templates/uk/archtocnombox.html
 lib/mailman/templates/uk/approve.txt
 lib/mailman/templates/uk/archidxentry.html
 lib/mailman/templates/uk/archidxfoot.html
@@ -1821,6 +1973,7 @@ lib/mailman/templates/uk/archlistend.html
 lib/mailman/templates/uk/archliststart.html
 lib/mailman/templates/uk/archtoc.html
 lib/mailman/templates/uk/archtocentry.html
+lib/mailman/templates/uk/archtocnombox.html
 lib/mailman/templates/uk/article.html
 lib/mailman/templates/uk/bounce.txt
 lib/mailman/templates/uk/checkdbs.txt
@@ -1853,7 +2006,10 @@ lib/mailman/templates/uk/verify.txt
 lib/mailman/templates/vi/admindbdetails.html
 lib/mailman/templates/vi/admindbpreamble.html
 lib/mailman/templates/vi/admindbsummary.html
+lib/mailman/templates/vi/adminsubscribeack.txt
+lib/mailman/templates/vi/adminunsubscribeack.txt
 lib/mailman/templates/vi/admlogin.html
+lib/mailman/templates/vi/approve.txt
 lib/mailman/templates/vi/archidxentry.html
 lib/mailman/templates/vi/archidxfoot.html
 lib/mailman/templates/vi/archidxhead.html
@@ -1863,32 +2019,29 @@ lib/mailman/templates/vi/archtoc.html
 lib/mailman/templates/vi/archtocentry.html
 lib/mailman/templates/vi/archtocnombox.html
 lib/mailman/templates/vi/article.html
-lib/mailman/templates/vi/emptyarchive.html
-lib/mailman/templates/vi/headfoot.html
-lib/mailman/templates/vi/listinfo.html
-lib/mailman/templates/vi/options.html
-lib/mailman/templates/vi/private.html
-lib/mailman/templates/vi/roster.html
-lib/mailman/templates/vi/subscribe.html
-lib/mailman/templates/vi/adminsubscribeack.txt
-lib/mailman/templates/vi/adminunsubscribeack.txt
-lib/mailman/templates/vi/approve.txt
 lib/mailman/templates/vi/bounce.txt
 lib/mailman/templates/vi/checkdbs.txt
 lib/mailman/templates/vi/convert.txt
 lib/mailman/templates/vi/cronpass.txt
 lib/mailman/templates/vi/disabled.txt
+lib/mailman/templates/vi/emptyarchive.html
+lib/mailman/templates/vi/headfoot.html
 lib/mailman/templates/vi/help.txt
 lib/mailman/templates/vi/invite.txt
+lib/mailman/templates/vi/listinfo.html
 lib/mailman/templates/vi/masthead.txt
 lib/mailman/templates/vi/newlist.txt
 lib/mailman/templates/vi/nomoretoday.txt
+lib/mailman/templates/vi/options.html
 lib/mailman/templates/vi/postack.txt
 lib/mailman/templates/vi/postauth.txt
 lib/mailman/templates/vi/postheld.txt
+lib/mailman/templates/vi/private.html
 lib/mailman/templates/vi/probe.txt
 lib/mailman/templates/vi/refuse.txt
+lib/mailman/templates/vi/roster.html
 lib/mailman/templates/vi/subauth.txt
+lib/mailman/templates/vi/subscribe.html
 lib/mailman/templates/vi/subscribeack.txt
 lib/mailman/templates/vi/unsub.txt
 lib/mailman/templates/vi/unsubauth.txt
@@ -1897,7 +2050,10 @@ lib/mailman/templates/vi/verify.txt
 lib/mailman/templates/zh_CN/admindbdetails.html
 lib/mailman/templates/zh_CN/admindbpreamble.html
 lib/mailman/templates/zh_CN/admindbsummary.html
+lib/mailman/templates/zh_CN/adminsubscribeack.txt
+lib/mailman/templates/zh_CN/adminunsubscribeack.txt
 lib/mailman/templates/zh_CN/admlogin.html
+lib/mailman/templates/zh_CN/approve.txt
 lib/mailman/templates/zh_CN/archidxentry.html
 lib/mailman/templates/zh_CN/archidxfoot.html
 lib/mailman/templates/zh_CN/archidxhead.html
@@ -1907,60 +2063,57 @@ lib/mailman/templates/zh_CN/archtoc.html
 lib/mailman/templates/zh_CN/archtocentry.html
 lib/mailman/templates/zh_CN/archtocnombox.html
 lib/mailman/templates/zh_CN/article.html
-lib/mailman/templates/zh_CN/emptyarchive.html
-lib/mailman/templates/zh_CN/headfoot.html
-lib/mailman/templates/zh_CN/listinfo.html
-lib/mailman/templates/zh_CN/options.html
-lib/mailman/templates/zh_CN/private.html
-lib/mailman/templates/zh_CN/roster.html
-lib/mailman/templates/zh_CN/subscribe.html
-lib/mailman/templates/zh_CN/adminsubscribeack.txt
-lib/mailman/templates/zh_CN/adminunsubscribeack.txt
-lib/mailman/templates/zh_CN/approve.txt
 lib/mailman/templates/zh_CN/bounce.txt
 lib/mailman/templates/zh_CN/checkdbs.txt
 lib/mailman/templates/zh_CN/convert.txt
 lib/mailman/templates/zh_CN/cronpass.txt
 lib/mailman/templates/zh_CN/disabled.txt
+lib/mailman/templates/zh_CN/emptyarchive.html
+lib/mailman/templates/zh_CN/headfoot.html
 lib/mailman/templates/zh_CN/help.txt
 lib/mailman/templates/zh_CN/invite.txt
+lib/mailman/templates/zh_CN/listinfo.html
 lib/mailman/templates/zh_CN/masthead.txt
 lib/mailman/templates/zh_CN/newlist.txt
 lib/mailman/templates/zh_CN/nomoretoday.txt
+lib/mailman/templates/zh_CN/options.html
 lib/mailman/templates/zh_CN/postack.txt
 lib/mailman/templates/zh_CN/postauth.txt
 lib/mailman/templates/zh_CN/postheld.txt
+lib/mailman/templates/zh_CN/private.html
 lib/mailman/templates/zh_CN/probe.txt
 lib/mailman/templates/zh_CN/refuse.txt
+lib/mailman/templates/zh_CN/roster.html
 lib/mailman/templates/zh_CN/subauth.txt
+lib/mailman/templates/zh_CN/subscribe.html
 lib/mailman/templates/zh_CN/subscribeack.txt
 lib/mailman/templates/zh_CN/unsub.txt
 lib/mailman/templates/zh_CN/unsubauth.txt
 lib/mailman/templates/zh_CN/userpass.txt
 lib/mailman/templates/zh_CN/verify.txt
 lib/mailman/templates/zh_TW/admindbpreamble.html
-lib/mailman/templates/zh_TW/admlogin.html
-lib/mailman/templates/zh_TW/handle_opts.html
-lib/mailman/templates/zh_TW/headfoot.html
-lib/mailman/templates/zh_TW/listinfo.html
-lib/mailman/templates/zh_TW/options.html
-lib/mailman/templates/zh_TW/roster.html
-lib/mailman/templates/zh_TW/subscribe.html
 lib/mailman/templates/zh_TW/adminsubscribeack.txt
 lib/mailman/templates/zh_TW/adminunsubscribeack.txt
+lib/mailman/templates/zh_TW/admlogin.html
 lib/mailman/templates/zh_TW/approve.txt
 lib/mailman/templates/zh_TW/bounce.txt
 lib/mailman/templates/zh_TW/checkdbs.txt
 lib/mailman/templates/zh_TW/convert.txt
 lib/mailman/templates/zh_TW/cronpass.txt
+lib/mailman/templates/zh_TW/handle_opts.html
+lib/mailman/templates/zh_TW/headfoot.html
 lib/mailman/templates/zh_TW/help.txt
+lib/mailman/templates/zh_TW/listinfo.html
 lib/mailman/templates/zh_TW/masthead.txt
 lib/mailman/templates/zh_TW/newlist.txt
+lib/mailman/templates/zh_TW/options.html
 lib/mailman/templates/zh_TW/postack.txt
 lib/mailman/templates/zh_TW/postauth.txt
 lib/mailman/templates/zh_TW/postheld.txt
 lib/mailman/templates/zh_TW/refuse.txt
+lib/mailman/templates/zh_TW/roster.html
 lib/mailman/templates/zh_TW/subauth.txt
+lib/mailman/templates/zh_TW/subscribe.html
 lib/mailman/templates/zh_TW/subscribeack.txt
 lib/mailman/templates/zh_TW/userpass.txt
 lib/mailman/templates/zh_TW/verify.txt
@@ -1983,6 +2136,7 @@ lib/mailman/tests/bounces/dsn_11.txt
 lib/mailman/tests/bounces/dsn_12.txt
 lib/mailman/tests/bounces/dsn_13.txt
 lib/mailman/tests/bounces/dsn_14.txt
+lib/mailman/tests/bounces/dsn_15.txt
 lib/mailman/tests/bounces/dumbass_01.txt
 lib/mailman/tests/bounces/exim_01.txt
 lib/mailman/tests/bounces/groupwise_01.txt
@@ -2002,6 +2156,8 @@ lib/mailman/tests/bounces/postfix_05.txt
 lib/mailman/tests/bounces/qmail_01.txt
 lib/mailman/tests/bounces/qmail_02.txt
 lib/mailman/tests/bounces/qmail_03.txt
+lib/mailman/tests/bounces/qmail_04.txt
+lib/mailman/tests/bounces/qmail_05.txt
 lib/mailman/tests/bounces/sendmail_01.txt
 lib/mailman/tests/bounces/simple_01.txt
 lib/mailman/tests/bounces/simple_02.txt
@@ -2019,6 +2175,17 @@ lib/mailman/tests/bounces/simple_13.txt
 lib/mailman/tests/bounces/simple_14.txt
 lib/mailman/tests/bounces/simple_15.txt
 lib/mailman/tests/bounces/simple_16.txt
+lib/mailman/tests/bounces/simple_17.txt
+lib/mailman/tests/bounces/simple_18.txt
+lib/mailman/tests/bounces/simple_19.txt
+lib/mailman/tests/bounces/simple_20.txt
+lib/mailman/tests/bounces/simple_21.txt
+lib/mailman/tests/bounces/simple_22.txt
+lib/mailman/tests/bounces/simple_23.txt
+lib/mailman/tests/bounces/simple_24.txt
+lib/mailman/tests/bounces/simple_25.txt
+lib/mailman/tests/bounces/simple_26.txt
+lib/mailman/tests/bounces/simple_27.txt
 lib/mailman/tests/bounces/sina_01.txt
 lib/mailman/tests/bounces/smtp32_01.txt
 lib/mailman/tests/bounces/smtp32_02.txt
@@ -2026,6 +2193,7 @@ lib/mailman/tests/bounces/smtp32_03.txt
 lib/mailman/tests/bounces/smtp32_04.txt
 lib/mailman/tests/bounces/smtp32_05.txt
 lib/mailman/tests/bounces/smtp32_06.txt
+lib/mailman/tests/bounces/smtp32_07.txt
 lib/mailman/tests/bounces/yahoo_01.txt
 lib/mailman/tests/bounces/yahoo_02.txt
 lib/mailman/tests/bounces/yahoo_03.txt
@@ -2070,6 +2238,9 @@ share/doc/mailman/mailman-admin.txt
 share/doc/mailman/mailman-install.pdf
 share/doc/mailman/mailman-install.ps
 share/doc/mailman/mailman-install.txt
+share/doc/mailman/mailman-member-es.pdf
+share/doc/mailman/mailman-member-es.ps
+share/doc/mailman/mailman-member-es.txt
 share/doc/mailman/mailman-member.pdf
 share/doc/mailman/mailman-member.ps
 share/doc/mailman/mailman-member.txt
@@ -2088,6 +2259,7 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/templates/sv
 @dirrm lib/mailman/templates/sr
 @dirrm lib/mailman/templates/sl
+@dirrm lib/mailman/templates/sk
 @dirrm lib/mailman/templates/ru
 @dirrm lib/mailman/templates/ro
 @dirrm lib/mailman/templates/pt_BR
@@ -2102,6 +2274,8 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/templates/ia
 @dirrm lib/mailman/templates/hu
 @dirrm lib/mailman/templates/hr
+@dirrm lib/mailman/templates/he
+@dirrm lib/mailman/templates/gl
 @dirrm lib/mailman/templates/fr
 @dirrm lib/mailman/templates/fi
 @dirrm lib/mailman/templates/eu
@@ -2146,6 +2320,8 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/messages/sr
 @dirrm lib/mailman/messages/sl/LC_MESSAGES
 @dirrm lib/mailman/messages/sl
+@dirrm lib/mailman/messages/sk/LC_MESSAGES
+@dirrm lib/mailman/messages/sk
 @dirrm lib/mailman/messages/ru/LC_MESSAGES
 @dirrm lib/mailman/messages/ru
 @dirrm lib/mailman/messages/ro/LC_MESSAGES
@@ -2174,6 +2350,10 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/messages/hu
 @dirrm lib/mailman/messages/hr/LC_MESSAGES
 @dirrm lib/mailman/messages/hr
+@dirrm lib/mailman/messages/he/LC_MESSAGES
+@dirrm lib/mailman/messages/he
+@dirrm lib/mailman/messages/gl/LC_MESSAGES
+@dirrm lib/mailman/messages/gl
 @dirrm lib/mailman/messages/fr/LC_MESSAGES
 @dirrm lib/mailman/messages/fr
 @dirrm lib/mailman/messages/fi/LC_MESSAGES
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 240f94059ca..9c89b13a18a 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.14 2006/09/25 18:56:44 bouyer Exp $
+$NetBSD: distinfo,v 1.15 2008/06/29 07:47:03 kim Exp $
 
-SHA1 (mailman-2.1.9.tgz) = e9f6f55e2551c3e576460749383da20599412d42
-RMD160 (mailman-2.1.9.tgz) = 135f94eeecca1f562f98dfe98c1a367bed229372
-Size (mailman-2.1.9.tgz) = 7829201 bytes
+SHA1 (mailman-2.1.10.tgz) = 3031122824093422ebe2c9428edbfac3a55e8080
+RMD160 (mailman-2.1.10.tgz) = d0703bec7faa67aaea1d4e27898b60bab186a7b5
+Size (mailman-2.1.10.tgz) = 7969072 bytes
 SHA1 (patch-aa) = f0bc550b28794008ea840a88a5b0053578f3ae0f
 SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
 SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
 SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
 SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
-SHA1 (patch-ag) = f94f190e69ce892841b88574ec8e9f100b182ed9
+SHA1 (patch-ag) = 5fda86a90ef17a08c304ae89f0934812601d5dfc
 SHA1 (patch-ah) = 42296c52e30b1fcc1d42ef0f1b89c83414ca85df
diff --git a/mail/mailman/files/INSTALL b/mail/mailman/files/INSTALL
index edaa878708a..c119eebca22 100644
--- a/mail/mailman/files/INSTALL
+++ b/mail/mailman/files/INSTALL
@@ -1,8 +1,11 @@
-# $NetBSD: INSTALL,v 1.1 2004/12/25 16:55:33 kim Exp $
+# $NetBSD: INSTALL,v 1.2 2008/06/29 07:47:03 kim Exp $
 
 case ${STAGE} in
 POST-INSTALL)
     # Fix file permissions
     ${PKG_PREFIX}/lib/mailman/bin/check_perms -f
+    # Remove compiled config file to avoid the need to recompile it
+    # when it is modified.
+    ${RM} -f ${PKG_PREFIX}/lib/mailman/Mailman/mm_cfg.pyc
     ;;
 esac
diff --git a/mail/mailman/patches/patch-ag b/mail/mailman/patches/patch-ag
index 34b9f6726c5..26369ff12aa 100644
--- a/mail/mailman/patches/patch-ag
+++ b/mail/mailman/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2003/12/23 11:02:13 xtraeme Exp $
+$NetBSD: patch-ag,v 1.2 2008/06/29 07:47:03 kim Exp $
 
---- bin/check_perms.orig	Mon Mar 31 14:07:55 2003
-+++ bin/check_perms
-@@ -70,8 +70,14 @@ class State:
+--- bin/check_perms.orig	2008-04-21 21:28:22.000000000 +0300
++++ bin/check_perms	2008-06-29 09:06:30.000000000 +0300
+@@ -70,8 +70,14 @@
  
  STATE = State()
  
@@ -18,4 +18,4 @@ $NetBSD: patch-ag,v 1.1 2003/12/23 11:02:13 xtraeme Exp $
 +
  PYFILEPERMS = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
  ARTICLEFILEPERMS = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
- 
+ PRIVATEPERMS = QFILEPERMS