Bug#686214: tpu: package mediawiki-extensions/2.6+wheezy1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: tpu
Hi,
An RC bug causing a crash in various Mediawiki extensions was reported. A fix
must go through tpu, at least for now, because the version in sid is not
acceptable for a freeze exception. Please review the attached patch and approve
the fixes before I upload.
I verified the fix on a Wheezy machine.
The patch is pretty straightforwarded, there is some unfortunate noise from the
build that is not appropriate to fix in a freeze.
Thanks.
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru mediawiki-extensions-2.6/check_versions.pl mediawiki-extensions-2.6+wheezy1/check_versions.pl
--- mediawiki-extensions-2.6/check_versions.pl 2010-06-30 09:42:54.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/check_versions.pl 2012-08-29 22:35:14.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: check_versions.pl 191 2010-06-30 08:42:54Z tg $
+# $Id: check_versions.pl 376 2012-08-29 21:35:14Z jmw $
use Getopt::Std;
%options=();
diff -Nru mediawiki-extensions-2.6/debian/changelog mediawiki-extensions-2.6+wheezy1/debian/changelog
--- mediawiki-extensions-2.6/debian/changelog 2012-03-15 12:01:46.000000000 +0000
+++ mediawiki-extensions-2.6+wheezy1/debian/changelog 2012-08-29 23:22:43.000000000 +0100
@@ -1,3 +1,11 @@
+mediawiki-extensions (2.6+wheezy1) testing-proposed-updates; urgency=low
+
+ * Team upload.
+ * Replace calls to Xml::hidden() with Html::hidden()
+ Closes: #686190
+
+ -- Jonathan Wiltshire <jmw@debian.org> Wed, 29 Aug 2012 23:22:40 +0100
+
mediawiki-extensions (2.6) unstable; urgency=low
* Fix invalid XHTML output in the Collection extension’s template
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_collection.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_collection.patch
--- mediawiki-extensions-2.6/debian/patches/fix_collection.patch 2012-03-15 12:01:46.000000000 +0000
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_collection.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_collection.patch 307 2012-03-15 12:01:46Z tg $
+$Id: fix_collection.patch 376 2012-08-29 21:35:14Z jmw $
Fix Collection extension:
• Invalid XHTML nesting
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_createbox.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_createbox.patch
--- mediawiki-extensions-2.6/debian/patches/fix_createbox.patch 2011-04-12 13:27:06.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_createbox.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_createbox.patch 253 2011-04-12 12:27:06Z tg $
+$Id: fix_createbox.patch 376 2012-08-29 21:35:14Z jmw $
Fix CreateBox extension:
* API impropriety
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_footnote.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_footnote.patch
--- mediawiki-extensions-2.6/debian/patches/fix_footnote.patch 2011-04-12 13:27:06.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_footnote.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_footnote.patch 253 2011-04-12 12:27:06Z tg $
+$Id: fix_footnote.patch 376 2012-08-29 21:35:14Z jmw $
Fix FootNote extension:
* API impropriety
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_graphviz.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_graphviz.patch
--- mediawiki-extensions-2.6/debian/patches/fix_graphviz.patch 2011-04-12 14:47:38.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_graphviz.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_graphviz.patch 257 2011-04-12 13:47:38Z tg $
+$Id: fix_graphviz.patch 376 2012-08-29 21:35:14Z jmw $
Fix:
* path to dot
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_interwiki.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_interwiki.patch
--- mediawiki-extensions-2.6/debian/patches/fix_interwiki.patch 2011-04-12 13:27:06.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_interwiki.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_interwiki.patch 253 2011-04-12 12:27:06Z tg $
+$Id: fix_interwiki.patch 376 2012-08-29 21:35:14Z jmw $
Fix:
* Syntax error: UPDATE IGNORE tablename is not valid SQL
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_languageselector.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_languageselector.patch
--- mediawiki-extensions-2.6/debian/patches/fix_languageselector.patch 2011-04-12 13:27:06.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_languageselector.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_languageselector.patch 253 2011-04-12 12:27:06Z tg $
+$Id: fix_languageselector.patch 376 2012-08-29 21:35:14Z jmw $
Fix LanguageSelector extension:
* XHTML/1.0 Transitional validity of output
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_ldapauth.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_ldapauth.patch
--- mediawiki-extensions-2.6/debian/patches/fix_ldapauth.patch 2011-04-12 13:32:36.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_ldapauth.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_ldapauth.patch 254 2011-04-12 12:32:36Z tg $
+$Id: fix_ldapauth.patch 376 2012-08-29 21:35:14Z jmw $
Fix LDAP Auth extension:
* Don’t overwrite connection pointer with nil (LP: #668589)
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_newestpages.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_newestpages.patch
--- mediawiki-extensions-2.6/debian/patches/fix_newestpages.patch 2011-04-12 13:27:06.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_newestpages.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_newestpages.patch 253 2011-04-12 12:27:06Z tg $
+$Id: fix_newestpages.patch 376 2012-08-29 21:35:14Z jmw $
Fix this for PostgreSQL version 7.2(!) and up… *and* correct
the order of arguments in this statement… this can never have
diff -Nru mediawiki-extensions-2.6/debian/patches/fix_rssreader.patch mediawiki-extensions-2.6+wheezy1/debian/patches/fix_rssreader.patch
--- mediawiki-extensions-2.6/debian/patches/fix_rssreader.patch 2011-04-12 13:27:06.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/fix_rssreader.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: fix_rssreader.patch 253 2011-04-12 12:27:06Z tg $
+$Id: fix_rssreader.patch 376 2012-08-29 21:35:14Z jmw $
Fix RSS_Reader extension:
* set $egCache to false by default, since we have no www-data writable
@@ -137,4 +137,4 @@
+http://www.mediawiki.org/w/index.php?title=Extension:RSS_Reader&oldid=390491
+
+
-+$Id: fix_rssreader.patch 253 2011-04-12 12:27:06Z tg $
++$Id: fix_rssreader.patch 376 2012-08-29 21:35:14Z jmw $
diff -Nru mediawiki-extensions-2.6/debian/patches/news_dont_break_feeds.patch mediawiki-extensions-2.6+wheezy1/debian/patches/news_dont_break_feeds.patch
--- mediawiki-extensions-2.6/debian/patches/news_dont_break_feeds.patch 2012-02-01 15:29:45.000000000 +0000
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/news_dont_break_feeds.patch 2012-08-29 22:35:14.000000000 +0100
@@ -1,4 +1,4 @@
-$Id: news_dont_break_feeds.patch 305 2012-02-01 15:29:45Z tg $
+$Id: news_dont_break_feeds.patch 376 2012-08-29 21:35:14Z jmw $
Unbreak RSS links generated by other things than the News extension
itself, such as those on the &action=history pages. The cost of this
diff -Nru mediawiki-extensions-2.6/debian/patches/series mediawiki-extensions-2.6+wheezy1/debian/patches/series
--- mediawiki-extensions-2.6/debian/patches/series 2012-03-15 12:01:46.000000000 +0000
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/series 2012-08-29 22:56:25.000000000 +0100
@@ -10,3 +10,4 @@
fix_interwiki.patch
fix_ldapauth.patch
news_dont_break_feeds.patch
+use_html_hidden_686190.patch
diff -Nru mediawiki-extensions-2.6/debian/patches/use_html_hidden_686190.patch mediawiki-extensions-2.6+wheezy1/debian/patches/use_html_hidden_686190.patch
--- mediawiki-extensions-2.6/debian/patches/use_html_hidden_686190.patch 1970-01-01 01:00:00.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/patches/use_html_hidden_686190.patch 2012-08-29 23:04:11.000000000 +0100
@@ -0,0 +1,111 @@
+Description: Replace calls to Xml::hidden with Html::hidden
+ Xml::hidden was deprecated in MW 1.18 and the function moved to Html::
+Author: Jonathan Wiltshire <jmw@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686190
+Forwarded: not-needed
+Last-Update: 2012-08-29
+
+--- wheezy.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CategoryTree/CategoryTreePage.php
++++ wheezy/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CategoryTree/CategoryTreePage.php
+@@ -112,7 +112,7 @@
+ $wgOut->addHTML( Xml::openElement( 'form', array( 'name' => 'categorytree', 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-categorytree-form' ) ) );
+ $wgOut->addHTML( Xml::openElement( 'fieldset' ) );
+ $wgOut->addHTML( Xml::element( 'legend', null, wfMsgNoTrans( 'categorytree-legend' ) ) );
+- $wgOut->addHTML( Xml::hidden( 'title', $thisTitle->getPrefixedDbKey() ) );
++ $wgOut->addHTML( Html::hidden( 'title', $thisTitle->getPrefixedDbKey() ) );
+ $wgOut->addHTML( Xml::inputLabel( wfMsgNoTrans( 'categorytree-category' ), 'target', 'target', 20, $this->target ) . ' ' );
+ $wgOut->addHTML( Xml::openElement( 'select', array( 'name' => 'mode' ) ) );
+ $wgOut->addHTML( Xml::option( wfMsgNoTrans( 'categorytree-mode-categories' ), 'categories', $mode == CT_MODE_CATEGORIES ? true : false ) );
+--- wheezy.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php
++++ wheezy/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php
+@@ -183,7 +183,7 @@
+
+ // Hidden fulltext param for IE (bug 17161)
+ if( $type == 'fulltext' ) {
+- $htmlOut .= Xml::hidden( 'fulltext', 'Search' );
++ $htmlOut .= Html::hidden( 'fulltext', 'Search' );
+ }
+
+ $htmlOut .= Xml::closeElement( 'form' );
+--- wheezy.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php
++++ wheezy/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Interwiki/SpecialInterwiki_body.php
+@@ -80,9 +80,9 @@
+ Xml::input( 'wpInterwikiReason', 60, $defaultreason, array( 'tabindex' => '1', 'id' => 'mw-interwiki-deletereason', 'maxlength' => '200' ) ) .
+ '</td></tr>' .
+ '<tr><td class="mw-submit">' . Xml::submitButton( $button, array( 'id' => 'mw-interwiki-submit' ) ) .
+- Xml::hidden( 'wpInterwikiPrefix', $prefix ) .
+- Xml::hidden( 'wpInterwikiAction', $action ) .
+- Xml::hidden( 'wpEditToken', $token ) .
++ Html::hidden( 'wpInterwikiPrefix', $prefix ) .
++ Html::hidden( 'wpInterwikiAction', $action ) .
++ Html::hidden( 'wpEditToken', $token ) .
+ '</td></tr>' .
+ Xml::closeElement( 'table' ) .
+ Xml::closeElement( 'form' ) .
+@@ -103,7 +103,7 @@
+ $defaulturl = $row->iw_url;
+ $trans = $row->iw_trans;
+ $local = $row->iw_local;
+- $old = Xml::hidden( 'wpInterwikiPrefix', $row->iw_prefix );
++ $old = Html::hidden( 'wpInterwikiPrefix', $row->iw_prefix );
+ $topmessage = wfMsgExt( 'interwiki_edittext', array( 'parseinline' ) );
+ $intromessage = wfMsgExt( 'interwiki_editintro', array( 'parseinline' ) );
+ $button = wfMsg( 'edit' );
+@@ -140,9 +140,9 @@
+ '<td class="mw-input">' . Xml::input( 'wpInterwikiURL', 60, $defaulturl, array('tabindex'=>'1', 'maxlength'=>'200', 'id'=>'mw-interwiki-url') ) . '</td></tr>' .
+ '<tr><td class="mw-label">' . Xml::label( $reasonmessage, 'mw-interwiki-editreason' ) . '</td>' .
+ '<td class="mw-input">' . Xml::input( 'wpInterwikiReason', 60, $defaultreason, array( 'tabindex'=>'1', 'id'=>'mw-interwiki-editreason', 'maxlength'=>'200') ) .
+- Xml::hidden( 'wpInterwikiAction', $action ) .
++ Html::hidden( 'wpInterwikiAction', $action ) .
+ $old .
+- Xml::hidden( 'wpEditToken', $token ) .
++ Html::hidden( 'wpEditToken', $token ) .
+ '</td></tr>' .
+ '<tr><td class="mw-submit">' . Xml::submitButton( $button, array( 'id'=>'mw-interwiki-submit' ) ) . '</td></tr>' .
+ Xml::closeElement( 'table' ) .
+--- wheezy.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
++++ wheezy/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
+@@ -353,7 +353,7 @@
+ $html = '';
+ $html .= Xml::openElement('div', array('id' => 'languageselector-box-'.$id, 'class' => 'languageselector ' . $class, 'style' => $style ));
+ $html .= Xml::openElement('form', array('name' => 'languageselector-form-'.$id, 'id' => 'languageselector-form-'.$id, 'method' => 'get', 'action' => $wgScript, 'style' => 'display:inline;'));
+- $html .= Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() );
++ $html .= Html::hidden( 'title', $wgTitle->getPrefixedDBKey() );
+ $html .= Xml::openElement('select', array('name' => 'setlang', 'id' => 'languageselector-select-'.$id, 'style' => $selectorstyle));
+
+ foreach ($wgLanguageSelectorLanguages as $ln) {
+--- wheezy.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php
++++ wheezy/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/NewestPages/NewestPages.page.php
+@@ -161,8 +161,8 @@
+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
+ $form .= Xml::label( wfMsg( 'newestpages-namespace' ), 'namespace' ) . ' ';
+ $form .= Xml::namespaceSelector( $this->namespace, 'all' );
+- $form .= Xml::hidden( 'limit', $this->limit );
+- $form .= Xml::hidden( 'redirects', $this->redirects );
++ $form .= Html::hidden( 'limit', $this->limit );
++ $form .= Html::hidden( 'redirects', $this->redirects );
+ $form .= Xml::submitButton( wfMsg( 'newestpages-submit' ) ) . '</form>';
+ return $form;
+ }
+--- wheezy.orig/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Renameuser/SpecialRenameuser_body.php
++++ wheezy/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/Renameuser/SpecialRenameuser_body.php
+@@ -148,7 +148,7 @@
+ </tr>" .
+ Xml::closeElement( 'table' ) .
+ Xml::closeElement( 'fieldset' ) .
+- Xml::hidden( 'token', $token ) .
++ Html::hidden( 'token', $token ) .
+ Xml::closeElement( 'form' ) . "\n"
+ );
+
+--- wheezy.orig/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/MathCaptcha.class.php
++++ wheezy/dist/mediawiki-extensions-confirmedit/usr/share/mediawiki-extensions/confirmedit/MathCaptcha.class.php
+@@ -23,7 +23,7 @@
+
+ $form = '<table><tr><td>' . $this->fetchMath( $sum ) . '</td>';
+ $form .= '<td>' . Xml::input( 'wpCaptchaWord', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';
+- $form .= Xml::hidden( 'wpCaptchaId', $index );
++ $form .= Html::hidden( 'wpCaptchaId', $index );
+ return $form;
+ }
+
diff -Nru mediawiki-extensions-2.6/debian/README.source mediawiki-extensions-2.6+wheezy1/debian/README.source
--- mediawiki-extensions-2.6/debian/README.source 2010-06-30 13:11:50.000000000 +0100
+++ mediawiki-extensions-2.6+wheezy1/debian/README.source 2012-08-29 22:35:14.000000000 +0100
@@ -4,4 +4,4 @@
for further information.
-$Id: README.source 194 2010-06-30 12:11:50Z tg $
+$Id: README.source 376 2012-08-29 21:35:14Z jmw $
Reply to: