[Pkg-php-commits] r1389 - in pear/php-mail/trunk/debian: . patches
Thijs Kinkhorst
thijs at alioth.debian.org
Sun May 9 13:30:55 UTC 2010
tags 332613 pending
thanks
Author: thijs
Date: 2010-05-09 13:30:49 +0000 (Sun, 09 May 2010)
New Revision: 1389
Removed:
pear/php-mail/trunk/debian/patches/escapeshellcmd-issue-fix.patch
Modified:
pear/php-mail/trunk/debian/changelog
pear/php-mail/trunk/debian/control
pear/php-mail/trunk/debian/copyright
pear/php-mail/trunk/debian/patches/series
pear/php-mail/trunk/debian/watch
Log:
* New upstream release.
+ Incorporates escapeshellcmd patch.
+ Changed licence to BSD (closes: #332613).
* Checked for policy 3.8.4, changed section to php.
Modified: pear/php-mail/trunk/debian/changelog
===================================================================
--- pear/php-mail/trunk/debian/changelog 2010-05-09 13:17:51 UTC (rev 1388)
+++ pear/php-mail/trunk/debian/changelog 2010-05-09 13:30:49 UTC (rev 1389)
@@ -1,3 +1,12 @@
+php-mail (1.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Incorporates escapeshellcmd patch.
+ + Changed licence to BSD (closes: #332613).
+ * Checked for policy 3.8.4, changed section to php.
+
+ -- Thijs Kinkhorst <thijs at debian.org> Sun, 09 May 2010 15:28:00 +0200
+
php-mail (1.1.14-2) unstable; urgency=high
* Use escapeshellarg instead of escapeshellcmd to escape email addresses
Modified: pear/php-mail/trunk/debian/control
===================================================================
--- pear/php-mail/trunk/debian/control 2010-05-09 13:17:51 UTC (rev 1388)
+++ pear/php-mail/trunk/debian/control 2010-05-09 13:30:49 UTC (rev 1389)
@@ -1,5 +1,5 @@
Source: php-mail
-Section: web
+Section: php
Priority: optional
Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
Uploaders: Thijs Kinkhorst <thijs at debian.org>
@@ -8,13 +8,12 @@
Vcs-Svn: svn://svn.debian.org/pkg-php/pear/php-mail/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/pear/php-mail/trunk
Homepage: http://pear.php.net/package/Mail
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
Package: php-mail
Architecture: all
-Depends: php-pear
+Depends: php-pear, ${misc:Depends}
Recommends: php-net-smtp
-Replaces: php4-pear (<< 4:4.4.0-0)
Description: PHP PEAR module for sending email
PEAR's Mail:: package defines the interface for implementing mailers
under the PEAR hierarchy, and provides supporting functions useful
Modified: pear/php-mail/trunk/debian/copyright
===================================================================
--- pear/php-mail/trunk/debian/copyright 2010-05-09 13:17:51 UTC (rev 1388)
+++ pear/php-mail/trunk/debian/copyright 2010-05-09 13:30:49 UTC (rev 1389)
@@ -3,90 +3,11 @@
It was downloaded from http://pear.php.net/package/Mail
-The upstream copyright is held by The PHP Group, and the source is under
-the PHP License, version 2.02, the complete text of which follows:
-====================================================================
+Copyright information:
---------------------------------------------------------------------
- The PHP License, version 2.02
-Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
---------------------------------------------------------------------
+ * Copyright (c) 2002-2007, Richard Heyes
+ * All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, is permitted provided that the following conditions
-are met:
+And licenced under the BSD licence. On Debian systems, this licence can be
+found here: /usr/share/common-licenses/BSD
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- 3. The name "PHP" must not be used to endorse or promote products
- derived from this software without prior permission from the
- PHP Group. This does not apply to add-on libraries or tools
- that work in conjunction with PHP. In such a case the PHP
- name may be used to indicate that the product supports PHP.
-
- 4. The PHP Group may publish revised and/or new versions of the
- license from time to time. Each version will be given a
- distinguishing version number.
- Once covered code has been published under a particular version
- of the license, you may always continue to use it under the
- terms of that version. You may also choose to use such covered
- code under the terms of any subsequent version of the license
- published by the PHP Group. No one other than the PHP Group has
- the right to modify the terms applicable to covered code created
- under this License.
-
- 5. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes PHP, freely available from
- http://www.php.net/".
-
- 6. The software incorporates the Zend Engine, a product of Zend
- Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
- PHP Association (pursuant to a grant from Zend that can be
- found at http://www.php.net/license/ZendGrant/) for
- distribution to you under this license agreement, only as a
- part of PHP. In the event that you separate the Zend Engine
- (or any portion thereof) from the rest of the software, or
- modify the Zend Engine, or any portion thereof, your use of the
- separated or modified Zend Engine software shall not be governed
- by this license, and instead shall be governed by the license
- set forth at http://www.zend.com/license/ZendLicense/.
-
-
-
-THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
-ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
-DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the PHP Group.
-
-The PHP Group can be contacted via Email at group at php.net.
-
-For more information on the PHP Group and the PHP project,
-please see <http://www.php.net>.
-
-====================================================================
-
-This with the exception of RFC822.php, which is
-copyright (c) 2001-2002, Richard Heyes, and licenced under the BSD
-licence. On Debian systems, this licence can be found here:
-/usr/share/common-licenses/BSD
-
Deleted: pear/php-mail/trunk/debian/patches/escapeshellcmd-issue-fix.patch
===================================================================
--- pear/php-mail/trunk/debian/patches/escapeshellcmd-issue-fix.patch 2010-05-09 13:17:51 UTC (rev 1388)
+++ pear/php-mail/trunk/debian/patches/escapeshellcmd-issue-fix.patch 2010-05-09 13:30:49 UTC (rev 1389)
@@ -1,20 +0,0 @@
---- php-mail-1.1.14/Mail-1.1.14/Mail/sendmail.php 2006-09-26 07:44:11.000000000 -0500
-+++ php-mail/Mail-1.1.14/Mail/sendmail.php 2009-11-19 13:00:34.739120191 -0600
-@@ -108,7 +108,7 @@
- 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 @@
- 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.');
Modified: pear/php-mail/trunk/debian/patches/series
===================================================================
--- pear/php-mail/trunk/debian/patches/series 2010-05-09 13:17:51 UTC (rev 1388)
+++ pear/php-mail/trunk/debian/patches/series 2010-05-09 13:30:49 UTC (rev 1389)
@@ -1 +0,0 @@
-escapeshellcmd-issue-fix.patch
Modified: pear/php-mail/trunk/debian/watch
===================================================================
--- pear/php-mail/trunk/debian/watch 2010-05-09 13:17:51 UTC (rev 1388)
+++ pear/php-mail/trunk/debian/watch 2010-05-09 13:30:49 UTC (rev 1389)
@@ -1,2 +1,2 @@
version=3
-http://pear.php.net/package/Mail http://download.pear.php.net/package/Mail-([\d.RC]+).tgz
+http://pear.php.net/package/Mail/download http://download.pear.php.net/package/Mail-([\d.]+)\.tgz
More information about the Pkg-php-commits
mailing list