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: 15-Jul-2008 17:48:15
Branch: HEAD Handle: 2008071516481400
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
upgrading package: wordpress 2.5.1 -> 2.6
Summary:
Revision Changes Path
1.11 +14 -23 openpkg-src/wordpress/wordpress.patch
1.74 +2 -2 openpkg-src/wordpress/wordpress.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 5 Apr 2008 15:24:28 -0000
1.10
+++ openpkg-src/wordpress/wordpress.patch 15 Jul 2008 15:48:14 -0000
1.11
@@ -1,9 +1,9 @@
Index: wordpress/wp-includes/canonical.php
---- wordpress/wp-includes/canonical.php.orig 2008-02-24 03:09:24 +0100
-+++ wordpress/wp-includes/canonical.php 2008-04-05 17:21:55 +0200
-@@ -139,6 +139,12 @@
- $user_home = @parse_url(get_option('home'));
- $redirect['host'] = $user_home['host'];
+--- wordpress/wp-includes/canonical.php.orig 2008-05-25 17:45:05 +0200
++++ wordpress/wp-includes/canonical.php 2008-07-15 17:39:28 +0200
+@@ -144,6 +144,12 @@
+ if ( isset($user_home['host']) )
+ $redirect['host'] = $user_home['host'];
+ // SHAMELESS HACK TO MAKE WORDPRESS THINK IT IS RUNNING UNDER PORT 80
+ // TO FIX THE URL TROUBLE WITH THE USUAL FRONTEND APACHE WEBSERVER!
--rse
@@ -15,30 +15,21 @@
if ( isset($user_home['port']) )
$redirect['port'] = $user_home['port'];
Index: wordpress/wp-login.php
---- wordpress/wp-login.php.orig 2008-03-26 08:43:52 +0100
-+++ wordpress/wp-login.php 2008-04-05 17:21:55 +0200
-@@ -99,7 +99,7 @@
- $wpdb->query("UPDATE $wpdb->users SET user_activation_key =
'$key' WHERE user_login = '$user_login'");
+--- wordpress/wp-login.php.orig 2008-07-11 22:14:44 +0200
++++ wordpress/wp-login.php 2008-07-15 17:39:28 +0200
+@@ -138,7 +138,7 @@
+ $wpdb->query($wpdb->prepare("UPDATE $wpdb->users SET
user_activation_key = %s WHERE user_login = %s", $key, $user_login));
}
$message = __('Someone has asked to reset the password for the
following site and username.') . "\r\n\r\n";
- $message .= get_option('siteurl') . "\r\n\r\n";
+ $message .= sprintf(__('Website: %s'), get_option('siteurl')) . "\r\n";
$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
$message .= __('To reset your password visit the following address,
otherwise just ignore this email and nothing will happen.') . "\r\n\r\n";
- $message .= get_option('siteurl') .
"/wp-login.php?action=rp&key=$key\r\n";
-@@ -129,7 +129,7 @@
- wp_set_password($new_pass, $user->ID);
- $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
- $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
-- $message .= get_option('siteurl') . "/wp-login.php\r\n";
-+ $message .= sprintf(__('Login: %s'), get_option('siteurl') .
"/wp-login.php") . "\r\n";
-
- if ( !wp_mail($user->user_email, sprintf(__('[%s] Your new password'),
get_option('blogname')), $message) )
- die('<p>' . __('The e-mail could not be sent.') . "<br />\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'</p>');
+ $message .= site_url("wp-login.php?action=rp&key=$key", 'login') .
"\r\n";
Index: wordpress/wp-mail.php
---- wordpress/wp-mail.php.orig 2007-12-29 20:38:33 +0100
-+++ wordpress/wp-mail.php 2008-04-05 17:21:55 +0200
-@@ -133,6 +133,7 @@
+--- wordpress/wp-mail.php.orig 2008-05-25 17:50:15 +0200
++++ wordpress/wp-mail.php 2008-07-15 17:39:28 +0200
+@@ -143,6 +143,7 @@
// Author not found in DB, set status to pending. Author
already set to admin.
$post_status = 'pending';
}
@@ -48,7 +39,7 @@
Index: wp-hashcash/wp-hashcash.php
--- wp-hashcash/wp-hashcash.php.orig 2008-03-29 20:07:10 +0100
-+++ wp-hashcash/wp-hashcash.php 2008-04-05 17:23:06 +0200
++++ wp-hashcash/wp-hashcash.php 2008-07-15 17:39:28 +0200
@@ -448,8 +448,7 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
============================================================================
$ cvs diff -u -r1.73 -r1.74 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 8 Jun 2008 08:01:30 -0000
1.73
+++ openpkg-src/wordpress/wordpress.spec 15 Jul 2008 15:48:14 -0000
1.74
@@ -22,7 +22,7 @@
##
# package versions
-%define V_wordpress 2.5.1
+%define V_wordpress 2.6
%define V_plugin_dbmanager 2.30
%define V_plugin_pagenavi 2.30
%define V_plugin_polls 2.30
@@ -46,7 +46,7 @@
Group: CMS
License: GPL
Version: %{V_wordpress}
-Release: 20080608
+Release: 20080715
# list of sources
Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
