summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authortaca <taca>2009-11-30 06:16:56 +0000
committertaca <taca>2009-11-30 06:16:56 +0000
commitf9ce9d5bc68eb1ef462b41f8b8ff12363b665b27 (patch)
treef197c95353c7f0a9fe1ede211da8581b0c01a8a5 /mail
parent6fe5fbf1496ca8b0013b52dbaedbb499bf7980e4 (diff)
downloadpkgsrc-f9ce9d5bc68eb1ef462b41f8b8ff12363b665b27.tar.gz
Add a fix for http://secunia.com/advisories/37410/ refering
Debian's patch via http://secunia.com/advisories/37458/ Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r--mail/pear-Mail/Makefile4
-rw-r--r--mail/pear-Mail/distinfo3
-rw-r--r--mail/pear-Mail/patches/patch-aa25
3 files changed, 29 insertions, 3 deletions
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 11b1da1070f..8990b8f7b16 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2009/07/17 18:00:17 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2009/11/30 06:16:56 taca Exp $
DISTNAME= Mail-1.1.14
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
CONFLICTS= php-pear-Mail-[0-9]*
diff --git a/mail/pear-Mail/distinfo b/mail/pear-Mail/distinfo
index 7c6e888a619..a835f2e250a 100644
--- a/mail/pear-Mail/distinfo
+++ b/mail/pear-Mail/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/10/14 12:11:56 adrianp Exp $
+$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
diff --git a/mail/pear-Mail/patches/patch-aa b/mail/pear-Mail/patches/patch-aa
new file mode 100644
index 00000000000..a1b6edee2ed
--- /dev/null
+++ b/mail/pear-Mail/patches/patch-aa
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.1 2009/11/30 06:16:56 taca 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.');