[evolvis-commits] r18327: • fix PHP 5.4 warnings and invalid XHTML in mediawiki and mediawiki-extensions↵ • bugfix grabbag: two from Nye Liu related to IPv4 blacklists↵ • bugfix grabbag: DB servers are now Suggests, add librsvg-bin to it too↵ • bugfix grabbag: add danish debconf translations

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Apr 11 11:16:56 CEST 2012


Author: mirabilos
Date: 2012-04-11 11:16:55 +0200 (Wed, 11 Apr 2012)
New Revision: 18327

Added:
   trunk/mediawiki/debian/patches/backport-block-prevent.patch
   trunk/mediawiki/debian/patches/fix-blacklist.patch
   trunk/mediawiki/debian/patches/php54.patch
   trunk/mediawiki/debian/po/da.po
Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/control
   trunk/mediawiki/debian/control.in
   trunk/mediawiki/debian/patches/series
Log:
• fix PHP 5.4 warnings and invalid XHTML in mediawiki and mediawiki-extensions
• bugfix grabbag: two from Nye Liu related to IPv4 blacklists
• bugfix grabbag: DB servers are now Suggests, add librsvg-bin to it too
• bugfix grabbag: add danish debconf translations

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:16:54 UTC (rev 18326)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:16:55 UTC (rev 18327)
@@ -1,3 +1,15 @@
+mediawiki (1:1.15.5-8) unstable; urgency=low
+
+  * Fix reversing IPv4 address for SORBS blacklist; patch from
+    Nye Liu <nyet at nyet.org> (Closes: #658672)
+  * Backport a method called by CVE-2011-1580.patch (Closes: #658682)
+  * Fix warnings issued by PHP 5.4 (Closes: #661682)
+  * Suggest librsvg-bin (Closes: #644731)
+  * Demote database server to Suggests (Closes: #617561)
+  * Add dansk translation (Closes: #627848)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 15 Mar 2012 12:52:09 +0100
+
 mediawiki (1:1.15.5-7) unstable; urgency=high
 
   * debian/patches/CVE-2011-4360.patch: remove – the information

Modified: trunk/mediawiki/debian/control
===================================================================
--- trunk/mediawiki/debian/control	2012-04-11 09:16:54 UTC (rev 18326)
+++ trunk/mediawiki/debian/control	2012-04-11 09:16:55 UTC (rev 18327)
@@ -13,8 +13,13 @@
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends} 
-Recommends: mysql-server | postgresql-contrib, php5-cli
-Suggests: imagemagick | php5-gd, mediawiki-math, memcached, clamav
+Recommends: php5-cli
+Suggests: mediawiki-math,
+ imagemagick | php5-gd,
+ memcached,
+ clamav,
+ librsvg-bin,
+ postgresql-contrib | mysql-server
 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: trunk/mediawiki/debian/control.in
===================================================================
--- trunk/mediawiki/debian/control.in	2012-04-11 09:16:54 UTC (rev 18326)
+++ trunk/mediawiki/debian/control.in	2012-04-11 09:16:55 UTC (rev 18327)
@@ -13,8 +13,13 @@
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, ${misc:Depends} 
-Recommends: mysql-server | postgresql-contrib, php5-cli
-Suggests: imagemagick | php5-gd, mediawiki-math, memcached, clamav
+Recommends: php5-cli
+Suggests: mediawiki-math,
+ imagemagick | php5-gd,
+ memcached,
+ clamav,
+ librsvg-bin,
+ postgresql-contrib | mysql-server
 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

Added: trunk/mediawiki/debian/patches/backport-block-prevent.patch
===================================================================
--- trunk/mediawiki/debian/patches/backport-block-prevent.patch	                        (rev 0)
+++ trunk/mediawiki/debian/patches/backport-block-prevent.patch	2012-04-11 09:16:55 UTC (rev 18327)
@@ -0,0 +1,55 @@
+Description: backport method needed by CVE-2011-1580.patch
+Origin: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84358
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658682
+Author: Thorsten Glaser <t.glaser at tarent.de>
+
+Index: mediawiki/includes/Block.php
+===================================================================
+--- mediawiki.orig/includes/Block.php	2009-02-21 11:15:10.000000000 +0100
++++ mediawiki/includes/Block.php	2012-03-15 11:52:35.000000000 +0100
+@@ -16,7 +16,7 @@
+ class Block {
+ 	/* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry,
+ 				$mRangeStart, $mRangeEnd, $mAnonOnly, $mEnableAutoblock, $mHideName,
+-				$mBlockEmail, $mByName, $mAngryAutoblock, $mAllowUsertalk;
++				$mBlockEmail, $mByName, $mAngryAutoblock, $mAllowUsertalk, $mCreateAccount;
+ 	/* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate, $mFromMaster;
+ 
+ 	const EB_KEEP_EXPIRED = 1;
+@@ -712,6 +712,36 @@
+ 	}
+ 
+ 	/**
++	 * Get/set whether the Block prevents a given action
++	 * @param $action String
++	 * @param $x Bool
++	 * @return Bool
++	 */
++	public function prevents( $action, $x = null ){
++		switch( $action ){
++			case 'edit':
++				# TODO Not actually quite this simple (bug 13611 etc)
++				return true;
++
++			case 'createaccount':
++				return wfSetVar( $this->mCreateAccount, $x );
++
++			case 'sendemail':
++				return wfSetVar( $this->mBlockEmail, $x );
++
++			case 'editusertalk':
++				$y = $this->mAllowUsertalk;
++				if( $x !== null){
++					$this->mAllowUsertalk = !$x;
++				}
++				return !$y;
++
++			default:
++				return null;
++		}
++	}
++
++	/**
+ 	 * Get the block name, but with autoblocked IPs hidden as per standard privacy policy
+ 	 * @return String
+ 	 */

Added: trunk/mediawiki/debian/patches/fix-blacklist.patch
===================================================================
--- trunk/mediawiki/debian/patches/fix-blacklist.patch	                        (rev 0)
+++ trunk/mediawiki/debian/patches/fix-blacklist.patch	2012-04-11 09:16:55 UTC (rev 18327)
@@ -0,0 +1,19 @@
+Description: fix reversing IPv4 address for SORBS blacklist
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658672
+Author: Nye Liu <nyet at nyet.org>
+Reviewed-by: Thorsten Glaser <t.glaser at tarent.de>
+
+Index: mediawiki/includes/User.php
+===================================================================
+--- mediawiki.orig/includes/User.php	2010-04-07 02:13:46.000000000 +0200
++++ mediawiki/includes/User.php	2012-03-15 11:08:01.000000000 +0100
+@@ -1140,7 +1140,8 @@
+ 		// FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
+ 		if( IP::isIPv4($ip) ) {
+ 			# Make hostname
+-			$host = "$ip.$base";
++			$host = join(".", array_reverse(explode('.',
++			    $ip))) . "." . $base;
+ 
+ 			# Send query
+ 			$ipList = gethostbynamel( $host );

Added: trunk/mediawiki/debian/patches/php54.patch
===================================================================
--- trunk/mediawiki/debian/patches/php54.patch	                        (rev 0)
+++ trunk/mediawiki/debian/patches/php54.patch	2012-04-11 09:16:55 UTC (rev 18327)
@@ -0,0 +1,61 @@
+Description: fix warnings issued by PHP 5.4
+Author: Thorsten Glaser <t.glaser at tarent.de>
+
+Index: mediawiki/includes/Exif.php
+===================================================================
+--- mediawiki.orig/includes/Exif.php	2009-01-30 20:36:11.000000000 +0100
++++ mediawiki/includes/Exif.php	2012-03-15 12:10:51.000000000 +0100
+@@ -293,9 +293,16 @@
+ 		$this->makeFlatExifTags();
+ 
+ 		$this->debugFile( $this->basename, __FUNCTION__, true );
+-		wfSuppressWarnings();
+-		$data = exif_read_data( $this->file );
+-		wfRestoreWarnings();
++		if (in_array((filesize($this->file) >= 12 ?
++		    exif_imagetype($this->file) : false), array(
++			IMAGETYPE_JPEG,
++			IMAGETYPE_TIFF_II,
++			IMAGETYPE_TIFF_MM,
++		    ))) {
++			$data = exif_read_data($this->file);
++		} else {
++			$data = false;
++		}
+ 		/**
+ 		 * exif_read_data() will return false on invalid input, such as
+ 		 * when somebody uploads a file called something.jpeg
+Index: mediawiki/includes/Setup.php
+===================================================================
+--- mediawiki.orig/includes/Setup.php	2009-01-27 20:58:26.000000000 +0100
++++ mediawiki/includes/Setup.php	2012-03-15 12:01:53.000000000 +0100
+@@ -305,7 +305,15 @@
+ # of the extension file. This allows the extension to perform
+ # any necessary initialisation in the fully initialised environment
+ foreach ( $wgExtensionFunctions as $func ) {
+-	$profName = $fname.'-extensions-'.strval( $func );
++	if (is_array($func)) {
++		if (is_object($func)) {
++			$profName = $fname . '-extensions-' . get_class($func[0]) . '::' . $func[1];
++		} else {
++			$profName = $fname . '-extensions-' . implode('::', $func);
++		}
++	} else {
++		$profName = $fname . '-extensions-' . strval($func);
++	}
+ 	wfProfileIn( $profName );
+ 	call_user_func( $func );
+ 	wfProfileOut( $profName );
+Index: mediawiki/includes/parser/Parser.php
+===================================================================
+--- mediawiki.orig/includes/parser/Parser.php	2009-05-15 06:00:34.000000000 +0200
++++ mediawiki/includes/parser/Parser.php	2012-03-15 12:13:57.000000000 +0100
+@@ -3240,7 +3240,7 @@
+ 							throw new MWException( "Tag hook for $name is not callable\n" );
+ 						}
+ 						$output = call_user_func_array( $this->mTagHooks[$name],
+-							array( $content, $attributes, $this ) );
++							array( $content, $attributes, &$this ) );
+ 					} else {
+ 						$output = '<span class="error">Invalid tag extension name: ' .
+ 							htmlspecialchars( $name ) . '</span>';

Modified: trunk/mediawiki/debian/patches/series
===================================================================
--- trunk/mediawiki/debian/patches/series	2012-04-11 09:16:54 UTC (rev 18326)
+++ trunk/mediawiki/debian/patches/series	2012-04-11 09:16:55 UTC (rev 18327)
@@ -16,3 +16,6 @@
 CVE-2011-4361.patch
 khtml_not_ff9.patch
 CVE-2012-0046.patch
+backport-block-prevent.patch
+fix-blacklist.patch
+php54.patch

Added: trunk/mediawiki/debian/po/da.po
===================================================================
--- trunk/mediawiki/debian/po/da.po	                        (rev 0)
+++ trunk/mediawiki/debian/po/da.po	2012-04-11 09:16:55 UTC (rev 18327)
@@ -0,0 +1,32 @@
+# Danish translation mediawiki.
+# Copyright (C) mediawiki & nedenstående oversættere.
+# This file is distributed under the same license as the mediawiki package.
+# Joe Hansen (joedalton2 at yahoo.dk), 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mediawiki\n"
+"Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-22 02:37+0200\n"
+"PO-Revision-Date: 2011-05-24 18:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:2001
+msgid "Web server(s) to configure automatically:"
+msgstr "Internetservere at konfigurere automatisk:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:2001
+msgid ""
+"Please select the web server(s) that should be configured automatically for "
+"MediaWiki."
+msgstr ""
+"Vælg venligst de internetservere som bør konfigureres automatisk for "
+"MediaWiki."



More information about the evolvis-commits mailing list