[Pkg-mediawiki-commits] r463 - in mediawiki-extensions/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2013-06-11 11:10:08 +0000 (Tue, 11 Jun 2013)
New Revision: 463

Added:
   mediawiki-extensions/trunk/debian/patches/fix_711887.patch
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/control
   mediawiki-extensions/trunk/debian/patches/series
Log:
Apply patch to fix automatic auth for LDAP/Kerberos (Closes: #711887)


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2013-06-11 11:05:06 UTC (rev 462)
+++ mediawiki-extensions/trunk/debian/changelog	2013-06-11 11:10:08 UTC (rev 463)
@@ -1,8 +1,9 @@
-mediawiki-extensions (3.4) UNRELEASED; urgency=low
+mediawiki-extensions (3.4) unstable; urgency=low
 
   * Add TreeAndMenu extension (Closes: #645067)
+  * Apply patch to fix automatic auth for LDAP/Kerberos (Closes: #711887)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 11 Jun 2013 13:03:56 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 11 Jun 2013 13:08:38 +0200
 
 mediawiki-extensions (3.3) unstable; urgency=low
 

Modified: mediawiki-extensions/trunk/debian/control
===================================================================
--- mediawiki-extensions/trunk/debian/control	2013-06-11 11:05:06 UTC (rev 462)
+++ mediawiki-extensions/trunk/debian/control	2013-06-11 11:10:08 UTC (rev 463)
@@ -37,6 +37,7 @@
   * Polyglot             -- provide redirects based on user language
   * RSS_Reader           -- embed RSS feed content into a page
   * SpecialRenameuser    -- special page to rename users
+  * TreeAndMenu          -- dynamic dropdown and folder tree menus
  .
  These extensions are set together for the Debian mediawiki
  package, but they may also be used separately.

Added: mediawiki-extensions/trunk/debian/patches/fix_711887.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_711887.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_711887.patch	2013-06-11 11:10:08 UTC (rev 463)
@@ -0,0 +1,21 @@
+commit 1946855fe73d36f68acc323fc2d51e12d4f36f07
+Author: Ryan Lane <rlane at wikimedia.org>
+Date:   Sun Apr 22 12:18:40 2012 -0700
+
+    Fix for AuthAuthUsername
+    
+    Patch thanks to Guillaume Beaudoin.
+    
+    Change-Id: Icdab7023a58455a1289343a4963ce48db005f28a
+
+--- a/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
++++ b/dist/mediawiki-extensions-ldapauth/usr/share/mediawiki-extensions/ldapauth/LdapAuthentication.php
+@@ -1894,7 +1894,7 @@ function AutoAuthSetup() {
+ 
+ 	$wgAuth->printDebug( "Entering AutoAuthSetup.", NONSENSITIVE );
+ 
+-	if ( !$wgAuth->getConf( 'AutoAuthUsername' ) ) {
++	if ( $wgAuth->getConf( 'AutoAuthUsername' ) !== "" ) {
+ 		$wgAuth->printDebug( "wgLDAPAutoAuthUsername is not null, adding hooks.", NONSENSITIVE );
+ 		$wgHooks['UserLoadAfterLoadFromSession'][] = 'LdapAutoAuthentication::Authenticate';
+ 

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2013-06-11 11:05:06 UTC (rev 462)
+++ mediawiki-extensions/trunk/debian/patches/series	2013-06-11 11:10:08 UTC (rev 463)
@@ -11,3 +11,4 @@
 fix_rssreader.patch
 news_dont_break_feeds.patch
 fix_694114.patch
+fix_711887.patch