Author: glen Date: Thu Jan 21 19:12:40 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.9.1.1
---- Files affected:
packages/wpmu:
configpath.patch (1.4 -> 1.5) , pld.patch (1.5 -> 1.6) , wpmu.spec (1.11 ->
1.12)
---- Diffs:
================================================================
Index: packages/wpmu/configpath.patch
diff -u packages/wpmu/configpath.patch:1.4 packages/wpmu/configpath.patch:1.5
--- packages/wpmu/configpath.patch:1.4 Thu Jan 21 19:32:07 2010
+++ packages/wpmu/configpath.patch Thu Jan 21 20:12:34 2010
@@ -1,5 +1,5 @@
---- wordpress-mu-2.8.6/wp-admin/setup-config.php~ 2009-11-26
21:15:41.000000000 +0200
-+++ wordpress-mu-2.8.6/wp-admin/setup-config.php 2009-12-07
21:48:53.335423259 +0200
+--- wpmu-2.9.1.1/wp-admin/setup-config.php~ 2010-01-21 20:34:30.000000000
+0200
++++ wpmu-2.9.1.1/wp-admin/setup-config.php 2010-01-21 20:59:14.189772029
+0200
@@ -24,6 +24,7 @@
define('ABSPATH', dirname(dirname(__FILE__)).'/');
define('WPINC', 'wp-includes');
@@ -8,36 +8,29 @@
/*...@-*/
require_once(ABSPATH . WPINC . '/compat.php');
-@@ -35,11 +36,8 @@
-
+@@ -45,7 +45,7 @@
$configFile = file(ABSPATH . 'wp-config-sample.php');
--if ( !is_writable(ABSPATH))
-- wp_die("Sorry, I can't write to the directory. You'll have to either
change the permissions on your WordPress directory or create your wp-config.php
manually.");
--
// Check if wp-config.php has been created
-if (file_exists(ABSPATH . 'wp-config.php'))
+if (file_exists(WP_CONFIG_DIR. 'wp-config.php') && filesize(WP_CONFIG_DIR.
'wp-config.php'))
wp_die("<p>The file 'wp-config.php' already exists. If you need to
reset any of the configuration items in this file, please delete it first. You
may try <a href='install.php'>installing now</a>.</p>");
// Check if wp-config.php exists above the root directory but is not part of
another install
-@@ -155,7 +153,7 @@
- if ( !empty($wpdb->error) )
- wp_die($wpdb->error->get_error_message());
-
-- $handle = fopen(ABSPATH . 'wp-config.php', 'w');
-+ $handle = fopen(WP_CONFIG_DIR. 'wp-config.php', 'w');
-
- foreach ($configFile as $line_num => $line) {
- switch (substr($line,0,16)) {
-@@ -179,7 +177,6 @@
+@@ -200,12 +200,11 @@
+ <p class="step"><a href="install.php" class="button">Run the install</a></p>
+ <?php
+ else :
+- $handle = fopen(ABSPATH . 'wp-config.php', 'w');
++ $handle = fopen(WP_CONFIG_DIR. 'wp-config.php', 'w');
+ foreach( $configFile as $line ) {
+ fwrite($handle, $line);
}
- }
- fclose($handle);
-- chmod(ABSPATH . 'wp-config.php', 0666);
-
- display_header();
+ fclose($handle);
+- chmod(ABSPATH . 'wp-config.php', 0666);
+ display_header();
?>
+ <p>All right sparky! You've made it through this part of the installation.
WordPress can now communicate with your database. If you are ready, time now
to…</p>
--- wordpress-mu-2.8.6/index-install.php~ 2009-11-26 21:15:41.000000000
+0200
+++ wordpress-mu-2.8.6/index-install.php 2009-12-07 21:57:20.321942364
+0200
@@ -465,7 +465,7 @@
@@ -77,18 +70,18 @@
$msg .= "<blockquote>$out</blockquote>";
echo "<div id='update-nag'>$msg</div>";
---- wordpress-mu-2.8.6/wp-blog-header.php~ 2009-12-07 21:52:41.000000000
+0200
-+++ wordpress-mu-2.8.6/wp-blog-header.php 2009-12-07 21:52:43.755301786
+0200
+--- wpmu-2.9.1.1/wp-blog-header.php~ 2010-01-21 21:00:31.000000000 +0200
++++ wpmu-2.9.1.1/wp-blog-header.php 2010-01-21 21:01:27.924672241 +0200
@@ -7,7 +7,8 @@
if ( !isset($wp_did_header) ) {
// WPMU Runs installer if things aren't set up correctly
-- if ( !file_exists( dirname(__FILE__) . '/wp-config.php') &&
!file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
+- if ( file_exists( dirname(__FILE__) . '/wp-config.php' ) || (
file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php' ) && !
file_exists( dirname( dirname(__FILE__) ) . '/wp-settings.php' ) ) ) {
+ if (!filesize('/etc/webapps/wpmu/wp-config.php') &&
+ !file_exists( dirname(__FILE__) . '/wp-config.php') &&
!file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
- if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path =
'';
- else $path = 'wp-admin/';
- // install WPMU!
+ $wp_did_header = true;
+
+ require_once( dirname(__FILE__) . '/wp-load.php' );
--- wordpress-mu-2.8.6/wp-load.php~ 2009-11-26 21:15:41.000000000 +0200
+++ wordpress-mu-2.8.6/wp-load.php 2009-12-07 21:55:27.875280644 +0200
@@ -18,13 +18,17 @@
================================================================
Index: packages/wpmu/pld.patch
diff -u packages/wpmu/pld.patch:1.5 packages/wpmu/pld.patch:1.6
--- packages/wpmu/pld.patch:1.5 Mon Jan 18 11:05:22 2010
+++ packages/wpmu/pld.patch Thu Jan 21 20:12:34 2010
@@ -43,12 +43,12 @@
<code>chmod 755
<?php
reset( $dirs );
---- wordpress-mu-2.8.6/wp-blog-header.php 2009-11-19 17:28:48.952408338
+0200
-+++ wordpress-mu-2.8.6.pld/wp-blog-header.php 2009-11-19 17:28:33.183056898
+0200
-@@ -10,8 +10,11 @@
- if ( !file_exists( dirname(__FILE__) . '/wp-config.php') &&
!file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
- if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path =
'';
- else $path = 'wp-admin/';
+--- wpmu-2.9.1.1/wp-blog-header.php~ 2010-01-21 20:33:19.000000000 +0200
++++ wpmu-2.9.1.1/wp-blog-header.php 2010-01-21 20:34:06.891503135 +0200
+@@ -22,8 +22,11 @@
+ $path = 'wp-admin/';
+ }
+
- include( "index-install.php" ); // install WPMU!
- die();
+ // install WPMU!
@@ -58,4 +58,4 @@
+ die('Please install <code>wpmu-setup</code> package to run
install wizard');
}
- $wp_did_header = true;
+ }
================================================================
Index: packages/wpmu/wpmu.spec
diff -u packages/wpmu/wpmu.spec:1.11 packages/wpmu/wpmu.spec:1.12
--- packages/wpmu/wpmu.spec:1.11 Thu Jan 21 19:32:07 2010
+++ packages/wpmu/wpmu.spec Thu Jan 21 20:12:34 2010
@@ -1,15 +1,16 @@
# $Revision$, $Date$
# TODO
# - gettext mo to system dir, add all possible languages?
+# - system tinymce, jquery, codepress, scriptaculos, prototype
Summary: WordPress MU
Summary(en.UTF-8): WordPress ยต
Name: wpmu
-Version: 2.8.6
-Release: 0.40
+Version: 2.9.1.1
+Release: 0.42
License: GPL
Group: Applications/Publishing
Source0: http://mu.wordpress.org/wordpress-mu-%{version}.tar.gz
-# Source0-md5: dfa27af33afe0c206933e509edd5835c
+# Source0-md5: 85ffe0c80032257e99ca65c8fe978d3a
URL: http://mu.wordpress.org/
Source1: apache.conf
Patch0: pld.patch
@@ -79,6 +80,9 @@
rm wp-content/plugins/readme.txt
rm wp-content/index.php
+# remove *.dev.js
+find -name *.dev.js | xargs rm -v
+
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -88,6 +92,9 @@
%patch1 -p1
%patch2 -p1
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
%build
php -l wp-admin/includes/schema.php
php -l wp-admin/includes/schema-wp_queries.php
@@ -192,6 +199,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2010/01/21 19:12:34 glen
+- up to 2.9.1.1
+
Revision 1.11 2010/01/21 18:32:07 glen
- update one more wpmu path
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/configpath.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/pld.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpmu/wpmu.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
