rpms/mediawiki/F-10 mediawiki-1.14.0-commoncode.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 mediawiki.spec, 1.28, 1.29 sources, 1.20, 1.21 mediawiki-1.13.0-commoncode.patch, 1.1, NONE
Axel Thimm
athimm at fedoraproject.org
Sat Feb 28 18:33:55 UTC 2009
- Previous message (by thread): rpms/posterazor/F-9 posterazor.desktop, 1.1, 1.2 posterazor.spec, 1.1, 1.2
- Next message (by thread): rpms/mediawiki/F-9 mediawiki-1.14.0-commoncode.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 mediawiki.spec, 1.26, 1.27 sources, 1.18, 1.19 mediawiki-1.13.0-commoncode.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: athimm
Update of /cvs/extras/rpms/mediawiki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9210/F-10
Modified Files:
.cvsignore mediawiki.spec sources
Added Files:
mediawiki-1.14.0-commoncode.patch
Removed Files:
mediawiki-1.13.0-commoncode.patch
Log Message:
Update to 1.14.0, fixing sec. bug #485728, but also bug #485447.
mediawiki-1.14.0-commoncode.patch:
--- NEW FILE mediawiki-1.14.0-commoncode.patch ---
--- mediawiki-1.14.0/includes/templates/NoLocalSettings.php.commoncode 2009-02-20 14:58:49.000000000 +0100
+++ mediawiki-1.14.0/includes/templates/NoLocalSettings.php 2009-02-28 19:09:38.000000000 +0100
@@ -61,7 +61,7 @@
<h1>MediaWiki <?php echo $wgVersion ?></h1>
<div class='error'>
<?php
- if ( file_exists( 'config/LocalSettings.php' ) ) {
+ if ( file_exists( $DIR . '/config/LocalSettings.php' ) ) {
echo( 'To complete the installation, move <tt>config/LocalSettings.php</tt> to the parent directory.' );
} else {
echo( "Please <a href=\"${path}config/index.{$ext}\" title='setup'> set up the wiki</a> first." );
--- mediawiki-1.14.0/includes/WebStart.php.commoncode 2008-11-07 17:38:01.000000000 +0100
+++ mediawiki-1.14.0/includes/WebStart.php 2009-02-28 19:10:12.000000000 +0100
@@ -103,14 +103,14 @@
# 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( "$IP/LocalSettings.php" ) ) {
+ if( !file_exists( "$DIR/LocalSettings.php" ) ) {
require_once( "$IP/includes/DefaultSettings.php" ); # used for printing the version
require_once( "$IP/includes/templates/NoLocalSettings.php" );
die();
}
# Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
- require_once( "$IP/LocalSettings.php" );
+ require_once( "$DIR/LocalSettings.php" );
}
wfProfileOut( 'WebStart.php-conf' );
--- mediawiki-1.14.0/maintenance/archives/upgradeWatchlist.php.commoncode 2008-07-11 00:00:04.000000000 +0200
+++ mediawiki-1.14.0/maintenance/archives/upgradeWatchlist.php 2009-02-28 19:09:38.000000000 +0100
@@ -15,7 +15,7 @@
# Convert watchlists to new format
global $IP;
-require_once( "../LocalSettings.php" );
+require_once( "$DIR/LocalSettings.php" );
require_once( "$IP/Setup.php" );
$wgTitle = Title::newFromText( "Rebuild links script" );
--- mediawiki-1.14.0/maintenance/update.php.commoncode 2008-07-19 14:15:07.000000000 +0200
+++ mediawiki-1.14.0/maintenance/update.php 2009-02-28 19:09:38.000000000 +0100
@@ -10,6 +10,9 @@
* @ingroup Maintenance
*/
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
/** */
$wgUseMasterForMaintenance = true;
$options = array( 'quick', 'nopurge' );
--- mediawiki-1.14.0/maintenance/commandLine.inc.commoncode 2008-06-16 22:21:26.000000000 +0200
+++ mediawiki-1.14.0/maintenance/commandLine.inc 2009-02-28 19:09:38.000000000 +0100
@@ -182,7 +182,7 @@
if ( isset( $options['conf'] ) ) {
$settingsFile = $options['conf'];
} else {
- $settingsFile = "$IP/LocalSettings.php";
+ $settingsFile = "$DIR/LocalSettings.php";
}
if ( isset( $options['wiki'] ) ) {
$bits = explode( '-', $options['wiki'] );
@@ -208,7 +208,7 @@
$adminSettings = isset( $options['aconf'] )
? $options['aconf']
- : "{$IP}/AdminSettings.php";
+ : "{$DIR}/AdminSettings.php";
if( is_readable( $adminSettings ) )
require_once( $adminSettings );
--- mediawiki-1.14.0/config/index.php.commoncode 2009-02-20 15:17:47.000000000 +0100
+++ mediawiki-1.14.0/config/index.php 2009-02-28 19:09:38.000000000 +0100
@@ -19,6 +19,8 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# http://www.gnu.org/copyleft/gpl.html
+$DIR=dirname( getcwd() );
+chdir('/usr/share/mediawiki/config');
error_reporting( E_ALL );
header( "Content-type: text/html; charset=utf-8" );
@ini_set( "display_errors", true );
@@ -27,7 +29,7 @@
$wgRequestTime = microtime( true );
# Attempt to set up the include path, to fix problems with relative includes
-$IP = dirname( dirname( __FILE__ ) );
+$IP = '/usr/share/mediawiki';
define( 'MW_INSTALL_PATH', $IP );
# Define an entry point and include some files
@@ -212,18 +214,18 @@
/* Check for existing configurations and bug out! */
-if( file_exists( "../LocalSettings.php" ) ) {
+if( file_exists( "$DIR/LocalSettings.php" ) ) {
$script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
dieout( "<p><strong>Setup has completed, <a href='../$script'>your wiki</a> is configured.</strong></p>
<p>Please delete the /config directory for extra security.</p>" );
}
-if( file_exists( "./LocalSettings.php" ) ) {
+if( file_exists( "$DIR/LocalSettings.php" ) ) {
writeSuccessMessage();
dieout( '' );
}
-if( !is_writable( "." ) ) {
+if( !is_writable( $DIR . "/config" ) ) {
dieout( "<h2>Can't write config file, aborting</h2>
<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
@@ -1133,7 +1135,7 @@
$localSettings = "<" . "?php$endl$local";
// Fix up a common line-ending problem (due to CVS on Windows)
$localSettings = str_replace( "\r\n", "\n", $localSettings );
- $f = fopen( "LocalSettings.php", 'xt' );
+ $f = fopen( $DIR . "/config/LocalSettings.php", 'xt' );
if( $f == false ) {
print( "</li>\n" );
@@ -1680,7 +1682,7 @@
if( defined( 'MW_INSTALL_PATH' ) ) {
\$IP = MW_INSTALL_PATH;
} else {
- \$IP = dirname( __FILE__ );
+ \$IP = '/usr/share/mediawiki';
}
\$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
--- mediawiki-1.14.0/index.php.commoncode 2008-12-28 16:17:21.000000000 +0100
+++ mediawiki-1.14.0/index.php 2009-02-28 19:09:38.000000000 +0100
@@ -35,6 +35,9 @@
*/
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
# Initialise common code
$preIP = dirname( __FILE__ );
require_once( "$preIP/includes/WebStart.php" );
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 22 Feb 2009 11:37:33 -0000 1.19
+++ .cvsignore 28 Feb 2009 18:33:25 -0000 1.20
@@ -1 +1 @@
-mediawiki-1.13.4.tar.gz
+mediawiki-1.14.0.tar.gz
Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-10/mediawiki.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mediawiki.spec 22 Feb 2009 11:37:34 -0000 1.28
+++ mediawiki.spec 28 Feb 2009 18:33:25 -0000 1.29
@@ -1,12 +1,12 @@
Summary: A wiki engine
Name: mediawiki
-Version: 1.13.4
-Release: 44%{?dist}
+Version: 1.14.0
+Release: 45%{?dist}
License: GPLv2+
Group: Development/Tools
URL: http://www.mediawiki.org/
-Source0: http://download.wikimedia.org/mediawiki/1.13/%{name}-%{version}.tar.gz
-Patch0: mediawiki-1.13.0-commoncode.patch
+Source0: http://download.wikimedia.org/mediawiki/1.14/%{name}-%{version}.tar.gz
+Patch0: mediawiki-1.14.0-commoncode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: ocaml >= 3.06
# to make sure the "apache" group is created before mediawiki is installed
@@ -111,6 +111,9 @@
%changelog
+* Sat Feb 28 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.14.0-45
+- Update to 1.14.0.
+
* Sun Feb 22 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.13.4-44
- Split package up, so some users can decide to not install math
support (results in smaller installs), see RH bug #485447.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/F-10/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources 22 Feb 2009 11:37:34 -0000 1.20
+++ sources 28 Feb 2009 18:33:25 -0000 1.21
@@ -1 +1 @@
-7673991af779008606da22a55921e315 mediawiki-1.13.4.tar.gz
+36bfd924e92b61a6f5fe70c6bc8e5aac mediawiki-1.14.0.tar.gz
--- mediawiki-1.13.0-commoncode.patch DELETED ---
- Previous message (by thread): rpms/posterazor/F-9 posterazor.desktop, 1.1, 1.2 posterazor.spec, 1.1, 1.2
- Next message (by thread): rpms/mediawiki/F-9 mediawiki-1.14.0-commoncode.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 mediawiki.spec, 1.26, 1.27 sources, 1.18, 1.19 mediawiki-1.13.0-commoncode.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list