[Pkg-mediawiki-commits] r379 - mediawiki mediawiki/tarballs mediawiki/trunk/debian mediawiki/trunk/debian/patches mediawiki-extensions mediawiki-extensions/trunk/debian mediawiki-extensions/trunk/debian/patches

Thorsten Glaser tg at alioth.debian.org
Thu Sep 20 11:45:27 UTC 2012 

Author: tg
Date: 2012-09-20 11:45:26 +0000 (Thu, 20 Sep 2012)
New Revision: 379

Added:
   mediawiki-extensions/trunk/debian/patches/fix_inputbox.patch
   mediawiki-extensions/trunk/debian/patches/fix_pagecss.patch
   mediawiki/tarballs/mediawiki_1.19.2.orig.tar.gz
   mediawiki/trunk/debian/patches/fix_invalid_xhtml.patch
   mediawiki/trunk/debian/patches/fix_warnings.patch
Removed:
   mediawiki-extensions/experimental/
   mediawiki/experimental/
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/control
   mediawiki-extensions/trunk/debian/control.in
   mediawiki-extensions/trunk/debian/mediawiki-extensions-collection.links
   mediawiki-extensions/trunk/debian/patches/fix_collection.patch
   mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
   mediawiki-extensions/trunk/debian/patches/series
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/control
   mediawiki/trunk/debian/patches/fix_invalid_sql.patch
   mediawiki/trunk/debian/patches/mimetypes.patch
   mediawiki/trunk/debian/patches/series
   mediawiki/trunk/debian/patches/suppress_warnings.patch
   mediawiki/trunk/debian/rules
   mediawiki/trunk/debian/watch
Log:
?\226?\128?\162 merge my experimental branches back into the trunk
  for mediawiki and mediawiki-extensions
