[pkgsrc/pkgsrc-2009Q3]: pkgsrc/mail/pear-Mail Backout changes related to tick...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2ef48a9d2a5
branches:  pkgsrc-2009Q3
changeset: 399991:f2ef48a9d2a5
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Dec 03 07:37:18 2009 +0000

description:
Backout changes related to ticket #2940 which were committed by accident.

diffstat:

 mail/pear-Mail/Makefile         |   4 ++--
 mail/pear-Mail/distinfo         |   3 +--
 mail/pear-Mail/patches/patch-aa |  25 -------------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diffs (53 lines):

diff -r 86d25bb178c7 -r f2ef48a9d2a5 mail/pear-Mail/Makefile
--- a/mail/pear-Mail/Makefile   Wed Dec 02 23:22:09 2009 +0000
+++ b/mail/pear-Mail/Makefile   Thu Dec 03 07:37:18 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9.2.1 2009/12/02 23:17:10 tron Exp $
+# $NetBSD: Makefile,v 1.9.2.2 2009/12/03 07:37:18 tron Exp $
 
 DISTNAME=      Mail-1.1.14
-PKGREVISION=   2
+PKGREVISION=   1
 CATEGORIES=    mail
 
 CONFLICTS=     php-pear-Mail-[0-9]*
diff -r 86d25bb178c7 -r f2ef48a9d2a5 mail/pear-Mail/distinfo
--- a/mail/pear-Mail/distinfo   Wed Dec 02 23:22:09 2009 +0000
+++ b/mail/pear-Mail/distinfo   Thu Dec 03 07:37:18 2009 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2.28.1 2009/12/02 23:17:10 tron Exp $
+$NetBSD: distinfo,v 1.2.28.2 2009/12/03 07:37:18 tron 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
diff -r 86d25bb178c7 -r f2ef48a9d2a5 mail/pear-Mail/patches/patch-aa
--- a/mail/pear-Mail/patches/patch-aa   Wed Dec 02 23:22:09 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.2.2 2009/12/02 23:17:10 tron Exp $
-
-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.');