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: 29-Mar-2008 22:23:39
Branch: HEAD Handle: 2008032921233801
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
upgrading package: wordpress 2.3.3 -> 2.5
Summary:
Revision Changes Path
1.9 +25 -26 openpkg-src/wordpress/wordpress.patch
1.59 +2 -2 openpkg-src/wordpress/wordpress.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 30 Dec 2007 11:59:07 -0000
1.8
+++ openpkg-src/wordpress/wordpress.patch 29 Mar 2008 21:23:38 -0000
1.9
@@ -1,7 +1,7 @@
Index: wordpress/wp-includes/canonical.php
---- wordpress/wp-includes/canonical.php.orig 2007-10-17 22:15:18 +0200
-+++ wordpress/wp-includes/canonical.php 2007-12-30 12:55:12 +0100
-@@ -108,6 +108,12 @@
+--- wordpress/wp-includes/canonical.php.orig 2008-02-24 03:09:24 +0100
++++ wordpress/wp-includes/canonical.php 2008-03-29 22:17:27 +0100
+@@ -139,6 +139,12 @@
$user_home = @parse_url(get_option('home'));
$redirect['host'] = $user_home['host'];
@@ -15,35 +15,34 @@
if ( isset($user_home['port']) )
$redirect['port'] = $user_home['port'];
Index: wordpress/wp-login.php
---- wordpress/wp-login.php.orig 2007-09-26 01:17:30 +0200
-+++ wordpress/wp-login.php 2007-12-30 12:52:53 +0100
-@@ -115,7 +115,7 @@
- // Now insert the new pass md5'd into the db
- $wpdb->query("UPDATE $wpdb->users SET
user_activation_key = '$key' WHERE user_login = '$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";
-@@ -189,7 +189,7 @@
- wp_cache_delete($user->user_login, 'userlogins');
+--- wordpress/wp-login.php.orig 2008-03-26 08:43:52 +0100
++++ wordpress/wp-login.php 2008-03-29 22:18:53 +0100
+@@ -99,7 +99,7 @@
+ $wpdb->query("UPDATE $wpdb->users SET user_activation_key =
'$key' WHERE user_login = '$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 (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new
password'), get_option('blogname')), $message)) {
+ 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>');
Index: wordpress/wp-mail.php
---- wordpress/wp-mail.php.orig 2007-12-29 20:38:47 +0100
-+++ wordpress/wp-mail.php 2007-12-30 12:52:53 +0100
-@@ -142,7 +142,7 @@
- $post_category = $post_categories;
-
- // or maybe we should leave the choice to email drafts? propose a way
-- $post_status = 'publish';
+--- wordpress/wp-mail.php.orig 2007-12-29 20:38:33 +0100
++++ wordpress/wp-mail.php 2008-03-29 22:20:39 +0100
+@@ -133,6 +133,7 @@
+ // Author not found in DB, set status to pending. Author
already set to admin.
+ $post_status = 'pending';
+ }
+ $post_status = 'draft';
- $post_data =
compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category',
'post_status');
- $post_data = add_magic_quotes($post_data);
+ $subject = trim($subject);
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 5 Feb 2008 19:24:21 -0000
1.58
+++ openpkg-src/wordpress/wordpress.spec 29 Mar 2008 21:23:39 -0000
1.59
@@ -22,7 +22,7 @@
##
# package versions
-%define V_wordpress 2.3.3
+%define V_wordpress 2.5
%define V_plugin_dbmanager 220
%define V_plugin_pagenavi 220
%define V_plugin_polls 221
@@ -44,7 +44,7 @@
Group: CMS
License: GPL
Version: %{V_wordpress}
-Release: 20080205
+Release: 20080329
# list of sources
Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
