Update to MHonArc 2.6.19:

2014/04/21      (2.6.19)

* Security Fixes:

    Bug ID  Summary
    ------  ------------------------------------------------------------
    35388   commentized subjects allow PHP code injection
    ------  ------------------------------------------------------------

* Bug Fixes:

    Bug ID  Summary
    ------  ------------------------------------------------------------
    32987   Lots of deprecation warnings with Perl 5.12
    42155   MHonArc crashed with message/external-body and RFC 2231
            encoded parameters
    ------  ------------------------------------------------------------

5 files changed, 7 insertions, 113 deletions

diff --git a/mail/mhonarc/Makefile b/mail/mhonarc/Makefile
index c4da6c67765..366687f1b69 100644
--- a/mail/mhonarc/Makefile
+++ b/mail/mhonarc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2013/05/31 12:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/04/22 22:32:18 schnoebe Exp $
 
-DISTNAME=	MHonArc-2.6.18
-PKGNAME=	mhonarc-2.6.18
-PKGREVISION=	3
+DISTNAME=	MHonArc-2.6.19
+PKGNAME=	mhonarc-2.6.19
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mhonarc.org/release/MHonArc/tar/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/mhonarc/distinfo b/mail/mhonarc/distinfo
index ba84db9ee82..6c975a63e01 100644
--- a/mail/mhonarc/distinfo
+++ b/mail/mhonarc/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.18 2011/10/30 22:03:42 spz Exp $
+$NetBSD: distinfo,v 1.19 2014/04/22 22:32:18 schnoebe Exp $
 
-SHA1 (MHonArc-2.6.18.tar.bz2) = 4990889d13cc3f4a2e1c284c55db5abb64e7072e
-RMD160 (MHonArc-2.6.18.tar.bz2) = 4cf0d8e67050cc573ef81f826938a6c096ff0e93
-Size (MHonArc-2.6.18.tar.bz2) = 1546854 bytes
-SHA1 (patch-lib_mhamain.pl) = d0257ba20bd0625d17ccf47795377e3467e2b24c
-SHA1 (patch-lib_mhopt.pl) = bf6ba47810dfa58318887ae936b3de2f32bd934d
+SHA1 (MHonArc-2.6.19.tar.bz2) = e8297b3da1ba3369a0292b2815cc356cbb7ff6bd
+RMD160 (MHonArc-2.6.19.tar.bz2) = 13614f38275795221131d7ba459c3a18d607c5cb
+Size (MHonArc-2.6.19.tar.bz2) = 1577790 bytes
 SHA1 (patch-lib_mhtxthtml.pl) = bfd6420fd9e0ffdbf1f781441f8c1b8b71ef94e7
-SHA1 (patch-lib_readmail.pl) = acd2aede2dbc533abe409fbfa381332697065cbe
diff --git a/mail/mhonarc/patches/patch-lib_mhamain.pl b/mail/mhonarc/patches/patch-lib_mhamain.pl
deleted file mode 100644
index 44a3ed4ccb3..00000000000
--- a/mail/mhonarc/patches/patch-lib_mhamain.pl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_mhamain.pl,v 1.1 2011/10/30 22:03:42 spz Exp $
-
---- lib/mhamain.pl.orig	2011-01-09 16:18:35.000000000 +0000
-+++ lib/mhamain.pl
-@@ -1561,7 +1561,7 @@ sub signal_catch {
- ##	Create Index2MsgId if not defined
- ##
- sub defineIndex2MsgId {
--    if (!defined(%Index2MsgId)) {
-+    if (!%Index2MsgId) {
- 	foreach (keys %MsgId) {
- 	    $Index2MsgId{$MsgId{$_}} = $_;
- 	}
diff --git a/mail/mhonarc/patches/patch-lib_mhopt.pl b/mail/mhonarc/patches/patch-lib_mhopt.pl
deleted file mode 100644
index f77d67bb51d..00000000000
--- a/mail/mhonarc/patches/patch-lib_mhopt.pl
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_mhopt.pl,v 1.1 2011/10/30 22:03:42 spz Exp $
-
---- lib/mhopt.pl.orig	2011-01-09 05:13:14.000000000 +0000
-+++ lib/mhopt.pl
-@@ -864,7 +864,7 @@ sub update_data_1_to_2 {
- ##
- sub update_data_2_1_to_later {
-     # we can preserve filter arguments
--    if (defined(%main::MIMEFiltersArgs)) {
-+    if (%main::MIMEFiltersArgs) {
- 	warn qq/         preserving MIMEARGS...\n/;
- 	%readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
- 	$IsDefault{'MIMEARGS'} = 0;
diff --git a/mail/mhonarc/patches/patch-lib_readmail.pl b/mail/mhonarc/patches/patch-lib_readmail.pl
deleted file mode 100644
index 7e5696c7a79..00000000000
--- a/mail/mhonarc/patches/patch-lib_readmail.pl
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-lib_readmail.pl,v 1.1 2011/10/30 22:03:42 spz Exp $
-
---- lib/readmail.pl.orig	2011-01-09 05:13:14.000000000 +0000
-+++ lib/readmail.pl
-@@ -117,9 +117,9 @@ $DecodeHeader	= 0;
- ##  set to true.
- 
- %MIMEDecoders			= ()
--    unless defined(%MIMEDecoders);
-+    unless %MIMEDecoders;
- %MIMEDecodersSrc		= ()
--    unless defined(%MIMEDecodersSrc);
-+    unless %MIMEDecodersSrc;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMECharSetConverters is the associative array for storing functions
-@@ -153,9 +153,9 @@ $DecodeHeader	= 0;
- ##  string.
- 
- %MIMECharSetConverters			= ()
--    unless defined(%MIMECharSetConverters);
-+    unless %MIMECharSetConverters;
- %MIMECharSetConvertersSrc		= ()
--    unless defined(%MIMECharSetConvertersSrc);
-+    unless %MIMECharSetConvertersSrc;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEFilters is the associative array for storing functions that
-@@ -180,9 +180,9 @@ $DecodeHeader	= 0;
- ##  that all functions are defined before invoking MAILread_body.
- 
- %MIMEFilters	= ()
--    unless defined(%MIMEFilters);
-+    unless %MIMEFilters;
- %MIMEFiltersSrc	= ()
--    unless defined(%MIMEFiltersSrc);
-+    unless %MIMEFiltersSrc;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEFiltersArgs is the associative array for storing any optional
-@@ -196,7 +196,7 @@ $DecodeHeader	= 0;
- ##  listed for a function if both are applicable.
- 
- %MIMEFiltersArgs	= ()
--    unless defined(%MIMEFiltersArgs);
-+    unless %MIMEFiltersArgs;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEExcs is the associative array listing which data types
-@@ -206,7 +206,7 @@ $DecodeHeader	= 0;
- ##	Values => <should evaluate to a true expression>
- 
- %MIMEExcs			= ()
--    unless defined(%MIMEExcs);
-+    unless %MIMEExcs;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEIncs is the associative array listing which data types
-@@ -220,7 +220,7 @@ $DecodeHeader	= 0;
- ##  be used to only allow a well-defined set of content-types.
- 
- %MIMEIncs			= ()
--    unless defined(%MIMEIncs);
-+    unless %MIMEIncs;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMECharsetAliases is a mapping of charset names to charset names.
-@@ -231,7 +231,7 @@ $DecodeHeader	= 0;
- ##	Values => real charset name
- ##
- %MIMECharsetAliases = ()
--    unless defined(%MIMECharsetAliases);
-+    unless %MIMECharsetAliases;
- 
- ##---------------------------------------------------------------------------
- ##	Text entity-related variables