[Pkg-mediawiki-devel] Fwd: Re: MediaWiki tarballs and the WMF

Thorsten Glaser t.glaser at tarent.de
Mon Jun 11 08:42:49 UTC 2012


On Thu, 7 Jun 2012, Mark A. Hershberger wrote:

> I especially like the idea of an /etc/mediawiki.d config directory.

We have something like that in mediawiki-extensions-base,
with a set of scripts (mwenext/mwdisext) similar to those
shipped with Apache 2, so the sysadmin can manually enable
(and disable again) extensions. I do not like the idea of
having things forced unconditionally and believe the current
infrastructure enough unless someone points out a good reason
otherwise.

> A supported release shouldn't need any patching...

There’s always distribution-specific patching, but yes, anything
other than that should probably sent upstream. I’ve not been the
best citizen with that always, especially due to bad experience
with other projects.

> > series 	 319 	 2 days 	 jmw 	 Don't use fix_invalid_sql_2.patch after all, it appears to be fixed upstream
> Good :)
> (although 'it appears to be fixed' sadly means that it wasn't linked to
> a bug number in our tracker, from which it can be confirmed)

Indeed, since mediawiki (1:1.19.1-1) experimental was uploaded without
the fix, yet my DB upgrade (eventually) went through, it’s no longer
needed.

The problem was: there were trailing commata at the end of a statement,
related to the schema search path.

> == fix_invalid_sql.patch ==

> DatabasePostgres::insert() contains code to deal with INSERT IGNORE
> since d5b71 (July 2008), and it seems to have been doing something even
> before. But it was missing in the insertSelect wrapper.
> That's bug 18909. https://bugzilla.wikimedia.org/show_bug.cgi?id=18909
> which got fixed in r58179 (October 2009) and got into 1.16.

Ah, okay, good.

> == texvc_location.patch ==
> Adds $wgTexvc = '/usr/bin/texvc'; to DefaultSettings.php (plus a comment).
> 
> Useless change. That's not enough to make <math> work. The math tag was
> been splitted to a separate extension in 1.18. So the user would *also*
> need to include the math extension in LocalSettings. That line should go
> in the extension package, not in MediaWiki DefaultSettings.php

Right, that was changed (and moved to the extension package) already,
I think.

> So yes, I'm happy we are improving collaboration packagers <-> upstream.

Agreed.

By the way, here™ we have more local patches; please tell me what you
think about them (currently against 1.15):

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-30 14:51:27 +0000
+++ debian/changelog	2012-05-30 14:52:41 +0000
@@ -1,3 +1,17 @@
+mediawiki (1:1.15.5-10tarent1) unstable; urgency=low
+
+  [ Thorsten Glaser ]
+  * debian/patches/tarent.patch: new
+    - includes/specials/SpecialAllpages.php:
+      raise $maxPerPage, $maxLineCount
+    - includes/DefaultSettings.php: add webdavs:// and file: support
+  * debian/control: prefer PostgreSQL over MySQL in Depends/Recommends
+
+  [ Roland Mas ]
+  * debian/patches/tarent.patch: add workaround for search bug
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 30 May 2012 16:52:33 +0200
+
 mediawiki (1:1.15.5-10) unstable; urgency=low
 
   * Team upload.

=== modified file 'debian/control'
--- debian/control	2012-03-15 12:01:46 +0000
+++ debian/control	2012-03-15 12:07:41 +0000
@@ -12,7 +12,7 @@
 
 Package: mediawiki
 Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends} 
+Depends: apache2 | httpd, php5, php5-pgsql | php5-mysql | php5-sqlite, mime-support, ${misc:Depends}
 Recommends: php5-cli
 Suggests: mediawiki-math,
  imagemagick | php5-gd,

=== modified file 'debian/control.in'
--- debian/control.in	2012-03-15 12:01:46 +0000
+++ debian/control.in	2012-03-15 12:07:40 +0000
@@ -12,7 +12,7 @@
 
 Package: mediawiki
 Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends} 
+Depends: apache2 | httpd, php5, php5-pgsql | php5-mysql | php5-sqlite, mime-support, ${misc:Depends}
 Recommends: php5-cli
 Suggests: mediawiki-math,
  imagemagick | php5-gd,

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-05-30 14:51:27 +0000
+++ debian/patches/series	2012-05-30 14:52:17 +0000
@@ -22,3 +22,4 @@
 CVE-2012-1582.patch
 CVE-2012-1581.patch
 fix_invalid_sql_2.patch
+tarent.patch

=== added file 'debian/patches/tarent.patch'
--- debian/patches/tarent.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/tarent.patch	2012-01-13 12:21:15 +0000
@@ -0,0 +1,49 @@
+Index: mediawiki-1.15.5/includes/DefaultSettings.php
+===================================================================
+--- mediawiki-1.15.5.orig/includes/DefaultSettings.php	2012-01-13 13:20:46.000000000 +0100
++++ mediawiki-1.15.5/includes/DefaultSettings.php	2012-01-13 13:21:12.000000000 +0100
+@@ -280,6 +280,8 @@
+ 	'mailto:',
+ 	'news:',
+ 	'svn://',
++	'webdavs://',
++	'file:',
+ );
+ 
+ /** internal name of virus scanner. This servers as a key to the $wgAntivirusSetup array.
+Index: mediawiki-1.15.5/includes/specials/SpecialAllpages.php
+===================================================================
+--- mediawiki-1.15.5.orig/includes/specials/SpecialAllpages.php	2009-02-20 17:13:40.000000000 +0100
++++ mediawiki-1.15.5/includes/specials/SpecialAllpages.php	2012-01-13 13:21:12.000000000 +0100
+@@ -9,12 +9,12 @@
+ 	/**
+ 	 * Maximum number of pages to show on single subpage.
+ 	 */
+-	protected $maxPerPage = 345;
++	protected $maxPerPage = 30000;
+ 
+ 	/**
+ 	 * Maximum number of pages to show on single index subpage.
+ 	 */
+-	protected $maxLineCount = 200;
++	protected $maxLineCount = 30000;
+ 
+ 	/**
+ 	 * Maximum number of chars to show for an entry.
+Index: mediawiki-1.15.5/includes/SearchPostgres.php
+===================================================================
+--- mediawiki-1.15.5.orig/includes/SearchPostgres.php	2009-01-13 21:28:54.000000000 +0100
++++ mediawiki-1.15.5/includes/SearchPostgres.php	2012-01-13 13:21:12.000000000 +0100
+@@ -143,6 +143,12 @@
+ 		}
+ 		$prefix = $wgDBversion < 8.3 ? "'default'," : '';
+ 
++		/*-
++		 * tarent workaround / bugfix for
++		 * https://evolvis.org/tracker/t_follow.php/1031
++		 */
++		$prefix = "'default',";
++
+ 		# Get the SQL fragment for the given term
+ 		$searchstring = $this->parseQuery( $term );
+ 



bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-314
HRB AG Bonn 5168 • USt-ID (VAT): DE122264941
Geschäftsführer: Boris Esser, Sebastian Mancke



More information about the Pkg-mediawiki-devel mailing list