OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 26-Jan-2007 19:38:55 Branch: HEAD Handle: 2007012618385500 Modified files: openpkg-src/mediawiki mediawiki.patch mediawiki.spec Log: upgrading package: mediawiki 1.8.3 -> 1.9.1 Summary: Revision Changes Path 1.2 +14 -15 openpkg-src/mediawiki/mediawiki.patch 1.6 +2 -2 openpkg-src/mediawiki/mediawiki.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/mediawiki/mediawiki.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 mediawiki.patch --- openpkg-src/mediawiki/mediawiki.patch 22 Dec 2006 15:51:14 -0000 1.1 +++ openpkg-src/mediawiki/mediawiki.patch 26 Jan 2007 18:38:55 -0000 1.2 @@ -1,6 +1,6 @@ Index: config/index.php ---- config/index.php.orig 2006-10-14 02:06:36 +0200 -+++ config/index.php 2006-12-21 14:18:20 +0100 +--- config/index.php.orig 2007-01-24 09:32:59 +0100 ++++ config/index.php 2007-01-26 19:37:13 +0100 @@ -62,7 +62,7 @@ $ourdb['postgres']['havedriver'] = 0; $ourdb['postgres']['compile'] = 'pgsql'; @@ -10,16 +10,15 @@ ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -@@ -431,7 +431,7 @@ - } - +@@ -422,6 +422,7 @@ $conf->diff3 = false; --$diff3locations = array( "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) ); -+$diff3locations = array( "@l_prefix@/bin", "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) ); - $diff3names = array( "gdiff3", "diff3", "diff3.exe" ); - - $diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' ); -@@ -449,7 +449,7 @@ + $diff3locations = array_merge( + array( ++ "@l_prefix@/bin", + "/usr/bin", + "/usr/local/bin", + "/opt/csw/bin", +@@ -445,7 +446,7 @@ print "<li>GNU diff3 not found.</li>"; $conf->ImageMagick = false; @@ -28,7 +27,7 @@ foreach( $imcheck as $dir ) { $im = "$dir/convert"; if( file_exists( $im ) ) { -@@ -493,15 +493,15 @@ +@@ -496,15 +497,15 @@ <?php $conf->DBserver = importPost( "DBserver", "localhost" ); @@ -44,13 +43,13 @@ $conf->SysopPass = importPost( "SysopPass" ); $conf->SysopPass2 = importPost( "SysopPass2" ); - $conf->RootUser = importPost( "RootUser", "root" ); -- $conf->RootPW = importPost( "RootPW", "-" ); +- $conf->RootPW = importPost( "RootPW", "" ); + $conf->RootUser = importPost( "RootUser", "@l_db_suser@" ); + $conf->RootPW = importPost( "RootPW", "@l_db_spass@" ); + $useRoot = importCheck( 'useroot', false ); ## MySQL specific: - $conf->DBprefix = importPost( "DBprefix" ); -@@ -554,8 +554,8 @@ +@@ -561,8 +562,8 @@ $conf->RightsIcon = importRequest( "RightsIcon", "" ); } @@ . patch -p0 <<'@@ .' Index: openpkg-src/mediawiki/mediawiki.spec ============================================================================ $ cvs diff -u -r1.5 -r1.6 mediawiki.spec --- openpkg-src/mediawiki/mediawiki.spec 10 Jan 2007 18:48:40 -0000 1.5 +++ openpkg-src/mediawiki/mediawiki.spec 26 Jan 2007 18:38:55 -0000 1.6 @@ -32,8 +32,8 @@ Class: EVAL Group: CMS License: GPL -Version: 1.8.3 -Release: 20070110 +Version: 1.9.1 +Release: 20070126 # list of sources Source0: http://switch.dl.sourceforge.net/wikipedia/mediawiki-%{version}.tar.gz @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org