Update to 2.1.6. Changes (note: the fix for CAN-2005-0202 was already in

pkgsrc as patches/patch-ai):

  Security

    - Added the ability for Mailman generated passwords (both member and list
      admin) to be more cryptographically secure.  See new configuration
      variables USER_FRIENDLY_PASSWORDS, MEMBER_PASSWORD_LENGTH, and
      ADMIN_PASSWORD_LENGTH.  Also added a new bin/withlist script called
      reset_pw.py which can be used to reset all member passwords.  Passwords
      generated by Mailman are now 8 characters by default for members, and 10
      characters for list administrators.

    - A potential cross-site scripting hole in the driver script has been
      closed.  Thanks to Florian Weimer for its discovery.  Also, turn
      STEALTH_MODE on by default.
  Internationalization

    - Chinese languages are now supported.  They have been moved from 'big5'
      and 'gb' to 'zh_TW' and 'zh_CN' respectively for compliance to the IANA
      spec.  Note, however, that the character sets were changed from 'Big5'
      or 'GB2312' to 'UTF-8' to cope with the insufficient codecs support in
      Python 2.3 and earlier.  You may have to install Chinese capable codecs
      (like CJKCodecs) separately to handle the incoming messages which are in
      local charsets, or upgrade your Python to 2.4 or newer.

  Behavior or defaults changes

    - VERP_PROBES is disabled by default.

    - bin/withlist can be run without a list name, but only if -i is given.
      Also, withlist puts the directory it's found in at the end of sys.path,
      making it easier to run withlist scripts that live in $prefix/bin.

    - bin/newlist grew two new options: -u/--urlhost and -e/--emailhost which
      lets the user provide the web and email hostnames for the new mailing
      list.  This is a better way to specify the domain for the list, rather
      than the old 'mylist@hostname' syntax (which is still supported for
      backward compatibility, but deprecated).
  Compatibility

    - Python 2.4 compatibility issue: time.strftime() became strict about the
      'day of year' range.  (1078482)

  New Features

    - New feature: automatic discards of held messages.  List owners can now
      set how many days to hold the messages in the moderator request queue.
      cron/checkdb will automatically discard old messages.  See the
      max_days_to_hold variable in the General Options and
      DEFAULT_MAX_DAYS_TO_HOLD in Defaults.py.  This defaults to 0
      (i.e. disabled). (790494)

    - New feature: subject_prefix can be configured to include a sequence
      number which is taken from the post_id variable.  Also, the prefix is
      always put at the start of the subject, i.e. "[list-name] Re: original
      subject", if mm_cfg.OLD_STYLE_PREFIXING is set No.  The default style
      is "Re: [list-name]" if numbering is not set, for backward compatibility.
      If the list owner is using numbering feature by "%d" directive, the new
      style, "[list-name 123] Re:", is always used.
    - List owners can now cusomize the non-member rejection notice from
      admin/<listname>/privacy/sender page. (1107169)

    - Allow editing of the welcome message from the admin page (1085501).

    - List owners can now use Scrubber to get the attachments scrubbed (held
      in the web archive), if the site admin permits it in mm_cfg.py.  New
      variables introduced are SCRUBBER_DONT_USE_ATTACHMENT_FILENAME and
      SCRUBBER_USE_ATTACHMENT_FILENAME_EXTENSION in Defaults.py for scrubber
      behavior.  (904850)

  Documentation

    - Most of the installation instructions have been moved to a latex
      document.  See admin/www/mailman-install/index.html for details.

  Bug fixes and other patches

    - Mail-to-news gateway now strips subject prefix off from a response
      by a mail user if news_prefix_subject_too is not set.

    - Date and Message-Id headers are added for digests. (1116952)
    - Improved mail address sanity check.  (1030228)

    - SpamDetect.py now checks attachment header.  (1026977)

    - Filter attachments by filename extensions.  (1027882)

    - Bugs and patches: 955381 (older Python compatibility), 1020102/1013079/
      1020013 (fix spam filter removed), 665569 (newer Postfix bounce
      detection), 970383 (moderator -1 admin requests pending), 873035
      (subject handling in -request mail), 799166/946554 (makefile
      compatibility), 872068 (add header/footer via unicode), 1032434
      (KNOWN_SPAMMERS check for multi-header), 1025372 (empty Cc:), 789015
      (fix pipermail URL), 948152 (Out of date link on Docs),  1099138
      (Scrubber.py breaks on None part),  1099840/1099840 (deprecated %
      insertion),  880073/933762 (List-ID RFC compliance),  1090439 (passwd
      reminder shunted), 1112349 (case insensitivity in acceptable_aliases),
      1117618 (Don't Cc for personalized anonymous list), 1190404 (wrong
      permission after editing html)

