[php-PHPMailer/f15] * Mon Jul 18 2011 Patrick Monnerat <pm at datasphere.ch> 5.1-4 - Patch "sign" to fix mail signing. ht
Patrick Monnerat
monnerat at fedoraproject.org
Mon Jul 18 14:57:40 UTC 2011
commit b167bbc68e47fa96f08e5c8d0207725b3ccc7e6d
Author: Patrick Monnerat <pm at datasphere.ch>
Date: Mon Jul 18 16:57:12 2011 +0200
* 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
PHPMailer-5.1-sign.patch | 13 +++++++++++++
php-PHPMailer.spec | 12 +++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/PHPMailer-5.1-sign.patch b/PHPMailer-5.1-sign.patch
new file mode 100644
index 0000000..80e4e2f
--- /dev/null
+++ b/PHPMailer-5.1-sign.patch
@@ -0,0 +1,13 @@
+diff -Naur PHPMailer_v5.1.orig/class.phpmailer.php PHPMailer_v5.1.new/class.phpmailer.php
+--- PHPMailer_v5.1.orig/class.phpmailer.php 2011-07-18 15:16:37.473177156 +0200
++++ PHPMailer_v5.1.new/class.phpmailer.php 2011-07-18 15:17:47.021871402 +0200
+@@ -1238,8 +1238,8 @@
+ $signed = tempnam("", "signed");
+ if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
+ @unlink($file);
+- @unlink($signed);
+ $body = file_get_contents($signed);
++ @unlink($signed);
+ } else {
+ @unlink($file);
+ @unlink($signed);
diff --git a/php-PHPMailer.spec b/php-PHPMailer.spec
index 1ad6f48..c57394d 100644
--- a/php-PHPMailer.spec
+++ b/php-PHPMailer.spec
@@ -1,11 +1,12 @@
Name: php-PHPMailer
Summary: PHP email transport class with a lot of features
Version: 5.1
-Release: 3%{?dist}
+Release: 4%{?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
URL: http://phpmailer.worxware.com/
Requires: php-mbstring >= 5.1.0
Buildarch: noarch
@@ -41,6 +42,7 @@ Full Featured Email Transfer Class for PHP. PHPMailer features:
%setup -q -n PHPMailer_v%{version}
%patch1 -p 1
+%patch2 -p 1
#-------------------------------------------------------------------------------
@@ -114,11 +116,15 @@ rm -rf "${RPM_BUILD_ROOT}"
#-------------------------------------------------------------------------------
%changelog
+#-------------------------------------------------------------------------------
+
+* 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
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-#-------------------------------------------------------------------------------
-
* Thu Jul 8 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-2
- Get rid of dos2unix build requirement and of BuildRoot rpm tag.
More information about the scm-commits
mailing list