Author: glen Date: Sun Oct 15 22:46:03 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 1.8.2
---- Files affected:
SOURCES:
mediawiki-confdir2.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/mediawiki-confdir2.patch
diff -u SOURCES/mediawiki-confdir2.patch:1.5
SOURCES/mediawiki-confdir2.patch:1.6
--- SOURCES/mediawiki-confdir2.patch:1.5 Sun Apr 30 15:17:17 2006
+++ SOURCES/mediawiki-confdir2.patch Mon Oct 16 00:45:57 2006
@@ -1,115 +1,60 @@
---- mediawiki-1.5.3/img_auth.php 2005-04-16 07:33:33.000000000 +0300
-+++ mediawiki-1.5.3.confdir2/img_auth.php 2005-12-11 00:59:26.000000000
+0200
-@@ -11,7 +11,7 @@
- define( 'MEDIAWIKI', true );
+--- mediawiki-1.8.2/config/index.php~ 2006-10-16 00:07:01.635048856 +0300
++++ mediawiki-1.8.2/config/index.php 2006-10-16 00:12:29.902424333 +0300
+@@ -184,7 +184,7 @@
- require_once( 'includes/Defines.php' );
--require_once( './LocalSettings.php' );
-+require_once( '/etc/webapps/mediawiki/LocalSettings.php' );
- require_once( 'includes/Setup.php' );
- require_once( 'includes/StreamFile.php' );
+ /* Check for existing configurations and bug out! */
+
+-if( file_exists( "../LocalSettings.php" ) ) {
++if( file_exists( "/etc/webapps/mediawiki/LocalSettings.php" ) ) {
+ dieout( "<p><strong>Setup has completed, <a href='../index.php'>your
wiki</a> is configured.</strong></p>
+
+ <p>Please delete the /config directory for extra
security.</p></div></div></div></div>" );
+@@ -201,7 +201,7 @@
+
+ <p>In order to configure the wiki you have to make the <tt>config</tt>
subdirectory
+ writable by the web server. Once configuration is done you'll move the
created
+- <tt>LocalSettings.php</tt> to the parent directory, and for added
safety you can
++ <tt>LocalSettings.php</tt> to the /etc/webapps/mediawiki directory, and
for added safety you can
+ then remove the <tt>config</tt> subdirectory entirely.</p>
---- mediawiki-1.6.3/index.php~ 2006-04-27 20:41:16.661255452 +0300
-+++ mediawiki-1.6.3/index.php 2006-04-27 20:42:43.373188901 +0300
-@@ -32,7 +32,7 @@
+ <p>To make the directory writable on a Unix/Linux system:</p>
+@@ -1229,7 +1229,7 @@
+ it and uploading it again will hopefully change the ownership to a user ID
specific to you.</p>
+ EOT;
+ } else {
+- echo "<p><span
style='font-weight:bold;color:green;font-size:110%'>Installation
successful!</span> Move the <tt>config/LocalSettings.php</tt> file into the
parent directory, then follow
++ echo "<p><span
style='font-weight:bold;color:green;font-size:110%'>Installation
successful!</span> Move the <tt>config/LocalSettings.php</tt> file into
/etc/webapps/mediawiki directory, then follow
+ <strong><a href='../index.php'>this link</a></strong>
to your wiki.</p>\n";
+ }
+ }
+--- mediawiki-1.8.2/includes/WebStart.php~ 2006-10-14 03:06:33.000000000
+0300
++++ mediawiki-1.8.2/includes/WebStart.php 2006-10-16 00:49:09.671858850
+0300
+@@ -65,7 +65,7 @@
# LocalSettings.php is the per site customization file. If it does not exit
# the wiki installer need to be launched or the generated file moved from
# ./config/ to ./
--if( !file_exists( 'LocalSettings.php' ) ) {
+-if( !file_exists( './LocalSettings.php' ) ) {
+if( !file_exists( '/etc/webapps/mediawiki/LocalSettings.php' ) ) {
$IP = '.';
- require_once( 'includes/DefaultSettings.php' ); # used for printing the
version
- ?>
-@@ -61,7 +61,7 @@
- <div class='error'>
- <?php
- if ( file_exists( 'config/LocalSettings.php' ) ) {
-- echo( 'To complete the installation, move
<tt>config/LocalSettings.php</tt> to the parent directory.' );
-+ echo( 'To complete the installation, move
<tt>config/LocalSettings.php</tt> to the webapps directory
(/etc/webapps/mediawiki).' );
- } else {
- echo( 'Please <a href="config/index.php"
title="setup">setup the wiki</a> first.' );
- }
-@@ -75,7 +75,7 @@
+ require_once( './includes/DefaultSettings.php' ); # used for printing
the version
+ require_once( './includes/templates/NoLocalSettings.php' );
+@@ -73,7 +73,7 @@
}
# Include this site setttings
-require_once( './LocalSettings.php' );
+require_once( '/etc/webapps/mediawiki/LocalSettings.php' );
- # Prepare MediaWiki
- require_once( 'includes/Setup.php' );
-
---- mediawiki-1.5.3/profileinfo.php 2005-07-06 08:18:09.000000000 +0300
-+++ mediawiki-1.5.3.confdir2/profileinfo.php 2005-12-11 00:59:26.000000000
+0200
-@@ -50,7 +50,7 @@
- define("MEDIAWIKI", 1);
-
- require_once("./includes/Defines.php");
--require_once("./LocalSettings.php");
-+require_once("/etc/webapps/mediawiki/LocalSettings.php");
- require_once("./AdminSettings.php");
-
- if (!$wgEnableProfileInfo)
---- mediawiki-1.5.3/redirect.php 2005-06-28 17:28:21.000000000 +0300
-+++ mediawiki-1.5.3.confdir2/redirect.php 2005-12-11 00:59:26.000000000
+0200
-@@ -5,7 +5,7 @@
- define( 'MEDIAWIKI', true );
+ wfProfileOut( 'WebStart.php-conf' );
- require_once( './includes/Defines.php' );
--require_once( './LocalSettings.php' );
-+require_once( '/etc/webapps/mediawiki/LocalSettings.php' );
- global $wgArticlePath;
+ if ( !defined( 'MW_NO_SETUP' ) ) {
+--- mediawiki-1.8.2/maintenance/archives/upgradeWatchlist.php~ 2006-10-14
03:05:57.000000000 +0300
++++ mediawiki-1.8.2/maintenance/archives/upgradeWatchlist.php 2006-10-16
00:50:36.273804990 +0300
+@@ -15,7 +15,7 @@
+ # Convert watchlists to new format
+
+ global $IP;
+-require_once( "../LocalSettings.php" );
++require_once( "/etc/webapps/mediawiki/LocalSettings.php" );
+ require_once( "$IP/Setup.php" );
- require_once( 'includes/WebRequest.php' );
---- mediawiki-1.5.3/thumb.php 2005-08-17 23:08:57.000000000 +0300
-+++ mediawiki-1.5.3.confdir2/thumb.php 2005-12-11 00:59:26.000000000 +0200
-@@ -10,7 +10,7 @@
- $wgNoOutputBuffer = true;
-
- require_once( './includes/Defines.php' );
--require_once( './LocalSettings.php' );
-+require_once( '/etc/webapps/mediawiki/LocalSettings.php' );
- require_once( 'GlobalFunctions.php' );
-
- $wgTrivialMimeDetection = true; //don't use fancy mime detection, just check
the file extension for jpg/gif/png.
---- mediawiki-1.5.3/trackback.php 2005-07-23 09:30:23.000000000 +0300
-+++ mediawiki-1.5.3.confdir2/trackback.php 2005-12-11 00:59:26.000000000
+0200
-@@ -12,7 +12,7 @@
- if (!file_exists('LocalSettings.php'))
- exit;
-
--require_once('./LocalSettings.php');
-+require_once('/etc/webapps/mediawiki/LocalSettings.php');
- require_once('includes/Setup.php');
-
- require_once('Title.php');
---- mediawiki-1.6.3/config/index.php 2006-04-27 20:40:31.870257219 +0300
-+++ mediawiki-1.6.3/config/index.php 2006-04-30 16:07:46.418174611 +0300
-@@ -140,7 +140,7 @@
-
- /* Check for existing configurations and bug out! */
-
--if( file_exists( "../LocalSettings.php" ) ) {
-+if( file_exists( "/etc/webapps/mediawiki/LocalSettings.php" ) ) {
- dieout( " <p><strong>Setup has completed, <a
href='../index.php'>your wiki</a> is configured.</strong></p>
-
- <p>Please delete the /config directory for extra
security.</p></div></div></div></div>" );
-@@ -1081,7 +1081,7 @@
- it and uploading it again will hopefully change the ownership to a user ID
specific to you.</p>
- EOT;
- } else {
-- echo "<p>Installation successful! Move the
config/LocalSettings.php file into the parent directory, then follow
-+ echo "<p>Installation successful! Move the
config/LocalSettings.php file into webapps directory (/etc/webapps/mediawiki),
then follow
- <a href='../index.php'>this link</a> to your
wiki.</p>\n";
- }
- }
-@@ -1179,6 +1179,10 @@
- # and their default values, but don't forget to make changes in _this_
- # file, not there.
-
-+if (!defined('MW_INSTALL_PATH')) {
-+ define('MW_INSTALL_PATH', '/usr/share/mediawiki');
-+}
-+
- # If you customize your file layout, set \$IP to the directory that contains
- # the other MediaWiki files. It will be used as a base to locate files.
- if( defined( 'MW_INSTALL_PATH' ) ) {
+ $wgTitle = Title::newFromText( "Rebuild links script" );
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mediawiki-confdir2.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
