[php-PHPMailer/el6] merge rawhide change

[Remi Collet]

commit ce5d4871dd9fc0d5ba99488ad25a8736a534822a
Author: remi <fedora at famillecollet.com>
Date:   Thu Jul 21 17:45:30 2011 +0200

    merge rawhide change

 .gitignore               |    1 +
 PHPMailer-5.1-sign.patch |   13 +++++++++++++
 php-PHPMailer.spec       |   11 ++++++++++-
 3 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88bbc2e..e6e30a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+*~
 PHPMailer_v5.0.2.tar.gz
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 92eb77b..449128b 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:	2%{?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
 
 
 #-------------------------------------------------------------------------------
@@ -116,6 +118,13 @@ rm -rf "${RPM_BUILD_ROOT}"
 %changelog
 #-------------------------------------------------------------------------------
 
+* Thu Jul 21 2011 Remi Collet <remi at fedoraproject.org> 5.1-4.el6
+- latest change from rawhide (sign patch)
+
+* 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
+
 * Thu Jul  8 2010 Patrick Monnerat <pm at datasphere.ch> 5.1-2
 - Get rid of dos2unix build requirement and of BuildRoot rpm tag.