rpms/php-PHPMailer/F-12 PHPMailer-5.1-php53.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 php-PHPMailer.spec, 1.1, 1.2 sources, 1.2, 1.3
Patrick Monnerat
monnerat at fedoraproject.org
Thu Jul 8 16:21:46 UTC 2010
Author: monnerat
Update of /cvs/pkgs/rpms/php-PHPMailer/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25736
Modified Files:
.cvsignore php-PHPMailer.spec sources
Added Files:
PHPMailer-5.1-php53.patch
Log Message:
* Thu Jul 8 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-2
- Get rid of dos2unix build requirement and of BuildRoot rpm tag.
- New upstream release.
- Moved endline conversion and default language path update from prep to
build section.
- Patch "php53" to remove PHP 5.3 deprecated features.
PHPMailer-5.1-php53.patch:
class.phpmailer.php | 8 ++++----
docs/use_gmail.txt | 2 +-
examples/test_db_smtp_basic.php | 2 +-
examples/test_mail_basic.php | 2 +-
examples/test_pop_before_smtp_basic.php | 2 +-
examples/test_sendmail_basic.php | 2 +-
examples/test_smtp_basic.php | 2 +-
examples/test_smtp_basic_no_auth.php | 2 +-
examples/test_smtp_gmail_basic.php | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE PHPMailer-5.1-php53.patch ---
diff -Naur PHPMailer_v5.1.orig/class.phpmailer.php PHPMailer_v5.1.new/class.phpmailer.php
--- PHPMailer_v5.1.orig/class.phpmailer.php 2009-11-11 01:04:14.000000000 +0100
+++ PHPMailer_v5.1.new/class.phpmailer.php 2010-01-15 18:29:55.000000000 +0100
@@ -1467,12 +1467,12 @@
}
}
if (PHP_VERSION < 6) {
- $magic_quotes = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
+ $magic_quotes = @get_magic_quotes_runtime();
+ @set_magic_quotes_runtime(0);
}
$file_buffer = file_get_contents($path);
$file_buffer = $this->EncodeString($file_buffer, $encoding);
- if (PHP_VERSION < 6) { set_magic_quotes_runtime($magic_quotes); }
+ if (PHP_VERSION < 6) { @set_magic_quotes_runtime($magic_quotes); }
return $file_buffer;
} catch (Exception $e) {
$this->SetError($e->getMessage());
@@ -2317,4 +2317,4 @@
return $errorMsg;
}
}
-?>
\ No newline at end of file
+?>
diff -Naur PHPMailer_v5.1.orig/docs/use_gmail.txt PHPMailer_v5.1.new/docs/use_gmail.txt
--- PHPMailer_v5.1.orig/docs/use_gmail.txt 2009-05-24 07:48:46.000000000 +0200
+++ PHPMailer_v5.1.new/docs/use_gmail.txt 2010-01-15 18:29:14.000000000 +0100
@@ -8,7 +8,7 @@
$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 -Naur PHPMailer_v5.1.orig/examples/test_db_smtp_basic.php PHPMailer_v5.1.new/examples/test_db_smtp_basic.php
--- PHPMailer_v5.1.orig/examples/test_db_smtp_basic.php 2009-05-24 07:48:48.000000000 +0200
+++ PHPMailer_v5.1.new/examples/test_db_smtp_basic.php 2010-01-15 18:29:14.000000000 +0100
@@ -17,7 +17,7 @@
$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 = "smtp1.site.com;smtp2.site.com";
diff -Naur PHPMailer_v5.1.orig/examples/test_mail_basic.php PHPMailer_v5.1.new/examples/test_mail_basic.php
--- PHPMailer_v5.1.orig/examples/test_mail_basic.php 2009-05-24 07:48:48.000000000 +0200
+++ PHPMailer_v5.1.new/examples/test_mail_basic.php 2010-01-15 18:29:14.000000000 +0100
@@ -11,7 +11,7 @@
$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 -Naur PHPMailer_v5.1.orig/examples/test_pop_before_smtp_basic.php PHPMailer_v5.1.new/examples/test_pop_before_smtp_basic.php
--- PHPMailer_v5.1.orig/examples/test_pop_before_smtp_basic.php 2009-05-24 07:48:48.000000000 +0200
+++ PHPMailer_v5.1.new/examples/test_pop_before_smtp_basic.php 2010-01-15 18:29:14.000000000 +0100
@@ -14,7 +14,7 @@
$mail = new PHPMailer();
$body = file_get_contents('contents.html');
-$body = eregi_replace("[\]",'',$body);
+$body = preg_replace('/\\\\/','',$body);
$mail->IsSMTP();
$mail->SMTPDebug = 2;
diff -Naur PHPMailer_v5.1.orig/examples/test_sendmail_basic.php PHPMailer_v5.1.new/examples/test_sendmail_basic.php
--- PHPMailer_v5.1.orig/examples/test_sendmail_basic.php 2009-05-24 07:48:48.000000000 +0200
+++ PHPMailer_v5.1.new/examples/test_sendmail_basic.php 2010-01-15 18:29:14.000000000 +0100
@@ -13,7 +13,7 @@
$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 -Naur PHPMailer_v5.1.orig/examples/test_smtp_basic_no_auth.php PHPMailer_v5.1.new/examples/test_smtp_basic_no_auth.php
--- PHPMailer_v5.1.orig/examples/test_smtp_basic_no_auth.php 2009-05-24 07:48:48.000000000 +0200
+++ PHPMailer_v5.1.new/examples/test_smtp_basic_no_auth.php 2010-01-15 18:29:14.000000000 +0100
@@ -17,7 +17,7 @@
$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 -Naur PHPMailer_v5.1.orig/examples/test_smtp_basic.php PHPMailer_v5.1.new/examples/test_smtp_basic.php
--- PHPMailer_v5.1.orig/examples/test_smtp_basic.php 2009-05-24 07:48:48.000000000 +0200
+++ PHPMailer_v5.1.new/examples/test_smtp_basic.php 2010-01-15 18:29:14.000000000 +0100
@@ -17,7 +17,7 @@
$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 -Naur PHPMailer_v5.1.orig/examples/test_smtp_gmail_basic.php PHPMailer_v5.1.new/examples/test_smtp_gmail_basic.php
--- PHPMailer_v5.1.orig/examples/test_smtp_gmail_basic.php 2009-05-24 07:48:48.000000000 +0200
+++ PHPMailer_v5.1.new/examples/test_smtp_gmail_basic.php 2010-01-15 18:29:14.000000000 +0100
@@ -17,7 +17,7 @@
$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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 5 Aug 2009 09:36:07 -0000 1.2
+++ .cvsignore 8 Jul 2010 16:21:45 -0000 1.3
@@ -1 +1 @@
-PHPMailer_v5.0.2.tar.gz
+PHPMailer_v5.1.tar.gz
Index: php-PHPMailer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/F-12/php-PHPMailer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-PHPMailer.spec 5 Aug 2009 09:36:07 -0000 1.1
+++ php-PHPMailer.spec 8 Jul 2010 16:21:46 -0000 1.2
@@ -1,15 +1,14 @@
Name: php-PHPMailer
Summary: PHP email transport class with a lot of features
-Version: 5.0.2
-Release: 3%{?dist}
+Version: 5.1
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source0: http://downloads.sourceforge.net/phpmailer/PHPMailer_v%{version}.tar.gz
+Patch1: PHPMailer-5.1-php53.patch
URL: http://phpmailer.worxware.com/
Requires: php-mbstring >= 5.1.0
-BuildRequires: dos2unix
Buildarch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
Full Featured Email Transfer Class for PHP. PHPMailer features:
@@ -41,9 +40,16 @@ Full Featured Email Transfer Class for P
%setup -q -n PHPMailer_v%{version}
-# Make sure all files are \n terminated.
+%patch1 -p 1
-find . -type f | xargs dos2unix
+
+#-------------------------------------------------------------------------------
+%build
+#-------------------------------------------------------------------------------
+
+# Make sure all file lines are \n terminated.
+
+find . -type f -exec sed -i -e 's/[\r\t ]*$//' '{}' ';'
# Change default language path.
@@ -53,13 +59,6 @@ sed -i -e \
#-------------------------------------------------------------------------------
-%build
-#-------------------------------------------------------------------------------
-
-# Nothing to do.
-
-
-#-------------------------------------------------------------------------------
%install
#-------------------------------------------------------------------------------
@@ -106,7 +105,7 @@ rm -rf "${RPM_BUILD_ROOT}"
#-------------------------------------------------------------------------------
%defattr(-, root, root, -)
-%doc docs/* README LICENSE ChangeLog.txt
+%doc docs/* README LICENSE changelog.txt
%doc examples
%{_datadir}/php/PHPMailer
%dir %{_datadir}/PHPMailer
@@ -117,6 +116,15 @@ rm -rf "${RPM_BUILD_ROOT}"
%changelog
#-------------------------------------------------------------------------------
+* Thu Jul 8 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-2
+- Get rid of dos2unix build requirement and of BuildRoot rpm tag.
+
+* Fri Jan 15 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-1
+- New upstream release.
+- Moved endline conversion and default language path update from prep to
+ build section.
+- Patch "php53" to remove PHP 5.3 deprecated features.
+
* Mon Aug 3 2009 Patrick Monnerat <pm at datasphere.ch> 5.0.2-3
- Home page change.
- Package description from new home page.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-PHPMailer/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 5 Aug 2009 09:36:07 -0000 1.2
+++ sources 8 Jul 2010 16:21:46 -0000 1.3
@@ -1 +1 @@
-2f7296bb63e863c5528c2d591e38f4e5 PHPMailer_v5.0.2.tar.gz
+6e81fc229f88f7d9dd7cf70d65296ef8 PHPMailer_v5.1.tar.gz
More information about the scm-commits
mailing list