5 files changed, 155 insertions, 119 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index dead1758e7d..eaf4b6c9545 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2005/03/02 21:09:56 kim Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 23:25:07 bouyer Exp $
 
-DISTNAME=	mailman-2.1.5
+DISTNAME=	mailman-2.1.6
 PKGREVISION=	# empty
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.list.org/ \
@@ -65,7 +65,7 @@ RCD_SCRIPTS=		mailman
 INSTALL_EXTRA_TMPL+=	${FILESDIR}/INSTALL
 DEINSTALL_EXTRA_TMPL+=	${FILESDIR}/DEINSTALL
 
-PYTHON_VERSIONS_ACCEPTED= 23 22 21
+PYTHON_VERSIONS_ACCEPTED= 24 23 22 21
 PYTHON_PATCH_SCRIPTS+=	Mailman/Archiver/pipermail.py
 PYTHON_PATCH_SCRIPTS+=	Mailman/Post.py
 PYTHON_PATCH_SCRIPTS+=	admin/bin/Release.py
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
index 30a17df640c..3fbcd0378c4 100644
--- a/mail/mailman/PLIST
+++ b/mail/mailman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/02 20:34:00 reed Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/06/01 23:25:07 bouyer Exp $
 lib/mailman/Mailman/Archiver/Archiver.py
 lib/mailman/Mailman/Archiver/Archiver.pyc
 lib/mailman/Mailman/Archiver/HyperArch.py
@@ -317,6 +317,7 @@ lib/mailman/bin/paths.pyc
 lib/mailman/bin/qrunner
 lib/mailman/bin/rb-archfix
 lib/mailman/bin/remove_members
+lib/mailman/bin/reset_pw.py
 lib/mailman/bin/rmlist
 lib/mailman/bin/show_qfiles
 lib/mailman/bin/sync_members
@@ -417,6 +418,10 @@ 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/zh_CN/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_TW/LC_MESSAGES/mailman.mo
 lib/mailman/pythonlib/email/Charset.py
 lib/mailman/pythonlib/email/Charset.pyc
 lib/mailman/pythonlib/email/Encoders.py
@@ -596,32 +601,6 @@ lib/mailman/scripts/request
 lib/mailman/scripts/subscribe
 lib/mailman/scripts/unsubscribe
 lib/mailman/support/sitelist.cfg
-lib/mailman/templates/big5/admindbpreamble.html
-lib/mailman/templates/big5/adminsubscribeack.txt
-lib/mailman/templates/big5/adminunsubscribeack.txt
-lib/mailman/templates/big5/admlogin.html
-lib/mailman/templates/big5/approve.txt
-lib/mailman/templates/big5/bounce.txt
-lib/mailman/templates/big5/checkdbs.txt
-lib/mailman/templates/big5/convert.txt
-lib/mailman/templates/big5/cronpass.txt
-lib/mailman/templates/big5/handle_opts.html
-lib/mailman/templates/big5/headfoot.html
-lib/mailman/templates/big5/help.txt
-lib/mailman/templates/big5/listinfo.html
-lib/mailman/templates/big5/masthead.txt
-lib/mailman/templates/big5/newlist.txt
-lib/mailman/templates/big5/options.html
-lib/mailman/templates/big5/postack.txt
-lib/mailman/templates/big5/postauth.txt
-lib/mailman/templates/big5/postheld.txt
-lib/mailman/templates/big5/refuse.txt
-lib/mailman/templates/big5/roster.html
-lib/mailman/templates/big5/subauth.txt
-lib/mailman/templates/big5/subscribe.html
-lib/mailman/templates/big5/subscribeack.txt
-lib/mailman/templates/big5/userpass.txt
-lib/mailman/templates/big5/verify.txt
 lib/mailman/templates/ca/admindbdetails.html
 lib/mailman/templates/ca/admindbpreamble.html
 lib/mailman/templates/ca/admindbsummary.html
