[Pkg-mediawiki-commits] r313 - in mediawiki/sid-sec/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2012-05-30 14:51:58 +0000 (Wed, 30 May 2012)
New Revision: 313

Added:
   mediawiki/sid-sec/debian/patches/fix_invalid_sql_2.patch
Modified:
   mediawiki/sid-sec/debian/changelog
   mediawiki/sid-sec/debian/patches/series
Log:
apply path to actually allow the database upgrade code to run without
errors on systems using PostgreSQL with multiple schemata, by Roland Mas

Modified: mediawiki/sid-sec/debian/changelog
===================================================================
--- mediawiki/sid-sec/debian/changelog	2012-05-16 13:16:36 UTC (rev 312)
+++ mediawiki/sid-sec/debian/changelog	2012-05-30 14:51:58 UTC (rev 313)
@@ -1,3 +1,10 @@
+mediawiki (1:1.15.5-10) unstable; urgency=low
+
+  * Team upload.
+  * Apply SQL fix for schema search paths by Roland Mas (#673125)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 May 2012 16:50:36 +0200
+
 mediawiki (1:1.15.5-9) unstable; urgency=high
 
   * Team upload.

Added: mediawiki/sid-sec/debian/patches/fix_invalid_sql_2.patch
===================================================================
--- mediawiki/sid-sec/debian/patches/fix_invalid_sql_2.patch	                        (rev 0)
+++ mediawiki/sid-sec/debian/patches/fix_invalid_sql_2.patch	2012-05-30 14:51:58 UTC (rev 313)
@@ -0,0 +1,15 @@
+# DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673125#12
+# DP: Remove trailing commas from search path to prevent invalid SQL
+
+Index: mediawiki-1.15.5/maintenance/updaters.inc
+===================================================================
+--- mediawiki-1.15.5.orig/maintenance/updaters.inc	2012-05-30 16:48:59.000000000 +0200
++++ mediawiki-1.15.5/maintenance/updaters.inc	2012-05-30 16:49:03.000000000 +0200
+@@ -1413,6 +1413,7 @@
+ 		$search_path = "$search_path, $wgDBts2schema";
+ 	}
+ 	$search_path = str_replace( ', ,', ',', $search_path);
++	$search_path = preg_replace( '/, *$/', '', $search_path);
+ 	if( array_key_exists( 'search_path', $conf ) === false || $search_path != $conf['search_path'] ) {
+ 		$wgDatabase->doQuery( "ALTER USER $wgDBuser SET search_path = $search_path" );
+ 		$wgDatabase->doQuery( "SET search_path = $search_path" );

Modified: mediawiki/sid-sec/debian/patches/series
===================================================================
--- mediawiki/sid-sec/debian/patches/series	2012-05-16 13:16:36 UTC (rev 312)
+++ mediawiki/sid-sec/debian/patches/series	2012-05-30 14:51:58 UTC (rev 313)
@@ -21,3 +21,4 @@
 php54.patch
 CVE-2012-1582.patch
 CVE-2012-1581.patch
+fix_invalid_sql_2.patch