Update mailman to 2.1.18.

Changelog
---------

2.1.18-1 (06-May-2014)

  Bug fixes and other patches

    - A critical incompatibility between the DMARC Wrap Message action and
      Python versions older than 2.6.x for some x <= 5 existed and caused
      Wrapped message to be shunted.  This is fixed.  (LP: #1316682)

    - Sender: headers are no longer removed in from_is_list Munge From
      actions.  (LP: #1315970)

2.1.18 (03-May-2014)

  Acknowledgements

    - Thanks to Jim Popovitch and Phil Pennock for the branch that formed the
      basis of the dmarc_moderation_action feature.

    - Thanks to Franck Martin et al for the branch that formed the basis of
      the from_is_list feature.

  Dependencies

    - There is a new dependency associated with the new Privacy options ->
      Sender filters -> dmarc_moderation_action feature discussed below.
      This requires that the dnspython <http://www.dnspython.org/> package
      be available in Python.  This package can be downloaded from the above
      site or from the CheeseShop <https://pypi.python.org/pypi/dnspython/>
      or installed with pip.

  New Features

    - The from_is_list feature introduced in 2.1.16 is now unconditionally
      available to list owners.  There is also, a new Privacy options ->
      Sender filters -> dmarc_moderation_action feature which applies to list
      messages where the From: address is in a domain which publishes a DMARC
      policy of reject or possibly quarantine.  This is a list setting with
      values of Accept, Wrap Message, Munge From, Reject or Discard. There is
      a new DEFAULT_DMARC_MODERATION_ACTION configuration setting to set the
      default for this, and the list admin UI is not able to set an action
      which is 'less' than the default.  The prior ALLOW_FROM_IS_LIST setting
      has been removed and is effectively always Yes. There is a new
      dmarc_quarantine_moderation_action list setting with default set by a
      new DEFAULT_DMARC_QUARANTINE_MODERATION_ACTION configuration setting
      which in turn defaults to Yes.  The list setting can be set to No to
      exclude domains with DMARC policy of quarantine from
      dmarc_moderation_action.

      dmarc_moderation_action and from_is_list interact in the following way.
      If the message is From: a domain to which dmarc_moderation_action applies
      and if dmarc_moderation_action is other than Accept,
      dmarc_moderation_action applies to that message.  Otherwise the
      from_is_list action applies.

      Also associated with dmarc_moderation_action are configuration settings
      DMARC_RESOLVER_TIMEOUT and DMARC_RESOLVER_LIFETIME. These are described
      in more detail in Defaults.py.  There are also new vette log entries
      written when dmarc_moderation_action is found to apply to a post.

  i18n

    - Added missing <mm-digest-question-start> tag to French listinfo template.
      (LP: #1275964)

  Bug Fixes and other patches

    - Removed HTML tags from the title of a couple of rmlist.py pages because
      browsers don't render tags in the title.  (LP: #265848)

    - Most Mailman generated notices to list owners and moderators are now
      sent as Precedence: list instead of bulk.  (LP: #1313146)

    - The Reply-To: munging options weren't honored if there was no
      from_is_list action.  (LP: #1313010)

    - Changed from_is_list actions to insert the list address in Cc: if the
      list is fully personalized.  Otherwise, the list address is only in
      From: and Reply-To: overrides it.  (LP: #1312970)

    - Fixed the Munge From action to only Munge the From: and/or Reply-To: in
      the outgoing message and not in archives, digests and messages sent via
      the usenet gateway.  (LP: #1311431)

    - Fixed a long standing issue in which a notice sent to a user whose
      language is other than that of the list can cause subsequent things
      which should be in the list's language to be in the user's language
      instead.  (LP: #1308655)

    - Fixed the admin Membership List so a search string if any is not lost
      when visiting subsequent fragments of a chunked list.  (LP: #1307454)

    - For from_is_list feature, use email address from original From: if
      original From: has no display name and strip domain part from resultant
      names that look like email addresses.  (LP: #1304511)

    - Added the list name to the vette log "held message approved" entry.
      (LP: 1295875)

    - Added the CGI module name to various "No such list" error log entries.
      (LP: 1295875)

    - Modified contrib/mmdsr to report module name if present in "No such list
      error log entries.

    - Fixed a NameError exception in cron/nightly_gzip when it tries to print
      the usage message.  (LP: #1291038)

    - Fixed a bug in ListAdmin._handlepost that would crash when trying to
      preserve a held message for the site admin if HOLD_MESSAGES_AS_PICKLES
      is False.  (LP: #1282365)

    - The from_is_list header munging feature introduced in Mailman 2.1.16 is
      no longer erroneously applied to Mailman generated notices.
      (LP: #1279667)

    - Changed the message from the confirm CGI to not indicate approval is
      required for an acceptance of an invitation.  (LP: #1277744)

    - Fixed POSTFIX_STYLE_VIRTUAL_DOMAINS to be case-insensitiive.
      (LP: #1267003)

    - Added recognition for another simple warning to bounce processing.
      (LP: #1263247)

    - Fixed a few failing tests in tests/test_handlers.py.  (LP: #1262950)

    - Fixed bin/arch to not create scrubbed attachments for messages skipped
      when processing the --start= option.  (LP: #1260883)

    - Fixed email address validation to do a bit better in obscure cases.
      (LP: #1258703)

    - Fixed a bug which caused some authentication cookies to expire too soon
      if AUTHENTICATION_COOKIE_LIFETIME is non-zero.  (LP: #1257112)

    - Fixed a possible TypeError in bin/sync_members introduced in 2.1.17.
      (LP: #1243343)

  Miscellaneous

    - Added to the contrib directory, a script from Alain Williams to count
      posts in a list's archive.

2.1.17 (23-Nov-2013)

  New Features

    - Handling of posts gated from usenet to a list via the Mail <-> News
      gateway is changed.  Formerly, no list membership, moderation or
      *_these_nonmembers checks were done.  Now, if the sender of the usenet
      post is a moderated member or a nonmember matching a *_these_nonmembers
      filter, those checks will be done and actions applied.  Nonmember posts
      from senders not matching a *_these_nonmembers filter are still accepted
      as before.  (LP: #1252575)

    - There is a new mm_cfg.py setting ANONYMOUS_LIST_KEEP_HEADERS.  Since it
      is not possible to know which non-standard headers in a message might
      reveal sender information, we now remove all headers from incoming posts
      to anonymous lists except those which match regular expressions in this
      list. The default setting keeps non X- headers except those known to
      reveal sender information, Mailman added X- headers and x-Spam- headers.
      See the description in Defaults.py for more information.  (LP: #1246039)

  i18n

    - The Japanese message catalog has been updated by SATOH Fumiyasu.
      (LP: #1248855)

  Bug Fixes and other patches

    - Added a reopen command to the sample init.d script in misc/mailman.in.
      (LP: #1251917)

    - Fixed a misspelling in Tagger.py causing an "unexpected keyword argument
      'Delete'" exception.  (LP: #1251495)

    - Fixed contrib/qmail-to-mailman.py to work with a user other than
      'mailman' and to recognize more listname-* addresses.  (LP: #412293)

    - Fixed a possible UnicodeDecodeError in bin/sync_members.  (LP: #1243343)

    - Fixed Makefile to not include $DESTDIR in paths compiled into .pyc
      files for traceback purposes.  (LP: #1241770)

2.1.16 (16-Oct-2013)

  New Features

    - There is a new list attribute from_is_list to either rewrite the From:
      header of posts replacing the posters address with that of the list or
      wrap the message in an outer message From: the list for compatability
      with DMARC and or ADSP.  There is a new mm_cfg.py setting
      DEFAULT_FROM_IS_LIST to control the default for new lists, and the
      existing REMOVE_DKIM_HEADERS setting has been extended to allow removing
      those headers only for certain from_is_list lists.  This feature must
      be enabled by setting ALLOW_FROM_IS_LIST to Yes in mm_cfg.py.  See the
      description of these settings in Defaults.py for more detail.  This
      feature is experimental in 2.1.16, and it is subject to change or to
      become just one of the two methods in a subsequent release. People
      interested in this feature are encouraged to try it and report their
      experiences to the mailman-users@python.org list.

    - There is a new DISPLAY_HELD_SUMMARY_SORT_BUTTONS setting which if set
      in mm_cfg.py will display a set of radio buttons in the admindb held
      message summary to select how the held messages are sorted and grouped
      for display. The exact setting determines the default grouping and
      sorting.  See the description in Defaults.py for details.

    - Setting digest_size_threshhold to zero now means no digests will be
      sent based on size instead of a digest being sent with every post.
      (LP: #558274)

    - There is a new mm_cfg.py setting SUBSCRIBE_FORM_SECRET which will put
      a dynamically generated, hidden hash in the listinfo subscribe form and
      check it upon submission.  Setting this will prevent automated processes
      (bots) from successfully POSTing web subscribes without first retrieving
      and parsing the form from the listinfo page.  The form must also be
      submitted no later than FORM_LIFETIME nor no earlier than
      SUBSCRIBE_FORM_MIN_TIME after retrieval.  Note that enabling this will
      break any static subscribe forms on your site.  See the description in
      Defaults.py for more info.  (LP: #1082746)

    - add_members now has an option to add members with mail delivery disabled
      by admin.  (LP: #1070574)

    - IncomingRunner now logs rejected messages to the vette log.
      (LP: #1068837)

    - The name of the mailmanctl master lock file is now congigurable via the
      mm_cfg.py setting MASTER_LOCK_FILE.  (LP: #1082308)

    - list_lists now has an option to list only lists with public archives.
      (LP: #1082711)

  Contributed programs

    - A new import_majordomo_into_mailman.pl script has been contributed by
      Geoff Mayes.  (LP: #1129742)

    - A new "sitemap" bash script has been contributed by Tomasz Chmielewski
      <mangoo@wpkg.org> to generate a sitemap.xml file of an installation's
      public archives for submission to search engines.

  i18n

    - The Danish translation has been updated thanks to Tom Christensen.

    - Fixed a string in the Czech message catalog.  (LP: #1234567)

    - A Farsi (Persian) translation has been added thanks to Javad Hoseini and
      Mahyar Moghimi.

    - Fixed several misspelled or garbled string replacements in the Spanish
      message catalog.  (LP: #1160138)

    - pt_BR message catalog has two new and an updated message per Hugo Koji
      Kobayashi.  (LP: #1138578)

    - German message catalog has been updated per Ralf Hildebrandt.

    - Corrected typo in templates/it/private.html.

  Bug Fixes and other patches

    - Fixed a crash in SpamDetect.py which caused messages with unparseable
      RFC 2047 encoded headers to be shunted.  (LP: #1235101)

    - Fixed cron/disabled to send a fresh cookie when notifying disabled
      members.  (LP: #1203200)

    - Added "message_id" to the interpolation dictionary for the Article.html
      template.  (LP: #725498)

    - Changed the admin GUI to report only the bad entries in a list of email
      addresses if any are bad.  (LP: #558253)

    - Added logging for template errors in HyperArch.py.  (LP: #558254)

    - Added more explanation to the bad owner address message from
      bin/newlist.  (LP: #1200763)

    - Fixed a bug causing the admin web interface to fail CSRF checking if
      the list name contains a '+' character.  (LP: #1190802)

    - Fixed bin/mailmanctl -s to not remove the master lock if it can't be
      determined to be truly stale.  (LP: #1189558)

    - It is no longer possible to add 'invalid' addresses to the ban_list
      and the *_these_nonmembers filters from the check boxes on the admindb
      interface.  (LP: #1187201)

    - Backported recognition for mail.ru DSNs and minor bug fixes from
      lp:flufl.bounce.  (LP: #1074592, LP: #1079249 and #1079254)

    - Defended against buggy web servers that don't include an empty
      QUERY_STRING in the CGI environment.  (LP: #1160647)

    - The Switchboard.finish() method now logs the text of the exception when
      it fails to unlink/preserve a .bak file.  (LP: #1165589)

    - The pending (un)subscriptions waiting approval are now sorted by email
      address in the admindb interface as intended.  (LP: #1164160)

    - The subscribe log entry for a bin/add_members subscribe now identifies
      bin/add_members as the source.  (LP: #1161642)

    - Fixed a bug where the Subject: of the user notification of a
      bin/remove_members unsubscribe was not in the user's language.
      (LP: #1161445)

    - Fixed a bug where BounceRunner could create and leave behind zero length
      bounce-events files.  (LP: #1161610)

    - Added recognition for another Yahoo bounce format.  (LP: #1157961)

    - Changed configure's method for getting Python's include directory from
      distutils.sysconfig.get_config_var('CONFINCLUDEPY') to
      distutils.sysconfig.get_python_inc().  (LP: #1098162)

    - Added an Auto-Generated: header to password reminders.  (LP: #558240)

    - Fixed a bug where non-ascii characters in the real name in a subscription
      request could throw a UnicodeEncodeError upon subscription approval and
      perhaps in other situations too.  (LP: #1047100)

    - The query fragments send_unsub_notifications_to_list_owner and
      send_unsub_ack_to_this_batch will now assume default values if not set
      in mass unsubscribe URLs.  (LP: #1032378)

    - Replaced utf-8 encoded characters in newly added German templates with
      HTML entities. (LP: #1018208)

2.1.15 (13-Jun-2012)

  Security

    - Strengthened the validation of email addresses.

    - An XSS vulnerability, CVE-2011-0707, has been fixed.

    - The web admin interface has been hardened against CSRF attacks by adding
      a hidden, encrypted token with a time stamp to form submissions and not
      accepting authentication by cookie if the token is missing, invalid or
      older than the new mm_cfg.py setting FORM_LIFETIME which defaults to one
      hour.  Posthumous thanks go to Tokio Kikuchi for this implementation
      which is only one of his many contributions to Mailman prior to his
      death from cancer on 14 January 2012.

  New Features

    - Added a password reminder button to the private archive login page.
      Backported from the 2.2 branch.

    - There is a new list attribute regular_exclude_ignore set from mm_cfg.py
      DEFAULT_REGULAR_EXCLUDE_IGNORE.  This defaults to True even though the
      prior behavior is equivalent to False.  A True setting will ignore an
      exclude list if the poster is not a member of that list.  The False
      setting can result in list members not receiving posts if the nonmember
      post is not accepted by the exclude list.  Backported from 2.2 branch.

    - Eliminated the list cache from the qrunners.  Indirect self-references
      caused lists to never be dropped from the cache which in turn caused
      the qrunners to grow very large in installations with many lists or
      multiple large lists.  Bug #862683.

    - The user options 'list my other subscriptions' page now indicates for
      each list if the subscription is 'nomail' or 'digest'.  Bug #793669.

    - A new list poster password has been implemented.  This password may only
      be used in Approved: or X-Approved: headers for pre-approving posts.
      Using this password for that purpose precludes compromise of a more
      valuable password sent in plain text email.  Bug #770581.

    - A new mm_cfg.py setting AUTHENTICATION_COOKIE_LIFETIME has been added.
      If this is set to a non-zero value, web authentication cookies will
      expire that many seconds following their last use.  Its default value is
      zero to preserve current behavior.

    - A new mm_cfg.py setting RESPONSE_INCLUDE_LEVEL has been added to control
      how much of the original message is included in automatic responses to
      email commands.  The default is 2 to preserve the prior behavior of
      including the full message.  Setting this to 1 in mm_cfg.py will include
      only the original headers, and 0 will include none of the original.  It
      is recommended to set this to 0 in mm_cfg.py to minimize the effects of
      backscatter.  Bug #265835.

    - A new mm_cfg.py setting DEFAULT_RESPOND_TO_POST_REQUESTS has been added
      to control the default for respond_to_post_requests for new lists.  It is
      set to Yes for backwards compatibility, but it is recommended that
      serious consideration be given to setting it to No.  Bug #266051.

    - A new mm_cfg.py setting DISCARD_MESSAGE_WITH_NO_COMMAND has been added to
      control whether a message to the -request address without any commands or
      a message to -confirm whose To: address doesn't match VERP_CONFIRM_REGEXP
      is responded to or just logged.  It defaults to Yes which is different
      from prior behavior.  Bug #410236.

    - Two new mm_cfg.py settings, BROKEN_BROWSER_WORKAROUND and
      BROKEN_BROWSER_REPLACEMENTS, have been added to control escaping of
      additional characters beyond the standard <, >, &, and " in the web UI.
      See the documentation of these settings in Defaults.py.  The default
      values for these settings result in no change from the prior release.
      Bug #774588.

  i18n

    - Added some missing German templates from Egon Frerich.

    - Added Greek translation from Antonis Limperis.

    - A few errors in the Basque translation are fixed.  Bug #836861.

    - Fixed a misspelling in the German invite.txt template.  Bug #815444.

    - Fixed a missing format character in the Spanish translation.
      Bug #670988.

    - Thanks go to the following for updating translations for the changes in
      this release.
        Thijs Kinkhorst
        Stefan Foerster
        Fabian Wenk

  Bug Fixes and other patches

    - Fixed a bug that could send an admin notice of a held subscription with
      the subject in the user's preferred language instead of the list's
      preferred language and possibly not properly RFC 2047 encoded.
      (LP: #998949)

    - Fixed a possible CPU bound loop in OutgoingRunner if the attempt to
      Connect to the SMTP server throws a socket.error.  (LP: #966531)

    - Fixed a potential crash in the web UI if a language is removed from the
      LC_DESCRIPTIONS dictionary.  (LP: #966565)

    - Added an Auto-Submitted: header to invitations and (un)subscription
      confirmation requests to reduce the possibility of an autoresponder
      confirming the request.  (LP: #265831)

    - Added javascript to the private.html and admlogin.html templates to
      focus the cursor on the entry field.  (LP: #266054)

    - Added CPPFLAGS and LDFLAGS to src/Makefile to support their use.
      (LP: #637652)

    - Stopped removing the trailing slash from the List-Archive: header URL.
      (LP: #964190)

    - A configured version of contrib/courier-to-mailman.py is now created in
      build/contrib/courier-to-mailman.py.  (LP: #999250)

    - Subscription disabled warnings are now sent without a Precedence:
      header.  Bug #808821.

    - Backported 2.2 branch fix for a problem in SpamDetect.py that could
      cause header_filter_rules to fail to match RFC 2047 encoded headers.

    - Fix for bug #629738 could cause a crash in the admindb details display
      if the decoded message body contained characters not in the character
      set of the list's preferred language.  Fixed.  Bug #910440.

    - Added recognition for another Qmail bounce format.

    - Fixed an erroneous seek in the Mailman.Mailbox.Mailbox.AppendMessage
      method that could cause a corrupt mailbox for files opened 'w+'.
      Bug #901957.

    - A held message with a null sender caused a crash in the admindb
      interface.  This is fixed by changing the sender to <missing>.
      Bug #897103.

    - Changed subject prefixing to allow for possible whitespace between an
      'Re' and the following colon when determining how to add the prefix.
      Bug #893290.

    - Fixed a problem where topics regexps would not match RFC 2047 encoded
      Keywords: and/or Subject: headers.  Bug #891676.

    - Fixed misleading response to an email approval of a held message.
      Bug #889968.

    - Added masthead.txt to the list of templates that can be edited via the
      web admin interface.  Bug #266805.

    - Changed the way digest_footer is added to the RFC 1153 (plain) format
      digest for RFC compliance.  Bug #887610.

    - Fixed cron/checkdbs to report unsubscriptions waiting approval.
      Bug #873821.

    - The fix for BUG #266220 (sf1181161) has been enhanced so that if there
      is a pathological HTML part such that the Approved: password text isn't
      found, but it is found after stripping out HTML tags, the post is
      rejected with an informative message.

    - A bug that would cause reset of any new_member_options bits other than
      the four displayed as checkboxes on the list admin General Options page
      whenever the page was updated or bin/config_list attempted to update
      new_member_options has been fixed.  Bug #865825.

    - A problem with the logic avoiding unnecessarily reloading a current list
      object from the config.pck arises if the list is updated by another
      process within the same second that it was last read/written.  That can
      cause the reading of latest version of the list to be skipped.  This has
      been fixed.  Bug #862675.

    - Fixed bin/export.py to accept case insensitive password schemes.
      Bug #833134.

    - Added Tokio Kikuchi's icons to the misc/ and installed icons/
      directories.  Bug #782474.

    - Fixed a problem which could result in raw, undecoded message bodies
      appearing in plain digests and archives.  Bug #787790.

    - Fixed a problem in admindb.py where the character set for the display of
      the message body excerpt was not correctly determined.  Bug #779751.

    - Prevented setting user passwords with leading/trailing whitespace.
      Bug #778088.

    - Mailman now sets the 'secure' flag in cookies set via https URLs.
      Bug #770377.

    - Added a logout link to the admindb interface and made both admin and
      admindb logout effective for a site admin cookie if allowed.
      Bug #769318.

    - Replaced the old Mailman logos and icon that install to Mailman's icons
      directory with the new ones.  If you copy these elsewhere on your
      server, please copy these new ones.

    - Changed bin/genaliases to only call the POSTFIX_*_CMD commands once when
      MTA = 'Postfix'.  Bug #266408.

    - Added a report of the affected members to the warnings issued when
      setting a list with digest members digestable=No and when setting a list
      with non-digest members nondigestable=no.  Bug #761232.

    - Fixed a problem where content filtering could remove the headers from
      an attached message/rfc822 part if the message in that part is
      multipart/alternative and collapse_alternatives is Yes.  Bug #757062.

    - Changed the subscribe CGI to strip leading and trailing whitespace from
      the supplied email address.  Bug #745432.

    - Changed the maximum number of arguments for the who command to be
      considered administrivia from 2 to 1 to help avoid false positives.
      Bug #739524.

    - Added the list name as 'display-name' in added Sender: headers to help
      mitigate Outlook et al 'on behalf of' displays.  Bug #736849.

    - Fixed a typo in the usage() definition cron/gate_news.  Bug #721015.

    - Fixed an uncaught KeyError when poster tries to cancel a post which was
      already handled.  Bug #266224.

    - Held message user notifications now come From: list-owner instead of
      list-bounces.  Bug #714424.

    - Issue an HTTP 404 status for private archive file not found.

    - @listname entries in *_these_nonmembers are no longer case sensitive.
      Bug #705715.

    - Changed bin/rmlist to also remove heldmsg files for the removed list and
      fixed a problem with removal of stale locks for the list.  Bug #700528.

    - Fixed a bug where content filtering could leave a multipart message or
      part with just one sub-part. These should be recast to just the sub-part.
      Bug #701558.

    - Fixed a bug that could erroneously handle posts from addresses in
      *_these_nonmembers and send held/rejected notices to bogus addresses when
      The From or other sender header is RFC 2047 encoded.  Bug #702516.

    - Updated contrib/mm-handler-2.1.10 to better handle lists with names that
      look like admin addresses.  Bug #697161.

    - Added bounce recognition for a bogus Dovecot MDN.  Bug #693134.

    - Fixed a problem where an emailed command in the Subject: header with a
      non-ascii l10n of an 'Re:' prefix is ignored.  Bug #685261.

    - Fixed a problem with approving a post by email when the body of the
      approval mail is base64 encoded.  Bug #677115.

    - Fixed the host name in the From: address of the owner notification from
      bin/add_members.  Bug #666181.

4 files changed, 130 insertions, 24 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index dbac0f2bf8d..423a097134a 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2014/05/09 07:37:10 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2014/06/14 09:20:49 fhajny Exp $
 
-DISTNAME=	mailman-2.1.14-1
-PKGNAME=	mailman-2.1.14.1
-PKGREVISION=	4
+DISTNAME=	mailman-2.1.18-1
+PKGNAME=	mailman-2.1.18.1
 CATEGORIES=	mail www
-MASTER_SITES=	http://launchpad.net/mailman/2.1/2.1.14/+download/
+MASTER_SITES=	http://launchpad.net/mailman/2.1/2.1.18-1/+download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,6 +11,8 @@ HOMEPAGE=	http://www.list.org/
 COMMENT=	The GNU Mailing List Manager
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
+
 PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
index 0d3f36e67c9..c593666d5e9 100644
--- a/mail/mailman/PLIST
+++ b/mail/mailman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2014/03/11 14:05:04 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.23 2014/06/14 09:20:49 fhajny Exp $
 lib/mailman/Mailman/Archiver/Archiver.py
 lib/mailman/Mailman/Archiver/Archiver.pyc
 lib/mailman/Mailman/Archiver/HyperArch.py
@@ -53,6 +53,8 @@ lib/mailman/Mailman/Bouncers/Yale.py
 lib/mailman/Mailman/Bouncers/Yale.pyc
 lib/mailman/Mailman/Bouncers/__init__.py
 lib/mailman/Mailman/Bouncers/__init__.pyc
+lib/mailman/Mailman/CSRFcheck.py
+lib/mailman/Mailman/CSRFcheck.pyc
 lib/mailman/Mailman/Cgi/Auth.py
 lib/mailman/Mailman/Cgi/Auth.pyc
 lib/mailman/Mailman/Cgi/__init__.py
@@ -203,6 +205,8 @@ lib/mailman/Mailman/Handlers/ToOutgoing.py
 lib/mailman/Mailman/Handlers/ToOutgoing.pyc
 lib/mailman/Mailman/Handlers/ToUsenet.py
 lib/mailman/Mailman/Handlers/ToUsenet.pyc
+lib/mailman/Mailman/Handlers/WrapMessage.py
+lib/mailman/Mailman/Handlers/WrapMessage.pyc
 lib/mailman/Mailman/Handlers/__init__.py
 lib/mailman/Mailman/Handlers/__init__.pyc
 lib/mailman/Mailman/ListAdmin.py
@@ -361,6 +365,8 @@ lib/mailman/icons/PythonPowered.png
 lib/mailman/icons/gnu-head-tiny.jpg
 lib/mailman/icons/mailman-large.jpg
 lib/mailman/icons/mailman.jpg
+lib/mailman/icons/mm-icon-large.ico
+lib/mailman/icons/mm-icon.ico
 lib/mailman/icons/mm-icon.png
 lib/mailman/mail/mailman
 lib/mailman/messages/ar/LC_MESSAGES/mailman.mo
@@ -376,6 +382,8 @@ lib/mailman/messages/da/LC_MESSAGES/mailman.po
 lib/mailman/messages/de/LC_MESSAGES/mailman.mo
 lib/mailman/messages/de/LC_MESSAGES/mailman.po
 lib/mailman/messages/de/README.de
+lib/mailman/messages/el/LC_MESSAGES/mailman.mo
+lib/mailman/messages/el/LC_MESSAGES/mailman.po
 lib/mailman/messages/es/LC_MESSAGES/mailman.mo
 lib/mailman/messages/es/LC_MESSAGES/mailman.po
 lib/mailman/messages/es/README.es
@@ -384,6 +392,8 @@ lib/mailman/messages/et/LC_MESSAGES/mailman.po
 lib/mailman/messages/eu/LC_MESSAGES/mailman.mo
 lib/mailman/messages/eu/LC_MESSAGES/mailman.po
 lib/mailman/messages/eu/README.eu
+lib/mailman/messages/fa/LC_MESSAGES/mailman.mo
+lib/mailman/messages/fa/LC_MESSAGES/mailman.po
 lib/mailman/messages/fi/LC_MESSAGES/mailman.mo
 lib/mailman/messages/fi/LC_MESSAGES/mailman.po
 lib/mailman/messages/fi/README.fi
@@ -688,31 +698,87 @@ lib/mailman/templates/de/adminsubscribeack.txt
 lib/mailman/templates/de/adminunsubscribeack.txt
 lib/mailman/templates/de/admlogin.html
 lib/mailman/templates/de/approve.txt
+lib/mailman/templates/de/archidxentry.html
+lib/mailman/templates/de/archidxfoot.html
+lib/mailman/templates/de/archidxhead.html
+lib/mailman/templates/de/archlistend.html
+lib/mailman/templates/de/archliststart.html
+lib/mailman/templates/de/archtoc.html
+lib/mailman/templates/de/archtocentry.html
+lib/mailman/templates/de/archtocnombox.html
 lib/mailman/templates/de/article.html
 lib/mailman/templates/de/bounce.txt
 lib/mailman/templates/de/checkdbs.txt
 lib/mailman/templates/de/convert.txt
 lib/mailman/templates/de/cronpass.txt
 lib/mailman/templates/de/disabled.txt
+lib/mailman/templates/de/emptyarchive.html
 lib/mailman/templates/de/headfoot.html
 lib/mailman/templates/de/help.txt
 lib/mailman/templates/de/invite.txt
 lib/mailman/templates/de/listinfo.html
 lib/mailman/templates/de/masthead.txt
 lib/mailman/templates/de/newlist.txt
+lib/mailman/templates/de/nomoretoday.txt
 lib/mailman/templates/de/options.html
 lib/mailman/templates/de/postack.txt
 lib/mailman/templates/de/postauth.txt
 lib/mailman/templates/de/postheld.txt
 lib/mailman/templates/de/private.html
+lib/mailman/templates/de/probe.txt
 lib/mailman/templates/de/refuse.txt
 lib/mailman/templates/de/roster.html
 lib/mailman/templates/de/subauth.txt
 lib/mailman/templates/de/subscribe.html
 lib/mailman/templates/de/subscribeack.txt
 lib/mailman/templates/de/unsub.txt
+lib/mailman/templates/de/unsubauth.txt
 lib/mailman/templates/de/userpass.txt
 lib/mailman/templates/de/verify.txt
+lib/mailman/templates/el/admindbdetails.html
+lib/mailman/templates/el/admindbpreamble.html
+lib/mailman/templates/el/admindbsummary.html
+lib/mailman/templates/el/adminsubscribeack.txt
+lib/mailman/templates/el/adminunsubscribeack.txt
+lib/mailman/templates/el/admlogin.html
+lib/mailman/templates/el/approve.txt
+lib/mailman/templates/el/archidxentry.html
+lib/mailman/templates/el/archidxfoot.html
+lib/mailman/templates/el/archidxhead.html
+lib/mailman/templates/el/archlistend.html
+lib/mailman/templates/el/archliststart.html
+lib/mailman/templates/el/archtoc.html
+lib/mailman/templates/el/archtocentry.html
+lib/mailman/templates/el/archtocnombox.html
+lib/mailman/templates/el/article.html
+lib/mailman/templates/el/bounce.txt
+lib/mailman/templates/el/checkdbs.txt
+lib/mailman/templates/el/convert.txt
+lib/mailman/templates/el/cronpass.txt
+lib/mailman/templates/el/disabled.txt
+lib/mailman/templates/el/emptyarchive.html
+lib/mailman/templates/el/headfoot.html
+lib/mailman/templates/el/help.txt
+lib/mailman/templates/el/invite.txt
+lib/mailman/templates/el/listinfo.html
+lib/mailman/templates/el/masthead.txt
+lib/mailman/templates/el/newlist.txt
+lib/mailman/templates/el/nomoretoday.txt
+lib/mailman/templates/el/options.html
+lib/mailman/templates/el/postack.txt
+lib/mailman/templates/el/postauth.txt
+lib/mailman/templates/el/postheld.txt
+lib/mailman/templates/el/private.html
+lib/mailman/templates/el/probe.txt
+lib/mailman/templates/el/refuse.txt
+lib/mailman/templates/el/roster.html
+lib/mailman/templates/el/subauth.txt
+lib/mailman/templates/el/subscribe.html
+lib/mailman/templates/el/subscribeack.txt
+lib/mailman/templates/el/unsub.txt
+lib/mailman/templates/el/unsubauth.txt
+lib/mailman/templates/el/userpass.txt
+lib/mailman/templates/el/verify.txt
 lib/mailman/templates/en/admindbdetails.html
 lib/mailman/templates/en/admindbpreamble.html
 lib/mailman/templates/en/admindbsummary.html
@@ -878,6 +944,42 @@ lib/mailman/templates/eu/unsub.txt
 lib/mailman/templates/eu/unsubauth.txt
 lib/mailman/templates/eu/userpass.txt
 lib/mailman/templates/eu/verify.txt
+lib/mailman/templates/fa/adminsubscribeack.txt
+lib/mailman/templates/fa/adminunsubscribeack.txt
+lib/mailman/templates/fa/admlogin.html
+lib/mailman/templates/fa/approve.txt
+lib/mailman/templates/fa/archidxfoot.html
+lib/mailman/templates/fa/archidxhead.html
+lib/mailman/templates/fa/archliststart.html
+lib/mailman/templates/fa/archtoc.html
+lib/mailman/templates/fa/archtocentry.html
+lib/mailman/templates/fa/archtocnombox.html
+lib/mailman/templates/fa/article.html
+lib/mailman/templates/fa/bounce.txt
+lib/mailman/templates/fa/checkdbs.txt
+lib/mailman/templates/fa/convert.txt
+lib/mailman/templates/fa/cronpass.txt
+lib/mailman/templates/fa/disabled.txt
+lib/mailman/templates/fa/emptyarchive.html
+lib/mailman/templates/fa/help.txt
+lib/mailman/templates/fa/invite.txt
+lib/mailman/templates/fa/listinfo.html
+lib/mailman/templates/fa/masthead.txt
+lib/mailman/templates/fa/nomoretoday.txt
+lib/mailman/templates/fa/options.html
+lib/mailman/templates/fa/postack.txt
+lib/mailman/templates/fa/postauth.txt
+lib/mailman/templates/fa/postheld.txt
+lib/mailman/templates/fa/private.html
+lib/mailman/templates/fa/refuse.txt
+lib/mailman/templates/fa/roster.html
+lib/mailman/templates/fa/subauth.txt
+lib/mailman/templates/fa/subscribe.html
+lib/mailman/templates/fa/subscribeack.txt
+lib/mailman/templates/fa/unsub.txt
+lib/mailman/templates/fa/unsubauth.txt
+lib/mailman/templates/fa/userpass.txt
+lib/mailman/templates/fa/verify.txt
 lib/mailman/templates/fi/admindbdetails.html
 lib/mailman/templates/fi/admindbpreamble.html
 lib/mailman/templates/fi/admindbsummary.html
@@ -2046,6 +2148,8 @@ 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/qmail_06.txt
+lib/mailman/tests/bounces/qmail_07.txt
+lib/mailman/tests/bounces/qmail_08.txt
 lib/mailman/tests/bounces/sendmail_01.txt
 lib/mailman/tests/bounces/simple_01.txt
 lib/mailman/tests/bounces/simple_02.txt
@@ -2084,6 +2188,9 @@ lib/mailman/tests/bounces/simple_34.txt
 lib/mailman/tests/bounces/simple_35.txt
 lib/mailman/tests/bounces/simple_36.txt
 lib/mailman/tests/bounces/simple_37.txt
+lib/mailman/tests/bounces/simple_38.txt
+lib/mailman/tests/bounces/simple_39.txt
+lib/mailman/tests/bounces/simple_40.txt
 lib/mailman/tests/bounces/sina_01.txt
 lib/mailman/tests/bounces/smtp32_01.txt
 lib/mailman/tests/bounces/smtp32_02.txt
@@ -2102,6 +2209,7 @@ lib/mailman/tests/bounces/yahoo_07.txt
 lib/mailman/tests/bounces/yahoo_08.txt
 lib/mailman/tests/bounces/yahoo_09.txt
 lib/mailman/tests/bounces/yahoo_10.txt
+lib/mailman/tests/bounces/yahoo_11.txt
 lib/mailman/tests/bounces/yale_01.txt
 lib/mailman/tests/fblast.py
 lib/mailman/tests/msgs/bad_01.txt
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 45882d8873e..9e854d83a83 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2011/12/22 11:06:40 fhajny Exp $
+$NetBSD: distinfo,v 1.22 2014/06/14 09:20:50 fhajny Exp $
 
-SHA1 (mailman-2.1.14-1.tgz) = 390874c1059878b33be9ab4cf57fdb719eac1819
-RMD160 (mailman-2.1.14-1.tgz) = 0d86e766e28aaab9703bfe530b72316a5b02beda
-Size (mailman-2.1.14-1.tgz) = 8201308 bytes
+SHA1 (mailman-2.1.18-1.tgz) = 1e1ac7288d679c7fb8e871a7585c7aafaacd1d6c
+RMD160 (mailman-2.1.18-1.tgz) = 438d319858a89f61032b96201d39d6b2a1968c14
+Size (mailman-2.1.18-1.tgz) = 9095511 bytes
 SHA1 (patch-aa) = 9684b1caeb52f31ee6967eae3f9a464de214879e
 SHA1 (patch-ab) = 39f6294e53110bd1fd09b1e90ab46820f4d48e3f
 SHA1 (patch-ad) = 665884b9dd1789e4abd430c762bdbfd707d48d30
@@ -11,4 +11,4 @@ SHA1 (patch-af) = 985a619a055151d998cefd0c1b7280a0d55f889e
 SHA1 (patch-ag) = fac40640db483c2e9db3a79ec0696dc60596e453
 SHA1 (patch-ah) = c7cde35f787c003ace550a98d8d5e166ba2d48dc
 SHA1 (patch-ai) = f3afeba664b0cca27f160fde3b94c7b7f8498e57
-SHA1 (patch-configure) = 3a2b3aeee266762664268d4abf5769e17e6b1fe1
+SHA1 (patch-configure) = 3e5d61af86cad56c0c698c5093584fad508810f2
diff --git a/mail/mailman/patches/patch-configure b/mail/mailman/patches/patch-configure
index 48c2f768a8b..748c41dee96 100644
--- a/mail/mailman/patches/patch-configure
+++ b/mail/mailman/patches/patch-configure
@@ -1,15 +1,12 @@
-$NetBSD: patch-configure,v 1.1 2011/12/22 11:06:40 fhajny Exp $
+$NetBSD: patch-configure,v 1.2 2014/06/14 09:20:50 fhajny Exp $
 
 Skip checks for user/group at configure time.
---- configure.orig	2011-10-10 09:11:25.745910175 +0000
+--- configure.orig	2014-05-06 16:43:56.000000000 +0000
 +++ configure
-@@ -3381,33 +3381,9 @@ $as_echo_n "checking for user name \"$US
- # MAILMAN_USER == variable name
- # $USERNAME == user id to check for
+@@ -3554,30 +3554,7 @@ $as_echo_n "checking for user name \"$US
  
--
--if test -z "$MAILMAN_USER"
--then
+ if test -z "$MAILMAN_USER"
+ then
 -    cat > conftest.py <<EOF
 -import pwd
 -uid = ''
@@ -32,13 +29,13 @@ Skip checks for user/group at configure time.
 -fi
 -
 -rm -f conftest.out conftest.py
- if test -z "$MAILMAN_USER"
- then
+-if test -z "$MAILMAN_USER"
+-then
 +  MAILMAN_USER="$USERNAME"
    if test "$with_permcheck" = "yes"
    then
-     { { $as_echo "$as_me:$LINENO: error:
-@@ -3457,30 +3433,7 @@ $as_echo_n "checking for group name \"$G
+     as_fn_error $? "
+@@ -3621,30 +3598,7 @@ $as_echo_n "checking for group name \"$G
  
  if test -z "$MAILMAN_GROUP"
  then
@@ -69,4 +66,4 @@ Skip checks for user/group at configure time.
 +  MAILMAN_GROUP="$GROUPNAME"
    if test "$with_permcheck" = "yes"
    then
-     { { $as_echo "$as_me:$LINENO: error:
+     as_fn_error $? "