@@ -697,6 +676,48 @@ lib/mailman/templates/cs/unsub.txt
 lib/mailman/templates/cs/unsubauth.txt
 lib/mailman/templates/cs/userpass.txt
 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/admlogin.html
+lib/mailman/templates/da/archidxfoot.html
+lib/mailman/templates/da/archidxhead.html
+lib/mailman/templates/da/archliststart.html
+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/help.txt
+lib/mailman/templates/da/invite.txt
+lib/mailman/templates/da/masthead.txt
+lib/mailman/templates/da/newlist.txt
+lib/mailman/templates/da/nomoretoday.txt
+lib/mailman/templates/da/postack.txt
+lib/mailman/templates/da/postauth.txt
+lib/mailman/templates/da/postheld.txt
+lib/mailman/templates/da/probe.txt
+lib/mailman/templates/da/refuse.txt
+lib/mailman/templates/da/subauth.txt
+lib/mailman/templates/da/subscribeack.txt
+lib/mailman/templates/da/unsub.txt
+lib/mailman/templates/da/unsubauth.txt
+lib/mailman/templates/da/userpass.txt
+lib/mailman/templates/da/verify.txt
 lib/mailman/templates/de/admindbdetails.html
 lib/mailman/templates/de/admindbpreamble.html
 lib/mailman/templates/de/admindbsummary.html
@@ -780,6 +801,14 @@ lib/mailman/templates/es/adminsubscribeack.txt
 lib/mailman/templates/es/adminunsubscribeack.txt
 lib/mailman/templates/es/admlogin.html
 lib/mailman/templates/es/approve.txt
+lib/mailman/templates/es/archidxentry.html
+lib/mailman/templates/es/archidxfoot.html
+lib/mailman/templates/es/archidxhead.html
+lib/mailman/templates/es/archlistend.html
+lib/mailman/templates/es/archliststart.html
+lib/mailman/templates/es/archtoc.html
+lib/mailman/templates/es/archtocentry.html
+lib/mailman/templates/es/archtocnombox.html
 lib/mailman/templates/es/article.html
 lib/mailman/templates/es/bounce.txt
 lib/mailman/templates/es/checkdbs.txt
@@ -800,6 +829,7 @@ lib/mailman/templates/es/postack.txt
 lib/mailman/templates/es/postauth.txt
 lib/mailman/templates/es/postheld.txt
 lib/mailman/templates/es/private.html
+lib/mailman/templates/es/probe.txt
 lib/mailman/templates/es/refuse.txt
 lib/mailman/templates/es/roster.html
 lib/mailman/templates/es/subauth.txt
@@ -961,32 +991,6 @@ 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/gb/admindbpreamble.html
-lib/mailman/templates/gb/adminsubscribeack.txt
-lib/mailman/templates/gb/adminunsubscribeack.txt
-lib/mailman/templates/gb/admlogin.html
-lib/mailman/templates/gb/approve.txt
-lib/mailman/templates/gb/bounce.txt
-lib/mailman/templates/gb/checkdbs.txt
-lib/mailman/templates/gb/convert.txt
-lib/mailman/templates/gb/cronpass.txt
-lib/mailman/templates/gb/handle_opts.html
-lib/mailman/templates/gb/headfoot.html
-lib/mailman/templates/gb/help.txt
-lib/mailman/templates/gb/listinfo.html
-lib/mailman/templates/gb/masthead.txt
-lib/mailman/templates/gb/newlist.txt
-lib/mailman/templates/gb/options.html
-lib/mailman/templates/gb/postack.txt
-lib/mailman/templates/gb/postauth.txt
-lib/mailman/templates/gb/postheld.txt
-lib/mailman/templates/gb/refuse.txt
-lib/mailman/templates/gb/roster.html
-lib/mailman/templates/gb/subauth.txt
-lib/mailman/templates/gb/subscribe.html
-lib/mailman/templates/gb/subscribeack.txt
-lib/mailman/templates/gb/userpass.txt
-lib/mailman/templates/gb/verify.txt
 lib/mailman/templates/hr/admindbdetails.html
 lib/mailman/templates/hr/admindbpreamble.html
 lib/mailman/templates/hr/admindbsummary.html
