bug 150143 restrict USE flag

Package-Manager: portage-2.1.1-r2

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 54041a71c093294eb9f53779ff54a4a4176f8f95..2f9465958b7d7a92159bf8a79e72f3e1d56af6c7 100644 (file)
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.69 2006/12/11 10:51:52 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.70 2006/12/11 12:16:27 tchiwam Exp $
 
 
+  11 Dec 2006; Philippe Trottier <tchiwam@gentoo.org> mediawiki-1.8.2.ebuild:
+  start with more restricted access possible  bug#150143.
+
   11 Dec 2006; Philippe Trottier <tchiwam@gentoo.org> mediawiki-1.8.2.ebuild:
   job key lenght bug#152089.
 

diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index b489642aaa0fefbedc4313b0ebdef27b50e3d780..26127ffef84c9b3ee70de365d0271882ae613df0 100644 (file)
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,3 +1,7 @@
+AUX access_restrict.patch 1240 RMD160 29e27a84951daf447da1ecba3e929e94d02e0fb1 SHA1 1ec89557c26b682b2550ff95201a233eca471bec SHA256 22ca5d7e4cd6f3b03f2eb01a5e2ba0a1931998ff56ba3f1ebaa0a60cec436829
+MD5 b7ea14f1e781b80c0915604ac97140ac files/access_restrict.patch 1240
+RMD160 29e27a84951daf447da1ecba3e929e94d02e0fb1 files/access_restrict.patch 1240
+SHA256 22ca5d7e4cd6f3b03f2eb01a5e2ba0a1931998ff56ba3f1ebaa0a60cec436829 files/access_restrict.patch 1240
 AUX jobindexlength-mysql.patch 392 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 SHA1 1442974131d16077edccc4f9539a37838b737e14 SHA256 19cf34e4864fd7352b917905480bf9ca5a984ec4d8914990902c907381b0b79b
 MD5 90e42e951dd953f36a7ddaf3f7e2a47f files/jobindexlength-mysql.patch 392
 RMD160 a6031a663b1a4af2d15d1cb2ba7b659fe813a175 files/jobindexlength-mysql.patch 392
@@ -43,14 +47,14 @@ EBUILD mediawiki-1.7.1.ebuild 3287 RMD160 dc4eefd7230173b4c090f0c776ae7cf86b8f6e
 MD5 2ebdbacaadaf1c268fcfd9f81ec5a517 mediawiki-1.7.1.ebuild 3287
 RMD160 dc4eefd7230173b4c090f0c776ae7cf86b8f6e68 mediawiki-1.7.1.ebuild 3287
 SHA256 c9509e6cf7106b980e3a42497ceecafe853d061f07d0177995fd57c36cf28f1a mediawiki-1.7.1.ebuild 3287
-EBUILD mediawiki-1.8.2.ebuild 3469 RMD160 e43324b07d57b0f50c31213befb9526247cbc53a SHA1 7d1906954aacb2a04c5e0905ee6ba6db051143bb SHA256 644d74c3d22ed4abe0b456a3bc73ed0ad7d0b93f91ec458b32dc878bf0731f46
-MD5 9acb328b0c56830e046efdc88bcde544 mediawiki-1.8.2.ebuild 3469
-RMD160 e43324b07d57b0f50c31213befb9526247cbc53a mediawiki-1.8.2.ebuild 3469
-SHA256 644d74c3d22ed4abe0b456a3bc73ed0ad7d0b93f91ec458b32dc878bf0731f46 mediawiki-1.8.2.ebuild 3469
-MISC ChangeLog 11758 RMD160 2e8464e0c96e9590eb6fa783c80c89cdeb6f6d2d SHA1 75fbff401e5df1b05f46123a3444856f87de5128 SHA256 2bb5481453471b1759cd1edf6c662889c6a34ed131d5e65310c83456edb25a9f
-MD5 fb3ac166d1e1479797740bc25a086ef1 ChangeLog 11758
-RMD160 2e8464e0c96e9590eb6fa783c80c89cdeb6f6d2d ChangeLog 11758
-SHA256 2bb5481453471b1759cd1edf6c662889c6a34ed131d5e65310c83456edb25a9f ChangeLog 11758
+EBUILD mediawiki-1.8.2.ebuild 3540 RMD160 31a266113cb5b37847ab8d81e8f6440b74194abb SHA1 b70776145ed90dd2f407e0f50ff90751df53755c SHA256 57f616cc15e202e768c414563a8f315dd929878dae27b0952b14823284ddc9ee
+MD5 7cd0a7712bb5e6d00f4c40ee9cdd23cc mediawiki-1.8.2.ebuild 3540
+RMD160 31a266113cb5b37847ab8d81e8f6440b74194abb mediawiki-1.8.2.ebuild 3540
+SHA256 57f616cc15e202e768c414563a8f315dd929878dae27b0952b14823284ddc9ee mediawiki-1.8.2.ebuild 3540
+MISC ChangeLog 11895 RMD160 d65d5dc576aff4efe5986a9041ba3ed16e60c3da SHA1 75a85ad194282328292c9da638126cd21b0de0b4 SHA256 4049609db32d005a779ddb55bd3c0fd3d009af75df8ca1c5a6ead3c104fb4ca8
+MD5 7bde9187029d5c776381809af7425a1c ChangeLog 11895
+RMD160 d65d5dc576aff4efe5986a9041ba3ed16e60c3da ChangeLog 11895
+SHA256 4049609db32d005a779ddb55bd3c0fd3d009af75df8ca1c5a6ead3c104fb4ca8 ChangeLog 11895
 MISC metadata.xml 366 RMD160 8be6da5afadbc6c6e57d589097d8f702d951bde3 SHA1 4c3b825388a712b4452ba16912b38b9aba76b78e SHA256 dddc4891c17811953d2cae412c4b1a713dc00b3629cd38a5b530c15a0acebcc2
 MD5 6e1b02a80fc901d2eaadf52a50e0b905 metadata.xml 366
 RMD160 8be6da5afadbc6c6e57d589097d8f702d951bde3 metadata.xml 366

diff --git a/www-apps/mediawiki/files/access_restrict.patch b/www-apps/mediawiki/files/access_restrict.patch
new file mode 100644 (file)
index 0000000..c4db4ee
--- /dev/null
+++ b/www-apps/mediawiki/files/access_restrict.patch
@@ -0,0 +1,21 @@
+--- mediawiki-1.8.2/config/index.php.orig      2006-12-11 13:44:52.000000000 +0200
++++ mediawiki-1.8.2/config/index.php           2006-12-11 13:45:22.000000000 +0200
+@@ -1451,6 +1451,18 @@
+ # sure that cached pages are cleared.
+ \$configdate = gmdate( 'YmdHis', @filemtime( __FILE__ ) );
+ \$wgCacheEpoch = max( \$wgCacheEpoch, \$configdate );
++
++# 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.8.2.ebuild b/www-apps/mediawiki/mediawiki-1.8.2.ebuild
index 89fa91f64f70bcf0893461565c22faf1aa406035..c4af329f733061abe433b017fe3a99950b727b89 100644 (file)
--- a/www-apps/mediawiki/mediawiki-1.8.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.2.ebuild,v 1.4 2006/12/11 10:51:52 tchiwam Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.8.2.ebuild,v 1.5 2006/12/11 12:16:27 tchiwam Exp $
 
 inherit webapp depend.php
 
@@ -48,6 +48,9 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        epatch ${FILESDIR}/jobindexlength-mysql.patch
+       if use restrict ; then
+               epatch ${FILESDIR}/access_restrict.patch
+       fi
 }
 
 src_compile() {