From 3c65b87e78340c1c09600e2e374a9ce025949cc5 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Thu, 3 Dec 2009 07:37:18 +0000
Subject: Backout changes related to ticket #2940 which were committed by
 accident.

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

diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 7070fc25448..cde17dd519f 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -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 --git a/mail/pear-Mail/distinfo b/mail/pear-Mail/distinfo
index 47a78bd0a62..3780b9b8b31 100644
--- a/mail/pear-Mail/distinfo
+++ b/mail/pear-Mail/distinfo
@@ -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 --git a/mail/pear-Mail/patches/patch-aa b/mail/pear-Mail/patches/patch-aa
deleted file mode 100644
index f072bcc8a50..00000000000
--- a/mail/pear-Mail/patches/patch-aa
+++ /dev/null
@@ -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.');
-- 
cgit v1.2.3