@@ -1107,6 +1111,7 @@ lib/mailman/templates/it/postack.txt
 lib/mailman/templates/it/postauth.txt
 lib/mailman/templates/it/postheld.txt
 lib/mailman/templates/it/private.html
+lib/mailman/templates/it/probe.txt
 lib/mailman/templates/it/refuse.txt
 lib/mailman/templates/it/roster.html
 lib/mailman/templates/it/subauth.txt
@@ -1150,6 +1155,7 @@ lib/mailman/templates/ja/postack.txt
 lib/mailman/templates/ja/postauth.txt
 lib/mailman/templates/ja/postheld.txt
 lib/mailman/templates/ja/private.html
+lib/mailman/templates/ja/probe.txt
 lib/mailman/templates/ja/refuse.txt
 lib/mailman/templates/ja/roster.html
 lib/mailman/templates/ja/subauth.txt
@@ -1401,6 +1407,13 @@ lib/mailman/templates/pt_BR/adminsubscribeack.txt
 lib/mailman/templates/pt_BR/adminunsubscribeack.txt
 lib/mailman/templates/pt_BR/admlogin.html
 lib/mailman/templates/pt_BR/approve.txt
+lib/mailman/templates/pt_BR/archidxentry.html
+lib/mailman/templates/pt_BR/archidxfoot.html
+lib/mailman/templates/pt_BR/archidxhead.html
+lib/mailman/templates/pt_BR/archlistend.html
+lib/mailman/templates/pt_BR/archliststart.html
+lib/mailman/templates/pt_BR/archtoc.html
+lib/mailman/templates/pt_BR/archtocentry.html
 lib/mailman/templates/pt_BR/article.html
 lib/mailman/templates/pt_BR/bounce.txt
 lib/mailman/templates/pt_BR/checkdbs.txt
@@ -1414,6 +1427,7 @@ lib/mailman/templates/pt_BR/invite.txt
 lib/mailman/templates/pt_BR/listinfo.html
 lib/mailman/templates/pt_BR/masthead.txt
 lib/mailman/templates/pt_BR/newlist.txt
+lib/mailman/templates/pt_BR/nomoretoday.txt
 lib/mailman/templates/pt_BR/options.html
 lib/mailman/templates/pt_BR/postack.txt
 lib/mailman/templates/pt_BR/postauth.txt
@@ -1476,6 +1490,7 @@ 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
@@ -1503,6 +1518,7 @@ lib/mailman/templates/ru/postack.txt
 lib/mailman/templates/ru/postauth.txt
 lib/mailman/templates/ru/postheld.txt
 lib/mailman/templates/ru/private.html
+lib/mailman/templates/ru/probe.txt
 lib/mailman/templates/ru/refuse.txt
 lib/mailman/templates/ru/roster.html
 lib/mailman/templates/ru/subauth.txt
@@ -1683,6 +1699,7 @@ 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
@@ -1710,6 +1727,7 @@ lib/mailman/templates/uk/postack.txt
 lib/mailman/templates/uk/postauth.txt
 lib/mailman/templates/uk/postheld.txt
 lib/mailman/templates/uk/private.html
+lib/mailman/templates/uk/probe.txt
 lib/mailman/templates/uk/refuse.txt
 lib/mailman/templates/uk/roster.html
 lib/mailman/templates/uk/subauth.txt
