rpms/gallery2/F-10 gallery2-2.3-captcha.patch, NONE, 1.1 gallery2-2.3-smtp.patch, NONE, 1.1 gallery2.spec, 1.24, 1.25

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/gallery2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19356

Modified Files:
	gallery2.spec 
Added Files:
	gallery2-2.3-captcha.patch gallery2-2.3-smtp.patch 
Log Message:
Patches.


gallery2-2.3-captcha.patch:

--- NEW FILE gallery2-2.3-captcha.patch ---
--- modules/core/classes/GallerySession.class~	2009-05-21 09:03:54.000000000 -0500
+++ modules/core/classes/GallerySession.class	2009-05-21 09:03:54.000000000 -0500
@@ -27,0 +28,3 @@
+//BZ 501871, captcha fix.
+GalleryCoreApi::requireOnce('modules/core/classes/GalleryTranslator.class');  
+

gallery2-2.3-smtp.patch:

--- NEW FILE gallery2-2.3-smtp.patch ---
--- lib/smtp/smtp.php~	2008-10-18 02:15:42.000000000 -0500
+++ lib/smtp/smtp.php	2009-05-21 07:14:59.000000000 -0500
@@ -42,14 +42,15 @@
-    if (isset($headers)) {
-	$headers = rtrim($headers);
-
-	// Make sure there are no bare linefeeds in the headers
-	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
-
-	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $cc = split(', *', $match[1]);
-	}
-	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
-	    $bcc = split(', *', $match[1]);
-	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
-	}
-    }
+    /// JOEL
+//    if (isset($headers)) {
+//	$headers = rtrim($headers);
+//
+//	// Make sure there are no bare linefeeds in the headers
+//	$headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
+//
+//	if (preg_match('#^cc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $cc = split(', *', $match[1]);
+//	}
+//	if (preg_match('#^bcc:\s*(.*?)\s*$#mi', $headers, $match)) {
+//	    $bcc = split(', *', $match[1]);
+//	    $headers = preg_replace('#^bcc:.*$#mi', '', $headers);
+//	}
+//    }
@@ -68 +69,10 @@
-    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+//    list ($config['smtp.host'], $port) = array_merge(explode(':', $config['smtp.host']), array(25));
+// JDY JOEL YOUNG FIX FROM http://blog.bonetree.net/2008/10/configuring-gallery2-to-send-email-using-gmail/
+    $url_info = parse_url($config['smtp.host']);
+    $config['smtp.host'] = '';
+    if( isset($url_info['scheme']) ) {
+       $config['smtp.host'] = $url_info['scheme'].'://';
+       }
+    $config['smtp.host'] .= $url_info['host'];
+    $port = ( isset($url_info['port']) ) ? $url_info['port'] : 25;
+


Index: gallery2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gallery2/F-10/gallery2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- gallery2.spec	18 May 2009 14:06:22 -0000	1.24
+++ gallery2.spec	21 May 2009 15:44:19 -0000	1.25
@@ -7,7 +7,7 @@ URL: http://gallery.menalto.com
 Name: gallery2
 Version: 2.3
 Group: Applications/Publishing
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -31,6 +31,8 @@ Obsoletes: gallery2-uploadapplet <= 2.3-
 Obsoletes: gallery2-slideshowapplet <= 2.3-7
 
 #Patch0: gallery2-perl-location.patch
+Patch1: gallery2-2.3-smtp.patch
+Patch2: gallery2-2.3-captcha.patch
 
 %package albumselect
 Summary: Albumselect module for Gallery 2
@@ -682,6 +684,8 @@ subalbums/other items not shown
 %prep
 %setup -q -n gallery2
 #%patch0 -p1
+%patch1 -p0
+%patch2 -p0
 
 %build
 #pushd lib/tools/bin
@@ -1103,6 +1107,10 @@ fi
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Wed May 21 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-11
+- Patch to fix SMTP, 501868.
+- Patch to fix captcha, 501871.
+
 * Thu May 14 2009 Jon Ciesla <limb at jcomserv.net> - 2.3-10
 - Fine-tuning of symlink script.