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

Mark A. Hershberger mah at everybody.org
Thu Jun 7 18:18:47 UTC 2012

Have a look at  Platonide's comments about the patches.  It looks like
he thinks all but one of the patches isn't needed and that one is
something that could be put in an /etc/mediawiki.d directory.

-------- Original Message --------
Subject: Re: MediaWiki tarballs and the WMF
Date: Thu, 07 Jun 2012 19:45:35 +0200
From: Platonides <Platonides at gmail.com>
To: wikitech-l at lists.wikimedia.org

On 07/06/12 00:53, Mark A. Hershberger wrote:
>> I'd happily add hooks they needed to remove the need of patching for
>> MediaWiki packagers, or including a script to move if that's what they
>> really want.
> Packaging is happening right now.  Look at the patches they're making
> here:
> http://anonscm.debian.org/viewvc/pkg-mediawiki/mediawiki/trunk/debian/patches/

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

Let's look at them:

> 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)

== fix_invalid_sql.patch ==
It is converting an INSERT IGNORE into an insert, following a bug report
then moved to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615983

I haven't found it on our bugtracker.

Not explicity said on the bug report, the backtrace reveals it is
happening with PostgreSQL backend.

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.

The backtrace in the 2011 bug does show that their DatabasePostgres
wrapper didn't contain insertSelect() method (confirmed by reporting the
bug against 1.15.3).

== mimetypes.patch ==
Changes $wgMimeTypeFile from "includes/mime.types"; to
"/etc/mime.types", fair one.

== suppress_warnings.patch ==
Changes session_start(); to @session_start(); inside a pair of
wfSuppressWarnings() wfSuppressWarnings(). WRONG.
The patch is not needed.

Moreover, it was an @session_start() until Tim changed it to
wfSuppressWarnings() in fbfb50 (March 2008).
Previosuly it had been changed from session_start() to @session_start()
by Gabriel Wicke in 90aadf7 (April 2004).

So this patch has been unneeded at least for 8 years :)
(svn history suggests that it was created in 2010, not knowing that
wfSuppressWarnings actually deals with php warnings)

== 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

= Summary =
Out of 4 patches, only 1 seems to be 'useful'.

Even that, it could be moved to a different file instead of a core hack.
Are they using something like a /etc/mediawiki.d/ folder?

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


More information about the Pkg-mediawiki-devel mailing list