@@ -1719,6 +1737,76 @@ lib/mailman/templates/uk/unsub.txt
 lib/mailman/templates/uk/unsubauth.txt
 lib/mailman/templates/uk/userpass.txt
 lib/mailman/templates/uk/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/admlogin.html
+lib/mailman/templates/zh_CN/archidxentry.html
+lib/mailman/templates/zh_CN/archidxfoot.html
+lib/mailman/templates/zh_CN/archidxhead.html
+lib/mailman/templates/zh_CN/archlistend.html
+lib/mailman/templates/zh_CN/archliststart.html
+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/help.txt
+lib/mailman/templates/zh_CN/invite.txt
+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/postack.txt
+lib/mailman/templates/zh_CN/postauth.txt
+lib/mailman/templates/zh_CN/postheld.txt
+lib/mailman/templates/zh_CN/probe.txt
+lib/mailman/templates/zh_CN/refuse.txt
+lib/mailman/templates/zh_CN/subauth.txt
+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/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/help.txt
+lib/mailman/templates/zh_TW/masthead.txt
+lib/mailman/templates/zh_TW/newlist.txt
+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/subauth.txt
+lib/mailman/templates/zh_TW/subscribeack.txt
+lib/mailman/templates/zh_TW/userpass.txt
+lib/mailman/templates/zh_TW/verify.txt
 lib/mailman/tests/EmailBase.py
 lib/mailman/tests/TestBase.py
 lib/mailman/tests/bounces/bounce_01.txt
@@ -1772,7 +1860,6 @@ lib/mailman/tests/bounces/yahoo_09.txt
 lib/mailman/tests/bounces/yale_01.txt
 lib/mailman/tests/fblast.py
 lib/mailman/tests/msgs/bad_01.txt
-lib/mailman/tests/msgs/nimda.txt
 lib/mailman/tests/onebounce.py
 lib/mailman/tests/paths.py
 lib/mailman/tests/test_bounces.py
@@ -1792,15 +1879,8 @@ share/doc/mailman/INSTALL
 share/doc/mailman/NEWS
 share/doc/mailman/README
 share/doc/mailman/README-I18N.en
-share/doc/mailman/README.BSD
 share/doc/mailman/README.CONTRIB
-share/doc/mailman/README.EXIM
-share/doc/mailman/README.LINUX
-share/doc/mailman/README.MACOSX
 share/doc/mailman/README.NETSCAPE
-share/doc/mailman/README.POSTFIX
-share/doc/mailman/README.QMAIL
-share/doc/mailman/README.SENDMAIL
 share/doc/mailman/README.USERAGENT
 share/doc/mailman/STYLEGUIDE.txt
 share/doc/mailman/TODO
@@ -1812,6 +1892,8 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/tests/msgs
 @dirrm lib/mailman/tests/bounces
 @dirrm lib/mailman/tests
+@dirrm lib/mailman/templates/zh_TW
+@dirrm lib/mailman/templates/zh_CN
 @dirrm lib/mailman/templates/uk
 @dirrm lib/mailman/templates/tr
 @dirrm lib/mailman/templates/sv
@@ -1830,7 +1912,6 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/templates/it
 @dirrm lib/mailman/templates/hu
 @dirrm lib/mailman/templates/hr
-@dirrm lib/mailman/templates/gb
 @dirrm lib/mailman/templates/fr
 @dirrm lib/mailman/templates/fi
 @dirrm lib/mailman/templates/eu
@@ -1838,9 +1919,9 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/templates/es
 @dirrm lib/mailman/templates/en
 @dirrm lib/mailman/templates/de
+@dirrm lib/mailman/templates/da
 @dirrm lib/mailman/templates/cs
 @dirrm lib/mailman/templates/ca
-@dirrm lib/mailman/templates/big5
 @dirrm lib/mailman/templates
 @dirrm lib/mailman/support
 @dirrm lib/mailman/scripts
@@ -1858,6 +1939,10 @@ share/examples/rc.d/mailman
 @dirrm lib/mailman/pythonlib/japanese
 @dirrm lib/mailman/pythonlib/email
 @dirrm lib/mailman/pythonlib