?\226?\128?\162 update mediawiki upstream version for security (Closes: #686330)
?\226?\128?\162 fix sortable tables (Closes: #687519)
?\226?\128?\162 update versioned Breaks against fusionforge (again, will upload soon)
?\226?\128?\162 prepare for upload


Added: mediawiki/tarballs/mediawiki_1.19.2.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: mediawiki/tarballs/mediawiki_1.19.2.orig.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/changelog	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,8 +1,25 @@
-mediawiki (1:1.19.1-2) UNRELEASED; urgency=low
+mediawiki (1:1.19.2-1) unstable; urgency=low
 
+  [ Thorsten Glaser ]
+  * New upstream: security fixes for CVE-2012-4377, CVE-2012-4378,
+    CVE-2012-4379, CVE-2012-4380, CVE-2012-4381, CVE-2012-4382
+    (Closes: #686330)
+  * Prevent <table></table> without any <tr /> inside, globally
+  * Fix more cases of not checking $wgHtml5
+  * MW’s ID (XML) sanitiser is there for a reason, use it!
+  * Prevent <ul></ul> without any <li /> inside in MonoBook
+  * Fix invalid XHTML caused by code not honouring $wgHtml5
+  * Quell some PHP warnings from sloppy code
+  * Do the wfSuppressWarnings patch used with FusionForge right
+  * Add myself to Uploaders and quieten lintian a bit
+  * Do not replace patched jquery-tablesorter with unpatched one;
+    unbreaks sortable tables (Closes: #687519)
+  * Update versioned Breaks against fusionforge and mw-extensions
+
+  [ Jonathan Wiltshire ]
   * Add Recommends on mediawiki-extensions-base and php-wikidiff2
 
- -- Jonathan Wiltshire <jmw at debian.org>  Mon, 18 Jun 2012 19:17:22 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 20 Sep 2012 13:40:12 +0200
 
 mediawiki (1:1.19.1-1) unstable; urgency=low
 

Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/control	2012-09-20 11:45:26 UTC (rev 379)
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
-Uploaders: Romain Beauxis <toots at rastageeks.org>, Jonathan Wiltshire <jmw at debian.org>
+Uploaders: Romain Beauxis <toots at rastageeks.org>, Jonathan Wiltshire <jmw at debian.org>, Thorsten Glaser <tg at mirbsd.de>
 Build-Depends: debhelper (>= 9),
  dh-buildinfo,
  ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
@@ -13,10 +13,19 @@
 
 Package: mediawiki
 Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, libjs-jquery-tablesorter, ${misc:Depends} 
+Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, ${misc:Depends}
 Recommends: mysql-server | postgresql-contrib, php5-cli, python, php-wikidiff2,  mediawiki-extensions-base
 Suggests: imagemagick | php5-gd, mediawiki-math, memcached, clamav
-Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1-4~)
+Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1+1~),
+ mediawiki-extensions-base (<< 2.8~),
+ mediawiki-extensions-geshi (<< 2.8~),
+ mediawiki-extensions-ldapauth (<< 2.8~),
+ mediawiki-extensions-openid (<< 2.8~),
+ mediawiki-extensions-confirmedit (<< 2.8~),
+ mediawiki-extensions-fckeditor (<< 2.8~),
+ mediawiki-extensions-collection (<< 2.8~),
+ mediawiki-extensions-graphviz (<< 2.8~),
+ mediawiki-extensions (<< 2.8~)
 Description: website engine for collaborative work
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing

Modified: mediawiki/trunk/debian/patches/fix_invalid_sql.patch
===================================================================
--- mediawiki/trunk/debian/patches/fix_invalid_sql.patch	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/patches/fix_invalid_sql.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,3 +1,5 @@
+$Id$
+
 Fix invalid SQL: Debian #615983
 | A database error has occurred
 | Query: INSERT IGNORE INTO page_restrictions (pr_page,pr_type,pr_level,pr_cascade,pr_user,pr_expiry) SELECT 793,pr_type,pr_level,pr_cascade,pr_user,pr_expiry FROM page_restrictions WHERE pr_page = '216'
@@ -7,9 +9,9 @@
 | ^
 Reference: https://evolvis.org/tracker/t_follow.php/1377
 
---- mediawiki-1.19.0.orig/includes/Title.php
-+++ mediawiki-1.19.0/includes/Title.php
-@@ -3524,8 +3524,7 @@
+--- a/includes/Title.php
++++ b/includes/Title.php
+@@ -3524,8 +3524,7 @@ class Title {
  					'pr_expiry'  => 'pr_expiry'
  				),
  				array( 'pr_page' => $pageid ),


Property changes on: mediawiki/trunk/debian/patches/fix_invalid_sql.patch
___________________________________________________________________
Added: svn:keywords
   + Id

Copied: mediawiki/trunk/debian/patches/fix_invalid_xhtml.patch (from rev 378, mediawiki/experimental/debian/patches/fix_invalid_xhtml.patch)
===================================================================
--- mediawiki/trunk/debian/patches/fix_invalid_xhtml.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/fix_invalid_xhtml.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -0,0 +1,169 @@
+$Id$
+
+Fix invalid XHTML:
+• prevent <table></table> without any <tr /> inside
+• someone forgot to check whether HTML5 was enabled before toying around
+• sanitise XML IDs (a space is *not* allowed, and "Main Page" contains one)
+• let makeLink and all its callers remove HTML5-only attributes from
+  hyperlinks if someone else was not careful (rather, several someones)
+• prevent <ul></ul> without any <li /> inside
+
+--- a/includes/HTMLForm.php
++++ b/includes/HTMLForm.php
+@@ -803,6 +803,9 @@ class HTMLForm extends ContextSource {
+ 			$attribs['id'] = Sanitizer::escapeId( "mw-htmlform-$sectionName" );
+ 		}
+ 
++		if (!$tableHtml)
++			$tableHtml = '<tr><td><!-- empty to prevent invalid XHTML --></td></tr>';
++
+ 		$tableHtml = Html::rawElement( 'table', $attribs,
+ 			Html::rawElement( 'tbody', array(), "\n$tableHtml\n" ) ) . "\n";
+ 
+@@ -1206,6 +1209,8 @@ class HTMLTextField extends HTMLFormFiel
+ 	}
+ 
+ 	function getInputHTML( $value ) {
++		global $wgHtml5;
++
+ 		$attribs = array(
+ 			'id' => $this->mID,
+ 			'name' => $this->mName,
+@@ -1229,6 +1234,8 @@ class HTMLTextField extends HTMLFormFiel
+ 		# well
+ 		foreach ( array( 'min', 'max', 'pattern', 'title', 'step',
+ 		'placeholder' ) as $param ) {
++			if ( !$wgHtml5 && $param != 'title' )
++				continue;
+ 			if ( isset( $this->mParams[$param] ) ) {
+ 				$attribs[$param] = $this->mParams[$param];
+ 			}
+@@ -1625,13 +1632,14 @@ class HTMLMultiSelectField extends HTMLF
+ 				$html .= Html::rawElement( 'h1', array(), $label ) . "\n";
+ 				$html .= $this->formatOptions( $info, $value );
+ 			} else {
+-				$thisAttribs = array( 'id' => "{$this->mID}-$info", 'value' => $info );
++				$info_id = Sanitizer::escapeId($this->mID . '-' . $info);
++				$thisAttribs = array( 'id' => $info_id, 'value' => $info );
+ 
+ 				$checkbox = Xml::check(
+ 					$this->mName . '[]',
+ 					in_array( $info, $value, true ),
+ 					$attribs + $thisAttribs );
+-				$checkbox .= ' ' . Html::rawElement( 'label', array( 'for' => "{$this->mID}-$info" ), $label );
++				$checkbox .= ' ' . Html::rawElement( 'label', array( 'for' => $info_id ), $label );
+ 
+ 				$html .= ' ' . Html::rawElement( 'div', array( 'class' => 'mw-htmlform-flatlist-item' ), $checkbox );
+ 			}
+--- a/includes/SkinTemplate.php
++++ b/includes/SkinTemplate.php
+@@ -1613,6 +1613,8 @@ abstract class BaseTemplate extends Quic
+ 	 *   output a <span> instead of just text.
+ 	 */
+ 	function makeLink( $key, $item, $options = array() ) {
++		global $wgHtml5;
++
+ 		if ( isset( $item['text'] ) ) {
+ 			$text = $item['text'];
+ 		} else {
+@@ -1664,6 +1666,11 @@ abstract class BaseTemplate extends Quic
+ 					$attrs['class'] = $options['link-class'];
+ 				}
+ 			}
++			if ( !$wgHtml5 ) {
++				foreach ( array( 'context', 'primary' ) as $k ) {
++					unset( $attrs[$k] );
++				}
++			}
+ 			$html = Html::rawElement( isset( $attrs['href'] ) ? 'a' : $options['link-fallback'], $attrs, $html );
+ 		}
+ 
+--- a/skins/MonoBook.php
++++ b/skins/MonoBook.php
+@@ -60,6 +60,8 @@ class MonoBookTemplate extends BaseTempl
+ 	 * @access private
+ 	 */
+ 	function execute() {
++		global $wgHtml5;
++
+ 		// Suppress warnings to prevent notices about missing indexes in $this->data
+ 		wfSuppressWarnings();
+ 
+@@ -69,7 +71,7 @@ class MonoBookTemplate extends BaseTempl
+ 	<a id="top"></a>
+ 	<?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
+ 
+-	<h1 id="firstHeading" class="firstHeading"><span dir="auto"><?php $this->html('title') ?></span></h1>
++	<h1 id="firstHeading" class="firstHeading"><span<?php if ($wgHtml5) echo ' dir="auto"'; ?>><?php $this->html('title') ?></span></h1>
+ 	<div id="bodyContent" class="mw-body">
+ 		<div id="siteSub"><?php $this->msg('tagline') ?></div>
+ 		<div id="contentSub"<?php $this->html('userlangattributes') ?>><?php $this->html('subtitle') ?></div>
+@@ -93,12 +95,21 @@ class MonoBookTemplate extends BaseTempl
+ 	<div class="portlet" id="p-personal">
+ 		<h5><?php $this->msg('personaltools') ?></h5>
+ 		<div class="pBody">
++<?php
++	$ul_shown = false;
++	foreach ($this->getPersonalTools() as $key => $item) {
++		if (!$ul_shown) {
++?>
+ 			<ul<?php $this->html('userlangattributes') ?>>
+-<?php		foreach($this->getPersonalTools() as $key => $item) { ?>
+-				<?php echo $this->makeListItem($key, $item); ?>
+-
+-<?php		} ?>
+-			</ul>
++<?php
++			$ul_shown = true;
++		}
++		echo "\n" . $this->makeListItem($key, $item);
++	}
++	if ($ul_shown) {
++		echo "\n</ul>\n";
++	}
++?>
+ 		</div>
+ 	</div>
+ 	<div class="portlet" id="p-logo">
+--- a/includes/Linker.php
++++ b/includes/Linker.php
+@@ -1148,7 +1148,7 @@ class Linker {
+ 	 * @return string
+ 	 */
+ 	private static function formatAutocommentsCallback( $match ) {
+-		global $wgLang;
++		global $wgLang, $wgHtml5;
+ 		$title = self::$autocommentTitle;
+ 		$local = self::$autocommentLocal;
+ 
+@@ -1189,7 +1189,9 @@ class Linker {
+ 			$auto .= wfMsgExt( 'colon-separator', array( 'escapenoentities', 'content' ) );
+ 		}
+ 		$auto = '<span class="autocomment">' . $auto . '</span>';
+-		$comment = $pre . $link . $wgLang->getDirMark() . '<span dir="auto">' . $auto . $post . '</span>';
++		$comment = $pre . $link . $wgLang->getDirMark() .
++		    '<span' . ($wgHtml5 ? ' dir="auto"' : '') . '>' . $auto .
++		    $post . '</span>';
+ 		return $comment;
+ 	}
+ 
+@@ -1381,6 +1383,8 @@ class Linker {
+ 	 * @return string
+ 	 */
+ 	public static function commentBlock( $comment, $title = null, $local = false ) {
++		global $wgHtml5;
++
+ 		// '*' used to be the comment inserted by the software way back
+ 		// in antiquity in case none was provided, here for backwards
+ 		// compatability, acc. to brion -ævar
+@@ -1388,7 +1392,9 @@ class Linker {
+ 			return '';
+ 		} else {
+ 			$formatted = self::formatComment( $comment, $title, $local );
+-			return " <span class=\"comment\" dir=\"auto\">($formatted)</span>";
++			return " <span class=\"comment\"" .
++			    ($wgHtml5 ? " dir=\"auto\"" : "") .
++			    ">($formatted)</span>";
+ 		}
+ 	}
+ 

Copied: mediawiki/trunk/debian/patches/fix_warnings.patch (from rev 378, mediawiki/experimental/debian/patches/fix_warnings.patch)
===================================================================
--- mediawiki/trunk/debian/patches/fix_warnings.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/fix_warnings.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -0,0 +1,28 @@
+$Id$
+
+Fix code:
+• array_merge expects at least one argument
+• apparently, checking for syntax with unserialize() needs an extra
+
+--- a/includes/SkinTemplate.php
++++ b/includes/SkinTemplate.php
+@@ -1808,7 +1808,7 @@ abstract class BaseTemplate extends Quic
+ 			}
+ 		}
+ 
+-		if ( $option == 'flat' ) {
++		if ( $option == 'flat' && $validFooterLinks ) {
+ 			// fold footerlinks into a single array using a bit of trickery
+ 			$validFooterLinks = call_user_func_array(
+ 				'array_merge',
+--- a/includes/media/PNG.php
++++ b/includes/media/PNG.php
+@@ -78,7 +78,7 @@ class PNGHandler extends BitmapHandler {
+ 		}
+ 
+ 		wfSuppressWarnings();
+-		$data = unserialize( $metadata );
++		$data = @unserialize( $metadata );
+ 		wfRestoreWarnings();
+ 
+ 		if ( !$data || !is_array( $data ) ) {

Modified: mediawiki/trunk/debian/patches/mimetypes.patch
===================================================================
--- mediawiki/trunk/debian/patches/mimetypes.patch	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/patches/mimetypes.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,6 +1,8 @@
---- mediawiki-1.19.0.orig/includes/DefaultSettings.php
-+++ mediawiki-1.19.0/includes/DefaultSettings.php
-@@ -879,8 +879,8 @@
+$Id$
+
+--- a/includes/DefaultSettings.php
++++ b/includes/DefaultSettings.php
+@@ -879,8 +879,8 @@ $wgAntivirusRequired = true;
  $wgVerifyMimeType = true;
  
  /** Sets the mime type definition file to use by MimeMagic.php. */


Property changes on: mediawiki/trunk/debian/patches/mimetypes.patch
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/patches/series	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,3 +1,5 @@
 mimetypes.patch
 suppress_warnings.patch
 fix_invalid_sql.patch
+fix_invalid_xhtml.patch
+fix_warnings.patch

Modified: mediawiki/trunk/debian/patches/suppress_warnings.patch
===================================================================
--- mediawiki/trunk/debian/patches/suppress_warnings.patch	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/patches/suppress_warnings.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -2,9 +2,35 @@
 
 Suppress warnings from being run within FusionForge’s gforge-plugin-mediawiki
 
---- mediawiki-1.19.0.orig/includes/GlobalFunctions.php
-+++ mediawiki-1.19.0/includes/GlobalFunctions.php
-@@ -3362,7 +3362,7 @@
+--- a/includes/GlobalFunctions.php
++++ b/includes/GlobalFunctions.php
+@@ -2199,7 +2199,9 @@ function wfNegotiateType( $cprefs, $spre
+  *
+  * @param $end Bool
+  */
++$wf__warnings_suppressed = false;
+ function wfSuppressWarnings( $end = false ) {
++	global $wf__warnings_suppressed;
+ 	static $suppressCount = 0;
+ 	static $originalLevel = false;
+ 
+@@ -2208,6 +2210,7 @@ function wfSuppressWarnings( $end = fals
+ 			--$suppressCount;
+ 			if ( !$suppressCount ) {
+ 				error_reporting( $originalLevel );
++				$wf__warnings_suppressed = false;
+ 			}
+ 		}
+ 	} else {
+@@ -2217,6 +2220,7 @@ function wfSuppressWarnings( $end = fals
+ 				define( 'E_DEPRECATED', 8192 );
+ 			}
+ 			$originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED ) );
++			$wf__warnings_suppressed = true;
+ 		}
+ 		++$suppressCount;
+ 	}
+@@ -3362,7 +3366,7 @@ function wfSetupSession( $sessionId = fa
  		wfFixSessionID();
  	}
  	wfSuppressWarnings();


Property changes on: mediawiki/trunk/debian/patches/suppress_warnings.patch
___________________________________________________________________
Modified: svn:keywords
   - Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State
   + Id

Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/rules	2012-09-20 11:45:26 UTC (rev 379)
@@ -6,9 +6,14 @@
 
 override_dh_install:
 	dh_install
+	# Ugh. This is easier than patching, though.
+	chmod a+x debian/mediawiki/usr/share/mediawiki/includes/normal/UtfNormalTest2.php
 	# Now some tidying up is required
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/compare_schemas.pl
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/mediawiki_mysql2postgres.pl
+	chmod a+x debian/mediawiki/var/lib/mediawiki/extensions/ConfirmEdit/captcha.py
+	chmod a-x debian/mediawiki/usr/share/mediawiki/resources/jquery/images/marker.png
+	chmod a-x debian/mediawiki/var/lib/mediawiki/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
 	find debian/mediawiki/usr/share/mediawiki -maxdepth 1 -mindepth 1 | grep -v "\(LocalSettings.php\|AdminSettings.php\|debian-scripts\|images\|extensions\|config\)" | \
 	while read i; do \
 		dh_link "`echo "$$i" | sed -e s#debian/mediawiki/##`" \
@@ -19,7 +24,7 @@
 	rm debian/mediawiki/usr/share/mediawiki/resources/jquery.tipsy/jquery.tipsy.js
 	dh_link usr/share/javascript/jquery/jquery.min.js usr/share/mediawiki/resources/jquery/jquery.js
 	dh_link usr/share/javascript/jquery-tipsy/jquery.tipsy.min.js usr/share/mediawiki/resources/jquery.tipsy/jquery.tipsy.js; \
-	for lib in cookie form tablesorter; do \
+	for lib in cookie form; do \
 		rm debian/mediawiki/usr/share/mediawiki/resources/jquery/jquery.$$lib.js; \
 		dh_link usr/share/javascript/jquery-$$lib/jquery.$$lib.min.js usr/share/mediawiki/resources/jquery/jquery.$$lib.js; \
 		echo $$lib; \
@@ -33,6 +38,7 @@
 	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/COPYING
 	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/LICENSE
 	rm -f debian/mediawiki/var/lib/mediawiki/extensions/ParserFunctions/COPYING
+	rm -f debian/mediawiki/var/lib/mediawiki/extensions/Nuke/COPYING
 	# Put debian version for mediawiki version..
 	sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
 			-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php

Modified: mediawiki/trunk/debian/watch
===================================================================
--- mediawiki/trunk/debian/watch	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki/trunk/debian/watch	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,8 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 # Compulsory line, this is a version 3 file
 version=3
 

Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki-extensions/trunk/debian/changelog	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,3 +1,15 @@
+mediawiki-extensions (2.8) unstable; urgency=low
+
+  * Remove dependency of mw-ext-collection on various ECMAscript
+    libraries that apparently are available from MW core already
+    (as log message for r87847 suggests); enables testing transition
+  * Fix paths in RSS_Reader extension
+  * Quell those UNIQ‥QINU texts by fixing PageCSS to honour the API
+  * Fix content-less ul element in Collection extension
+  * Fix invalid XHTML in InputBox extension
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 20 Sep 2012 13:40:12 +0200
+
 mediawiki-extensions (2.7) unstable; urgency=low
 
   * Target MediaWiki 1.19

Modified: mediawiki-extensions/trunk/debian/control
===================================================================
--- mediawiki-extensions/trunk/debian/control	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki-extensions/trunk/debian/control	2012-09-20 11:45:26 UTC (rev 379)
@@ -104,8 +104,7 @@
 
 Package: mediawiki-extensions-collection
 Architecture: all
-Depends: ${misc:Depends}, mediawiki-extensions-base,
- libjs-jquery, libjs-jquery-ui, libjs-json, php5-curl
+Depends: ${misc:Depends}, mediawiki-extensions-base, php5-curl
 Description: Extensions for MediaWiki -- Collection extension
  This package provides the mediawiki extensions for
  creating books using collections of pages.

Modified: mediawiki-extensions/trunk/debian/control.in
===================================================================
--- mediawiki-extensions/trunk/debian/control.in	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki-extensions/trunk/debian/control.in	2012-09-20 11:45:26 UTC (rev 379)
@@ -104,8 +104,7 @@
 
 Package: mediawiki-extensions-collection
 Architecture: all
-Depends: ${misc:Depends}, mediawiki-extensions-base,
- libjs-jquery, libjs-jquery-ui, libjs-json, php5-curl
+Depends: ${misc:Depends}, mediawiki-extensions-base, php5-curl
 Description: Extensions for MediaWiki -- Collection extension
  This package provides the mediawiki extensions for
  creating books using collections of pages.

Modified: mediawiki-extensions/trunk/debian/mediawiki-extensions-collection.links
===================================================================
--- mediawiki-extensions/trunk/debian/mediawiki-extensions-collection.links	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki-extensions/trunk/debian/mediawiki-extensions-collection.links	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,5 +1,2 @@
 usr/share/mediawiki-extensions/collection var/lib/mediawiki/extensions/Collection
 usr/share/mediawiki-extensions/collection/Collection.php etc/mediawiki-extensions/extensions-available/Collection.php
-usr/share/javascript/jquery-ui/jquery-ui.js usr/share/mediawiki-extensions/collection/collection/jquery.ui.js
-usr/share/javascript/jquery/jquery.js usr/share/mediawiki-extensions/collection/collection/jquery.js
-usr/share/javascript/json/json2.min.js usr/share/mediawiki-extensions/collection/collection/json2.js

Modified: mediawiki-extensions/trunk/debian/patches/fix_collection.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_collection.patch	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki-extensions/trunk/debian/patches/fix_collection.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -2,6 +2,7 @@
 
 Fix Collection extension:
 • Invalid XHTML nesting
+• Empty ul element
 
 --- a/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php
 +++ b/dist/mediawiki-extensions-collection/usr/share/mediawiki-extensions/collection/Collection.templates.php
@@ -23,12 +24,39 @@
  				<input name="token" type="hidden" value="<?php echo htmlspecialchars( $GLOBALS['wgUser']->editToken() ) ?>" />
  				<input name="bookcmd" type="hidden" value="save_collection" />
  			</form>
-@@ -221,7 +221,7 @@ if ( count( $this->data['collection']['i
+@@ -215,13 +215,17 @@ if ( count( $this->data['collection']['i
+ </div>
+ <?php } ?>
+ 
+-<ul id="collectionList">
+-
+ <?php
++$ul_shown = false;
  foreach ( $this->data['collection']['items'] as $index => $item ) {
- 	if ( $item['type'] == 'article' ) { ?>
+-	if ( $item['type'] == 'article' ) { ?>
++	if ( $item['type'] == 'article' ) {
++		if (!$ul_shown) {
++			echo '<ul id="collectionList">' . "\n";
++			$ul_shown = true;
++		}
++?>
  	<li id="item-<?php echo intval( $index ) ?>" class="article">
 -		<a onclick="return coll_remove_item(<?php echo intval( $index ) ?>)" href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book', array( 'bookcmd' => 'remove_item', 'index' => $index ) ) ) ?>" title="<?php $this->msg( 'coll-remove' ) ?>"><img src="<?php echo htmlspecialchars( $mediapath . "remove.png" ) ?>" width="10" height="10" alt="<?php $this->msg( 'coll-remove' ) ?>" /></a><a>
 +		<a onclick="return coll_remove_item(<?php echo intval( $index ) ?>)" href="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book', array( 'bookcmd' => 'remove_item', 'index' => $index ) ) ) ?>" title="<?php $this->msg( 'coll-remove' ) ?>"><img src="<?php echo htmlspecialchars( $mediapath . "remove.png" ) ?>" width="10" height="10" alt="<?php $this->msg( 'coll-remove' ) ?>" /></a>
  		<noscript>
  		<?php if ( $index == 0 ) { ?>
  			<img src="<?php echo htmlspecialchars( $mediapath . "trans.png" ) ?>" width="10" height="10" alt="" />
+@@ -269,8 +273,11 @@ foreach ( $this->data['collection']['ite
+ 		<a class="makeVisible" <?php if ( !isset( $this->data['is_ajax'] ) ) { echo 'style="display:none"'; } ?> onclick="<?php echo htmlspecialchars( 'return coll_rename_chapter(' . intval( $index ) . ', ' . Xml::encodeJsVar( $item['title'] ) . ')' ) ?>" href="javascript:void(0)">[<?php $this->msg( 'coll-rename' ) ?>]</a>
+ 	</li>
+ 	<?php }
+-} ?>
+-</ul>
++}
++if ($ul_shown) {
++	echo "</ul>\n";
++}
++?>
+ 
+ </div>
+ 

Copied: mediawiki-extensions/trunk/debian/patches/fix_inputbox.patch (from rev 378, mediawiki-extensions/experimental/debian/patches/fix_inputbox.patch)
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_inputbox.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_inputbox.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -0,0 +1,100 @@
+$Id$
+
+Fix InputBox extension:
+• Invalid XHTML
+
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php
+@@ -74,6 +74,7 @@ class InputBox {
+ 	 */
+ 	public function getSearchForm( $type ) {
+ 		global $wgContLang, $wgNamespaceAliases;
++		global $wgHtml5;
+ 
+ 		// Use button label fallbacks
+ 		if ( !$this->mButtonLabel ) {
+@@ -98,15 +99,19 @@ class InputBox {
+ 				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
+ 			)
+ 		);
+-		$htmlOut .= Xml::element( 'input',
+-			array(
++		$tmpa = array(
+ 				'class' => 'searchboxInput',
+ 				'name' => 'search',
+ 				'type' => $this->mHidden ? 'hidden' : 'text',
+ 				'value' => $this->mDefaultText,
+ 				'placeholder' => $this->mPlaceholderText,
+ 				'size' => $this->mWidth,
+-			)
++			);
++		if (!$wgHtml5) {
++			unset($tmpa['placeholder']);
++		}
++		$htmlOut .= Xml::element( 'input',
++			$tmpa
+ 		);
+ 
+ 		if( $this->mPrefix != '' ){
+@@ -302,6 +307,7 @@ class InputBox {
+ 	 */
+ 	public function getCreateForm() {
+ 		global $wgScript;
++		global $wgHtml5;
+ 
+ 		if ( $this->mType == "comment" ) {
+ 			if ( !$this->mButtonLabel ) {
+@@ -387,15 +393,19 @@ class InputBox {
+ 				)
+ 			);
+ 		}
+-		$htmlOut .= Xml::openElement( 'input',
+-			array(
++		$tmpa = array(
+ 				'type' => $this->mHidden ? 'hidden' : 'text',
+ 				'name' => 'title',
+ 				'class' => 'createboxInput',
+ 				'value' => $this->mDefaultText,
+ 				'placeholder' => $this->mPlaceholderText,
+ 				'size' => $this->mWidth
+-			)
++			);
++		if (!$wgHtml5) {
++			unset($tmpa['placeholder']);
++		}
++		$htmlOut .= Xml::openElement( 'input',
++			$tmpa
+ 		);
+ 		$htmlOut .= $this->mBR;
+ 		$htmlOut .= Xml::openElement( 'input',
+@@ -418,6 +428,7 @@ class InputBox {
+ 	 */
+ 	public function getCommentForm() {
+ 		global $wgScript;
++		global $wgHtml5;
+ 
+ 		if ( !$this->mButtonLabel ) {
+ 				$this->mButtonLabel = wfMsgHtml( "postcomment" );
+@@ -460,15 +471,19 @@ class InputBox {
+ 				'value' => $this->mEditIntro,
+ 			)
+ 		);
+-		$htmlOut .= Xml::openElement( 'input',
+-			array(
++		$tmpa = array(
+ 				'type' => $this->mHidden ? 'hidden' : 'text',
+ 				'name' => 'preloadtitle',
+ 				'class' => 'commentboxInput',
+ 				'value' => $this->mDefaultText,
+ 				'placeholder' => $this->mPlaceholderText,
+ 				'size' => $this->mWidth
+-			)
++			);
++		if (!$wgHtml5) {
++			unset($tmpa['placeholder']);
++		}
++		$htmlOut .= Xml::openElement( 'input',
++			$tmpa
+ 		);
+ 		$htmlOut .= Xml::openElement( 'input',
+ 			array(

Copied: mediawiki-extensions/trunk/debian/patches/fix_pagecss.patch (from rev 378, mediawiki-extensions/experimental/debian/patches/fix_pagecss.patch)
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_pagecss.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_pagecss.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -0,0 +1,16 @@
+$Id$
+
+Fix PageCSS extension:
+* parser hooks are expected to return strings, not void
+  => fixes those UNIQ...QINU things showing
+
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/PageCSS/PageCSS.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/PageCSS/PageCSS.php
+@@ -38,6 +38,7 @@ class CssHook {
+ </style>
+ EOT
+ 		);
++		return "";
+ 	}
+ 
+ }

Modified: mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki-extensions/trunk/debian/patches/fix_rssreader.patch	2012-09-20 11:45:26 UTC (rev 379)
@@ -4,6 +4,7 @@
 * set $egCache to false by default, since we have no www-data writable
   cache directory, and I don't think we want it
 * add $egCacheDir which can be overridden by people who like to cache
+* fix installation path
 * fix rendering path to CSS
 * fix id="RSSMainBody" being used multiple times by making it into
   a CSS class that can be used for styling RSS output instead
@@ -28,7 +29,12 @@
  	'author' => 'Artem Kaznatcheev',
  	'description' => 'Adds <tt><rss></tt> tag',
  	'url' => 'http://www.mediawiki.org/wiki/Extension:RSS_Reader'
-@@ -37,7 +38,8 @@ $egRSSReaderPath  = $wgScriptPath."/exte
+@@ -33,11 +34,12 @@ $wgExtensionCredits['parserhook'][] = ar
+ 
+ ### Global Variables ###
+ //path to follow for server scripts
+-$egRSSReaderPath  = $wgScriptPath."/extensions/RSSReader";
++$egRSSReaderPath  = $wgScriptPath."/extensions/RSS_Reader";
  $egCacheTime      = 3600; //default cache time in seconds
  $egCacheTimeMin   = 1800; //minimum cache time in seconds
  $egCacheTimeMax   = 7200; //maximum cache time in seconds
@@ -55,7 +61,7 @@
 +    $wgOut->addLink(array(
 +	'rel' => 'stylesheet',
 +	'type' => 'text/css',
-+	'href' => "egRSSReaderPath/RSSReader.css?$wgRSSReaderExtVersion",
++	'href' => "$egRSSReaderPath/RSSReader.css?$wgRSSReaderExtVersion",
 +    ));
  
      if (!$width) {

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2012-08-29 22:22:56 UTC (rev 378)
+++ mediawiki-extensions/trunk/debian/patches/series	2012-09-20 11:45:26 UTC (rev 379)
@@ -1,10 +1,12 @@
 fix_472283.patch
 fix_collection.patch
+fix_createbox.patch
 fix_fckeditor.patch
+fix_footnote.patch
 fix_graphviz.patch
-fix_createbox.patch
-fix_footnote.patch
+fix_inputbox.patch
+fix_interwiki.patch
 fix_languageselector.patch
+fix_pagecss.patch
 fix_rssreader.patch
-fix_interwiki.patch
 news_dont_break_feeds.patch

More information about the Pkg-mediawiki-commits mailing list