[php-PHPMailer] Latest version 5.2.1

trasher trasher at fedoraproject.org
Tue Mar 20 18:15:05 UTC 2012


commit 81a54ca6bdd85bb40242a1b859ca02bd627c0d36
Author: trasher <trasher at fedoraproject.org>
Date:   Tue Mar 20 19:17:17 2012 +0100

    Latest version 5.2.1

 .gitignore                  |    1 +
 PHPMailer-5.1-php53.patch   |  122 -------------------------------------------
 PHPMailer-5.1-sign.patch    |   13 -----
 PHPMailer-5.2.1-php53.patch |  105 +++++++++++++++++++++++++++++++++++++
 php-PHPMailer.spec          |   18 +++----
 sources                     |    2 +-
 6 files changed, 115 insertions(+), 146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa70bba..d6117f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 PHPMailer_v5.1.tar.gz
+/PHPMailer_5.2.1.tgz
diff --git a/PHPMailer-5.2.1-php53.patch b/PHPMailer-5.2.1-php53.patch
new file mode 100644
index 0000000..2a0d339
--- /dev/null
+++ b/PHPMailer-5.2.1-php53.patch
@@ -0,0 +1,105 @@
+diff -up PHPMailer_5.2.1/docs/use_gmail.txt.orig PHPMailer_5.2.1/docs/use_gmail.txt
+--- PHPMailer_5.2.1/docs/use_gmail.txt.orig	2012-03-20 18:59:04.665629722 +0100
++++ PHPMailer_5.2.1/docs/use_gmail.txt	2012-03-20 19:00:29.325624132 +0100
+@@ -8,7 +8,7 @@ include("class.smtp.php"); // note, this
+ $mail             = new PHPMailer();
+ 
+ $body             = $mail->getFile('contents.html');
+-$body             = eregi_replace("[\]",'',$body);
++$body             = preg_replace("[\]",'',$body);
+ 
+ $mail->IsSMTP();
+ $mail->SMTPAuth   = true;                  // enable SMTP authentication
+diff -up PHPMailer_5.2.1/examples/test_mail_basic.php.orig PHPMailer_5.2.1/examples/test_mail_basic.php
+--- PHPMailer_5.2.1/examples/test_mail_basic.php.orig	2012-03-20 18:59:33.545627815 +0100
++++ PHPMailer_5.2.1/examples/test_mail_basic.php	2012-03-20 19:00:29.341624132 +0100
+@@ -11,7 +11,7 @@ require_once('../class.phpmailer.php');
+ $mail             = new PHPMailer(); // defaults to using php "mail()"
+ 
+ $body             = file_get_contents('contents.html');
+-$body             = eregi_replace("[\]",'',$body);
++$body             = preg_replace("[\]",'',$body);
+ 
+ $mail->AddReplyTo("name at yourdomain.com","First Last");
+ 
+diff -up PHPMailer_5.2.1/examples/test_pop_before_smtp_basic.php.orig PHPMailer_5.2.1/examples/test_pop_before_smtp_basic.php
+--- PHPMailer_5.2.1/examples/test_pop_before_smtp_basic.php.orig	2012-03-20 18:59:12.433629208 +0100
++++ PHPMailer_5.2.1/examples/test_pop_before_smtp_basic.php	2012-03-20 19:00:29.334624132 +0100
+@@ -14,7 +14,7 @@ $pop->Authorise('pop3.yourdomain.com', 1
+ $mail = new PHPMailer();
+ 
+ $body             = file_get_contents('contents.html');
+-$body             = eregi_replace("[\]",'',$body);
++$body             = preg_replace("[\]",'',$body);
+ 
+ $mail->IsSMTP();
+ $mail->SMTPDebug = 2;
+diff -up PHPMailer_5.2.1/examples/test_sendmail_basic.php.orig PHPMailer_5.2.1/examples/test_sendmail_basic.php
+--- PHPMailer_5.2.1/examples/test_sendmail_basic.php.orig	2012-03-20 18:59:26.719628266 +0100
++++ PHPMailer_5.2.1/examples/test_sendmail_basic.php	2012-03-20 19:00:29.341624132 +0100
+@@ -13,7 +13,7 @@ $mail             = new PHPMailer(); //
+ $mail->IsSendmail(); // telling the class to use SendMail transport
+ 
+ $body             = file_get_contents('contents.html');
+-$body             = eregi_replace("[\]",'',$body);
++$body             = preg_replace("[\]",'',$body);
+ 
+ $mail->AddReplyTo("name at yourdomain.com","First Last");
+ 
+diff -up PHPMailer_5.2.1/examples/test_smtp_basic_no_auth.php.orig PHPMailer_5.2.1/examples/test_smtp_basic_no_auth.php
+--- PHPMailer_5.2.1/examples/test_smtp_basic_no_auth.php.orig	2012-03-20 18:59:48.193626848 +0100
++++ PHPMailer_5.2.1/examples/test_smtp_basic_no_auth.php	2012-03-20 19:00:29.342624132 +0100
+@@ -17,7 +17,7 @@ require_once('../class.phpmailer.php');
+ $mail             = new PHPMailer();
+ 
+ $body             = file_get_contents('contents.html');
+-$body             = eregi_replace("[\]",'',$body);
++$body             = preg_replace("[\]",'',$body);
+ 
+ $mail->IsSMTP(); // telling the class to use SMTP
+ $mail->Host       = "mail.yourdomain.com"; // SMTP server
+diff -up PHPMailer_5.2.1/examples/test_smtp_basic.php.orig PHPMailer_5.2.1/examples/test_smtp_basic.php
+--- PHPMailer_5.2.1/examples/test_smtp_basic.php.orig	2012-03-20 18:59:41.282627305 +0100
++++ PHPMailer_5.2.1/examples/test_smtp_basic.php	2012-03-20 19:00:29.342624132 +0100
+@@ -17,7 +17,7 @@ require_once('../class.phpmailer.php');
+ $mail             = new PHPMailer();
+ 
+ $body             = file_get_contents('contents.html');
+-$body             = eregi_replace("[\]",'',$body);
++$body             = preg_replace("[\]",'',$body);
+ 
+ $mail->IsSMTP(); // telling the class to use SMTP
+ $mail->Host       = "mail.yourdomain.com"; // SMTP server
+diff -up PHPMailer_5.2.1/examples/test_smtp_gmail_basic.php.orig PHPMailer_5.2.1/examples/test_smtp_gmail_basic.php
+--- PHPMailer_5.2.1/examples/test_smtp_gmail_basic.php.orig	2012-03-20 18:59:19.688628730 +0100
++++ PHPMailer_5.2.1/examples/test_smtp_gmail_basic.php	2012-03-20 19:00:29.341624132 +0100
+@@ -17,7 +17,7 @@ require_once('../class.phpmailer.php');
+ $mail             = new PHPMailer();
+ 
+ $body             = file_get_contents('contents.html');
+-$body             = eregi_replace("[\]",'',$body);
++$body             = preg_replace("[\]",'',$body);
+ 
+ $mail->IsSMTP(); // telling the class to use SMTP
+ $mail->Host       = "mail.yourdomain.com"; // SMTP server
+diff -up PHPMailer_5.2.1/test_script/index.php.orig PHPMailer_5.2.1/test_script/index.php
+--- PHPMailer_5.2.1/test_script/index.php.orig	2012-03-20 19:00:03.270625851 +0100
++++ PHPMailer_5.2.1/test_script/index.php	2012-03-20 19:00:29.343624132 +0100
+@@ -51,7 +51,7 @@ if ( $_POST['submit'] == "Submit" ) {
+ 
+   if ( $_POST['Message'] == '' ) {
+     $body             = $mail->getFile('contents.html');
+-    $body             = eregi_replace("[\]",'',$body);
++    $body             = preg_replace("[\]",'',$body);
+   } else {
+     $body = $_POST['Message'];
+   }
+@@ -196,7 +196,7 @@ $mail = new PHPMailer();
+ <?php
+ if ( $_POST['Message'] == '' ) {
+   echo '$body             = $mail->getFile(\'contents.html\');' . "\n";
+-  echo '$body             = eregi_replace("[\]",\'\',$body);' . "\n";
++  echo '$body             = preg_replace("[\]",\'\',$body);' . "\n";
+ } else {
+   echo '$body = ' . $_POST['Message'] . "\n";
+ }
diff --git a/php-PHPMailer.spec b/php-PHPMailer.spec
index 56412a6..fd1aec9 100644
--- a/php-PHPMailer.spec
+++ b/php-PHPMailer.spec
@@ -1,12 +1,11 @@
 Name:		php-PHPMailer
 Summary:	PHP email transport class with a lot of features
-Version:	5.1
-Release:	5%{?dist}
+Version:	5.2.1
+Release:	1%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
-Source0:	http://downloads.sourceforge.net/phpmailer/PHPMailer_v%{version}.tar.gz
-Patch1:		PHPMailer-5.1-php53.patch
-Patch2:		PHPMailer-5.1-sign.patch
+Source0:	http://phpmailer.apache-extras.org.codespot.com/files/PHPMailer_%{version}.tgz
+Patch1:		PHPMailer-5.2.1-php53.patch
 URL:		http://phpmailer.worxware.com/
 Requires:	php-mbstring >= 5.1.0
 Buildarch:	noarch
@@ -39,10 +38,9 @@ Full Featured Email Transfer Class for PHP. PHPMailer features:
 %prep
 #-------------------------------------------------------------------------------
 
-%setup -q -n PHPMailer_v%{version}
+%setup -q -n PHPMailer_%{version}
 
 %patch1 -p 1
-%patch2 -p 1
 
 
 #-------------------------------------------------------------------------------
@@ -114,13 +112,13 @@ rm -rf "${RPM_BUILD_ROOT}"
 %dir %{_datadir}/PHPMailer/language
 
 
-#-------------------------------------------------------------------------------
 %changelog
+* Tue Mar 20 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 5.2.1-1
+- Latest upstream release
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-#-------------------------------------------------------------------------------
-
 * Mon Jul 18 2011 Patrick Monnerat <pm at datasphere.ch> 5.1-4
 - Patch "sign" to fix mail signing.
   https://sourceforge.net/tracker/?func=detail&aid=3370322&group_id=26031&atid=385709
diff --git a/sources b/sources
index 4bc4935..7cf0739 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e81fc229f88f7d9dd7cf70d65296ef8  PHPMailer_v5.1.tar.gz
+2ef9a089aa9aae9899b4ab785ef873c3  PHPMailer_5.2.1.tgz


More information about the scm-commits mailing list