+@dirrm lib/mailman/messages/zh_TW/LC_MESSAGES
+@dirrm lib/mailman/messages/zh_TW
+@dirrm lib/mailman/messages/zh_CN/LC_MESSAGES
+@dirrm lib/mailman/messages/zh_CN
 @dirrm lib/mailman/messages/uk/LC_MESSAGES
 @dirrm lib/mailman/messages/uk
 @dirrm lib/mailman/messages/tr/LC_MESSAGES
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index a9243811166..0bf55c25ea0 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.7 2005/03/02 21:09:56 kim Exp $
+$NetBSD: distinfo,v 1.8 2005/06/01 23:25:07 bouyer Exp $
 
-SHA1 (mailman-2.1.5.tgz) = d3f9639c76d437c58e6fcc2f0efc96c043e2f2e4
-RMD160 (mailman-2.1.5.tgz) = 9de569d00b521a9992e72829e427d035955fbce7
-Size (mailman-2.1.5.tgz) = 5745912 bytes
+SHA1 (mailman-2.1.6.tgz) = cfabc1629feba109f85e51b85c1f64e4491e7ac4
+RMD160 (mailman-2.1.6.tgz) = 37107687d49d2a67e788fd51e11df5cb4b4e7929
+Size (mailman-2.1.6.tgz) = 6482726 bytes
 SHA1 (patch-aa) = f0bc550b28794008ea840a88a5b0053578f3ae0f
 SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
-SHA1 (patch-ac) = 5e82879e14a72565cb44b11e6086abd3737b26d2
 SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
 SHA1 (patch-ae) = 6c17de398014217be8f1c7a3b3a6f8d379fc0fb2
 SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
 SHA1 (patch-ag) = f94f190e69ce892841b88574ec8e9f100b182ed9
 SHA1 (patch-ah) = 42296c52e30b1fcc1d42ef0f1b89c83414ca85df
-SHA1 (patch-ai) = 39288f7047063f77d0a94128f74ae4e9fa9e72e9
diff --git a/mail/mailman/patches/patch-ac b/mail/mailman/patches/patch-ac
deleted file mode 100644
index dd1ceaba134..00000000000
--- a/mail/mailman/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/03/02 21:09:56 kim Exp $
-
---- INSTALL.orig	2004-02-17 18:05:32.000000000 -0500
-+++ INSTALL	2005-03-01 19:41:09.000000000 -0500
-@@ -348,10 +348,10 @@
-       information.
- 
-       Now configure your site list.  There is a convenient template
--      for a generic site list in data/sitelist.cfg to help you with
-+      for a generic site list in support/sitelist.cfg to help you with
-       this.  The template can be applied to your site list by running:
- 
--          % bin/config_list -i data/sitelist.cfg mailman
-+          % bin/config_list -i support/sitelist.cfg mailman
- 
-       Before doing this, review the configuration options in the
-       template (note that many options are not changed by
diff --git a/mail/mailman/patches/patch-ai b/mail/mailman/patches/patch-ai
deleted file mode 100644
index 97c544aabb7..00000000000
--- a/mail/mailman/patches/patch-ai
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/02/14 16:56:38 tv Exp $
-
-Index: private.py
-===================================================================
-RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/private.py,v
-retrieving revision 2.16.2.1
-diff -u -r2.16.2.1 private.py
---- Mailman/Cgi/private.py	8 Feb 2003 07:13:50 -0000	2.16.2.1
-+++ Mailman/Cgi/private.py	10 Feb 2005 03:34:21 -0000
-@@ -35,13 +35,17 @@
- _ = i18n._
- i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE)
- 
-+SLASH = '/'
-+
- 
- 
- def true_path(path):
-     "Ensure that the path is safe by removing .."
--    path = path.replace('../', '')
--    path = path.replace('./', '')
--    return path[1:]
-+    parts = path.split(SLASH)
-+    safe = [x for x in parts if x not in ('.', '..')]
-+    if parts <> safe:
-+        syslog('mischief', 'Directory traversal attack thwarted')
-+    return SLASH.join(safe)[1:]
- 
- 
-