pkg/42905: [mail/pear-Mail]Update to 1.2.0

[wenheping%gmail.com@localhost]

>Number:         42905
>Category:       pkg
>Synopsis:       [mail/pear-Mail]Update to 1.2.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 01 13:40:00 +0000 2010
>Originator:     Wen Heping
>Release:        NetBSD-5.0.1
>Organization:
Private
>Environment:
NetBSD NB501 5.0.1 NetBSD 5.0.1 (GENERIC) #0: Thu Jul 30 01:39:11 UTC 2009  
builds%b8.netbsd.org@localhost:/home/builds/ab/netbsd-5-0-1-RELEASE/i386/200907292356Z-obj/home/builds/ab/netbsd-5-0-1-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
>Description:
1.2.0

Release date: 2010-03-01 12:47 UTC
Release state: stable

Changelog:

QA release - stable.

Updated minimum dependencies (Net_SMTP, PEAR, PHP)
Doc Bug #15620 Licence change to BSD
Bug #13659 Mail parse error in special condition
Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote 
(slusarz%curecanti.org@localhost, Bug #9137).
Make sure Net_SMTP is defined when calling getSMTPObject() directly 
(slusarz%curecanti.org@localhost, Bug #13772).
Add addServiceExtensionParameter() to the SMTP driver 
(slusarz%curecanti.org@localhost, Bug #13764).
Add a method to obtain the Net_SMTP object from the SMTP driver 
(slusarz%curecanti.org@localhost, Bug #13766).

>How-To-Repeat:

>Fix:
diff -urN pear-Mail.orig/Makefile pear-Mail/Makefile
--- pear-Mail.orig/Makefile     2010-03-02 05:20:02.000000000 +0800
+++ pear-Mail/Makefile  2010-03-02 05:34:35.000000000 +0800
@@ -1,14 +1,13 @@
 # $NetBSD: Makefile,v 1.9 2009/07/17 18:00:17 adrianp Exp $

-DISTNAME=      Mail-1.1.14
-PKGREVISION=   2
+DISTNAME=      Mail-1.2.0
 CATEGORIES=    mail

 CONFLICTS=     php-pear-Mail-[0-9]*

 DEPENDS+=      ${PHP_PKG_PREFIX}-pear-Net_SMTP-[0-9]*:../../net/pear-Net_SMTP

-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    wenheping%gmail.com@localhost
 HOMEPAGE=      http://pear.php.net/package/Mail
 COMMENT=       PHP Class that provides multiple interfaces for sending emails

diff -urN pear-Mail.orig/distinfo pear-Mail/distinfo
--- pear-Mail.orig/distinfo     2010-03-02 05:20:02.000000000 +0800
+++ pear-Mail/distinfo  2010-03-02 05:30:43.000000000 +0800
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.3 2009/11/30 06:16:56 taca Exp $

-SHA1 (pear/Mail-1.1.14.tgz) = 6c46636e0df3c0a813df3cbda1fd5afac987069d
-RMD160 (pear/Mail-1.1.14.tgz) = 72c0c7018b92ef97789f723a1970c41471bd165f
-Size (pear/Mail-1.1.14.tgz) = 17537 bytes
-SHA1 (patch-aa) = ef6b0afa4e45789bb82065413c7b1305f92daf72
-SHA1 (patch-ab) = a897f545f2a36e87d9bd5ab6f0a8810a115708f9
+SHA1 (pear/Mail-1.2.0.tgz) = 6fbc5cae9a3e2da004c57fce0455fad40eb11381
+RMD160 (pear/Mail-1.2.0.tgz) = 91c176fe4f128ce2d0cd21b25046d21d6d039a46
+Size (pear/Mail-1.2.0.tgz) = 23214 bytes
diff -urN pear-Mail.orig/patches/patch-aa pear-Mail/patches/patch-aa
--- pear-Mail.orig/patches/patch-aa     2010-03-02 05:20:02.000000000 +0800
+++ pear-Mail/patches/patch-aa  1970-01-01 07:00:00.000000000 +0700
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Fix for http://secunia.com/advisories/37410/:
-       refering Debian's patch via http://secunia.com/advisories/37458/
-
---- Mail/sendmail.php.orig     2006-09-26 21:44:11.000000000 +0900
-+++ Mail/sendmail.php
-@@ -108,7 +108,7 @@ class Mail_sendmail extends Mail {
-         if (PEAR::isError($recipients)) {
-             return $recipients;
-         }
--        $recipients = escapeShellCmd(implode(' ', $recipients));
-+        $recipients = implode(' ', array_map('escapeshellarg', $recipients));
-
-         $this->_sanitizeHeaders($headers);
-         $headerElements = $this->prepareHeaders($headers);
-@@ -126,7 +126,7 @@ class Mail_sendmail extends Mail {
-             return PEAR::raiseError('From address specified with dangerous 
characters.');
-         }
-
--        $from = escapeShellCmd($from);
-+        $from = escapeShellArg($from);
-         $mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? 
' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w');
-         if (!$mail) {
-             return PEAR::raiseError('Failed to open sendmail [' . 
$this->sendmail_path . '] for execution.');
diff -urN pear-Mail.orig/patches/patch-ab pear-Mail/patches/patch-ab
--- pear-Mail.orig/patches/patch-ab     2010-03-02 05:20:02.000000000 +0800
+++ pear-Mail/patches/patch-ab  1970-01-01 07:00:00.000000000 +0700
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- ../package.xml.orig        2006-10-12 05:32:51.000000000 +0900
-+++ ../package.xml
-@@ -52,7 +52,7 @@
-    <file role="php" md5sum="e90b498ce97ee926aab71180aa1f68bd" 
name="Mail.php"/>
-    <file role="php" md5sum="c3433e6b7b54a362c6acbffffddcb2f1" 
name="Mail/mail.php"/>
-    <file role="php" md5sum="4a1ed7ae8036862b24fa0ea84f8bbe0e" 
name="Mail/null.php"/>
--   <file role="php" md5sum="8d567715b062fd05ae0d0c195ec3ba1b" 
name="Mail/sendmail.php"/>
-+   <file role="php" md5sum="cf1a206ca5ec1dabc706e6e76b9eb723" 
name="Mail/sendmail.php"/>
-    <file role="php" md5sum="ed539e37c764c38205cb70597e0e84e4" 
name="Mail/smtp.php"/>
-    <file role="php" md5sum="3a513a76e6222b50e7e1186a11cb7b2b" 
name="Mail/RFC822.php"/>
-    <file role="test" md5sum="4117acf13586a15da2a5cdd368aa3931" 
name="tests/rfc822.phpt"/>