rpms/php-pear-MDB2-Driver-mysql/FC-6 php-pear-MDB2-Driver-mysql-1.4.1-lob.patch, NONE, 1.1 php-pear-MDB2-Driver-mysql.spec, 1.4, 1.5

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6670/FC-6

Modified Files:
	php-pear-MDB2-Driver-mysql.spec 
Added Files:
	php-pear-MDB2-Driver-mysql-1.4.1-lob.patch 
Log Message:
add patch for bz #379081

php-pear-MDB2-Driver-mysql-1.4.1-lob.patch:

--- NEW FILE php-pear-MDB2-Driver-mysql-1.4.1-lob.patch ---
http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/mysql.php?r1=1.182&r2=1.183&diff_format=u
Index: pear/MDB2/MDB2/Driver/mysql.php
diff -u pear/MDB2/MDB2/Driver/mysql.php:1.182 pear/MDB2/MDB2/Driver/mysql.php:1.183
--- MDB2/Driver/mysql.php:1.182	Wed May  2 22:00:08 2007
+++ MDB2/Driver/mysql.php	Thu May  3 22:20:20 2007
@@ -43,7 +43,7 @@
 // | Author: Lukas Smith <smith at pooteeweet.org>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: mysql.php,v 1.182 2007/05/02 22:00:08 quipo Exp $
+// $Id: mysql.php,v 1.183 2007/05/03 22:20:20 davidc Exp $
 //
 
 /**
@@ -1398,7 +1398,7 @@
                 }
                 $value = $this->values[$parameter];
                 $type = array_key_exists($parameter, $this->types) ? $this->types[$parameter] : null;
-                if (is_resource($value) || $type == 'clob' || $type == 'blob') {
+                if (is_resource($value) || $type == 'clob' || $type == 'blob' && $this->options['lob_allow_url_include']) {
                     if (!is_resource($value) && preg_match('/^(\w+:\/\/)(.*)$/', $value, $match)) {
                         if ($match[1] == 'file://') {
                             $value = $match[2];
@@ -1476,4 +1476,4 @@
         return $result;
     }
 }
-?>
\ No newline at end of file
+?>


Index: php-pear-MDB2-Driver-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-MDB2-Driver-mysql/FC-6/php-pear-MDB2-Driver-mysql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pear-MDB2-Driver-mysql.spec	22 Sep 2007 19:47:49 -0000	1.4
+++ php-pear-MDB2-Driver-mysql.spec	14 Nov 2007 01:14:12 -0000	1.5
@@ -3,13 +3,14 @@
 
 Name:           php-pear-MDB2-Driver-mysql
 Version:        1.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MySQL MDB2 driver
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/MDB2_Driver_mysql
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
+Patch0:         %{name}-1.4.1-lob.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -48,6 +49,12 @@
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+# Add LOB security patch (bz #379081)
+# Must be patched manually after install
+pushd $RPM_BUILD_ROOT%{pear_phpdir}
+patch -p0 < %{PATCH0}
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +81,9 @@
 
 
 %changelog
+* Tue Nov 13 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-3
+- Add security patch (bz #379081)
+
 * Sat Sep 22 2007 Christopher Stone <chris.stone at gmail.com> 1.4.1-2
 - Update Requires