Fix for #219713.

(Portage version: 2.1.4.4)

3 files changed, 28 insertions, 3 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 9a7830960172..832f41d4c622 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.106 2008/05/29 07:40:18 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.107 2008/06/01 14:43:08 wrobel Exp $
+
+  01 Jun 2008; wrobel@gentoo.org +files/access_restrict_1.12.0.patch,
+  mediawiki-1.12.0.ebuild:
+  Fix for #219713.
 
   29 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Philippe Trottier (tchiwam) from metadata.xml (as per #52828).
diff --git a/www-apps/mediawiki/files/access_restrict_1.12.0.patch b/www-apps/mediawiki/files/access_restrict_1.12.0.patch
new file mode 100644
index 000000000000..ccf68b636942
--- /dev/null
+++ b/www-apps/mediawiki/files/access_restrict_1.12.0.patch
@@ -0,0 +1,21 @@
+--- mediawiki-1.12.0/config/index.php.orig	2008-03-20 23:08:49.000000000 +0100
++++ mediawiki-1.12.0/config/index.php	2008-05-12 19:57:05.000000000 +0200
+@@ -1692,6 +1692,18 @@
+ # When you make changes to this configuration file, this will make
+ # sure that cached pages are cleared.
+ \$wgCacheEpoch = max( \$wgCacheEpoch, gmdate( 'YmdHis', @filemtime( __FILE__ ) ) );
++
++# Added by Gentoo Developer Philippe Trottier <tchiwam@gentoo.org>
++# This will make the access by default very restricted. This is not supported
++# by mediawiki themself. Here I make a very gross assumtion that everyone will install in english 1st.
++# Please read http://meta.wikimedia.org/wiki/Preventing_Access before filing bug reports
++#
++\$wgGroupPermissions['*']['createaccount'] = false;
++\$wgGroupPermissions['*']['edit'] = false;
++\$wgWhitelistRead = array( \"Main Page\", \"Special:Userlogin\", \"-\", \"MediaWiki:Monobook.css\" );
++# \$wgWhitelistRead = array( \"Hauptseite\", \"Spezial:Userlogin\", \"-\", \"MediaWiki:Monobook.css\" );
++# \$wgWhitelistRead = array( \"Pagina principale\", \"Speciale:Userlogin\", \"-\", \"MediaWiki:Monobook.css\" );
++\$wgGroupPermissions['*']['read'] = false;
+ "; ## End of setting the $localsettings string
+ 
+ 	// Keep things in Unix line endings internally;
diff --git a/www-apps/mediawiki/mediawiki-1.12.0.ebuild b/www-apps/mediawiki/mediawiki-1.12.0.ebuild
index 9389f76e5cd4..aacbde92d2ad 100644
--- a/www-apps/mediawiki/mediawiki-1.12.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.12.0.ebuild,v 1.1 2008/04/27 06:41:15 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.12.0.ebuild,v 1.2 2008/06/01 14:43:08 wrobel Exp $
 
 EAPI="1"
 inherit webapp depend.php versionator eutils
@@ -57,7 +57,7 @@ src_unpack() {
 #	epatch ${FILESDIR}/jobindexlength-mysql.patch
 
 	if use restrict ; then
-		epatch "${FILESDIR}/access_restrict.patch"
+		epatch "${FILESDIR}/access_restrict_${PV}.patch"
 	fi
 }