[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 06-Aug-2008 09:29:24
Branch: HEAD Handle: 2008080608292300
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
modifying package: wordpress-2.6 20080802 -> 20080806
Summary:
RevisionChanges Path
1.12+8 -10 openpkg-src/wordpress/wordpress.patch
1.80+3 -3 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r1.11 -r1.12 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 15 Jul 2008 15:48:14 -
1.11
+++ openpkg-src/wordpress/wordpress.patch 6 Aug 2008 07:29:23 -
1.12
@@ -1,6 +1,6 @@
Index: wordpress/wp-includes/canonical.php
--- 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
wordpress/wp-includes/canonical.php 2008-08-06 09:26:50 +0200
@@ -144,6 +144,12 @@
if ( isset($user_home['host']) )
$redirect['host'] = $user_home['host'];
@@ -16,7 +16,7 @@
$redirect['port'] = $user_home['port'];
Index: wordpress/wp-login.php
--- wordpress/wp-login.php.orig 2008-07-11 22:14:44 +0200
-+++ wordpress/wp-login.php 2008-07-15 17:39:28 +0200
wordpress/wp-login.php 2008-08-06 09:26:50 +0200
@@ -138,7 +138,7 @@
$wpdb->query($wpdb->prepare("UPDATE $wpdb->users SET
user_activation_key = %s WHERE user_login = %s", $key, $user_login));
}
@@ -28,7 +28,7 @@
$message .= site_url("wp-login.php?action=rp&key=$key", 'login') .
"\r\n";
Index: wordpress/wp-mail.php
--- wordpress/wp-mail.php.orig 2008-05-25 17:50:15 +0200
-+++ wordpress/wp-mail.php2008-07-15 17:39:28 +0200
wordpress/wp-mail.php2008-08-06 09:26:50 +0200
@@ -143,6 +143,7 @@
// Author not found in DB, set status to pending. Author
already set to admin.
$post_status = 'pending';
@@ -38,15 +38,13 @@
$subject = trim($subject);
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-07-15 17:39:28 +0200
-@@ -448,8 +448,7 @@
+--- wp-hashcash/wp-hashcash.php.orig 2008-07-30 10:07:02 +0200
wp-hashcash/wp-hashcash.php 2008-08-06 09:27:21 +0200
+@@ -521,7 +521,6 @@
}
- echo '';
+ echo '';
-echo '' . __('Powered by', 'wp-hashcash') . ' http://wordpress-plugins.feifei.us/hashcash/";>WP Hashcash';
--echo 'Wordpress Hashcash needs javascript to work, but
your browser has javascript disabled. Your comment will be
'.$verb.'!';
-+echo 'Wordpress Hashcash needs JavaScript to work, but
your browser has JavaScript disabled. Your comment will be
'.$verb.'!';
+ echo 'Wordpress Hashcash needs javascript to
work, but your browser has javascript disabled. Your comment will be
'.$verb.'!';
}
- add_action('comment_form', 'wphc_addform');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.79 -r1.80 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 2 Aug 2008 17:07:18 -
1.79
+++ openpkg-src/wordpress/wordpress.spec 6 Aug 2008 07:29:23 -
1.80
@@ -33,7 +33,7 @@
%define V_plugin_ela 0.10
%define V_plugin_stats 1.3.2
%define V_plugin_peterantispam 3.0.7
-%define V_plugin_hashcash 4.2
+%define V_plugin_hashcash 4.3
# package information
Name: wordpress
@@ -46,7 +46,7 @@
Group:CMS
License: GPL
Version: %{V_wordpress}
-Release: 20080802
+Release: 20080806
# list of sources
Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ -145,7 +145,7 @@
}
prog wordpress:plugin-hashcash = {
version = %{V_plugin_hashcash}
-url = http://wordpress-plugins.feifei.us/hashcash/
+url = http://wordpress.org/extend/plugins/wp-hashcash/
regex = wp-hashcash\.(__VER__)\.zip
}
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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:
RevisionChanges 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 -
1.10
+++ openpkg-src/wordpress/wordpress.patch 15 Jul 2008 15:48:14 -
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('' . __('The e-mail could not be sent.') . "\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'');
+ $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.php2008-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.php2008-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
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 05-Apr-2008 17:24:28
Branch: HEAD Handle: 2008040516242800
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
add HashCash plugin
Summary:
RevisionChanges Path
1.10+16 -3 openpkg-src/wordpress/wordpress.patch
1.63+12 -1 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r1.9 -r1.10 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 29 Mar 2008 21:23:38 -
1.9
+++ openpkg-src/wordpress/wordpress.patch 5 Apr 2008 15:24:28 -
1.10
@@ -1,6 +1,6 @@
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-03-29 22:17:27 +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'];
@@ -16,7 +16,7 @@
$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-03-29 22:18:53 +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'");
}
@@ -37,7 +37,7 @@
die('' . __('The e-mail could not be sent.') . "\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'');
Index: wordpress/wp-mail.php
--- wordpress/wp-mail.php.orig 2007-12-29 20:38:33 +0100
-+++ wordpress/wp-mail.php2008-03-29 22:20:39 +0100
wordpress/wp-mail.php2008-04-05 17:21:55 +0200
@@ -133,6 +133,7 @@
// Author not found in DB, set status to pending. Author
already set to admin.
$post_status = 'pending';
@@ -46,3 +46,16 @@
$subject = trim($subject);
+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
+@@ -448,8 +448,7 @@
+ }
+
+ echo '';
+-echo '' . __('Powered by', 'wp-hashcash') . ' http://wordpress-plugins.feifei.us/hashcash/";>WP Hashcash';
+-echo 'Wordpress Hashcash needs javascript to work, but
your browser has javascript disabled. Your comment will be
'.$verb.'!';
++echo 'Wordpress Hashcash needs JavaScript to work, but
your browser has JavaScript disabled. Your comment will be
'.$verb.'!';
+ }
+
+ add_action('comment_form', 'wphc_addform');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.62 -r1.63 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 5 Apr 2008 15:03:31 -
1.62
+++ openpkg-src/wordpress/wordpress.spec 5 Apr 2008 15:24:28 -
1.63
@@ -33,6 +33,7 @@
%define V_plugin_ela 0.10
%define V_plugin_stats 1.2
%define V_plugin_peterantispam 3.0.3
+%define V_plugin_hashcash 4.1
# package information
Name: wordpress
@@ -63,6 +64,7 @@
Source17:
http://www.sonsofskadi.net/wp-content/upload/af-extended-live-archive-%{V_plugin_ela}.zip
Source18:
http://downloads.wordpress.org/plugin/stats.%{V_plugin_stats}.zip
Source19:
http://www.theblog.ca/wp-content/uploads/2008/04/peterantispam%{V_plugin_peterantispam}.zip
+Source20:
http://downloads.wordpress.org/plugin/wp-hashcash.%{V_plugin_hashcash}.zip
Patch0: wordpress.patch
Patch1: wordpress.patch.ela
@@ -148,6 +150,11 @@
url = http://www.theblog.ca/anti-spam
regex = peterantispam(__VER__)\.zip
}
+prog wordpress:plugin-hashcash = {
+version = %{V_plugin_hashcash}
+url = http://wordpress-plugins.feifei.us/hashcash/
+regex = wp-hashcash\.(__VER__)\.zip
+}
%prep
%setup -q -c
@@ -161,6 +168,7 @@
%{l_prefix}/bin/unzip -q -o -x %{SOURCE17}
%{l_prefix}/bin/unzip -q -o -x %{SOURCE18}
%{l_prefix}/bin/unzip -q -o -x %{SOURCE19}
+%{l_prefix}/bin/unzip -q -o -x %{S
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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:
RevisionChanges 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 -
1.8
+++ openpkg-src/wordpress/wordpress.patch 29 Mar 2008 21:23:38 -
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('' . __('The e-mail could not be sent.') . "\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'');
Index: wordpress/wp-mail.php
wordpress/wp-mail.php.orig 2007-12-29 20:38:47 +0100
-+++ wordpress/wp-mail.php2007-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
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 01-Oct-2007 13:41:56
Branch: HEAD Handle: 2007100112415600
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
finally upgrade to Wordpress 2.3
Summary:
RevisionChanges Path
1.7 +8 -20 openpkg-src/wordpress/wordpress.patch
1.49+29 -29 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r1.6 -r1.7 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 21 Jun 2007 09:23:05 -
1.6
+++ openpkg-src/wordpress/wordpress.patch 1 Oct 2007 11:41:56 -
1.7
@@ -1,19 +1,7 @@
-Index: wp-includes/formatting.php
wp-includes/formatting.php.orig 2007-04-13 01:19:16 +0200
-+++ wp-includes/formatting.php 2007-05-17 09:47:52 +0200
-@@ -78,7 +78,7 @@
- $pee = preg_replace('!(]*>)\s*!', "$1",
$pee);
- $pee = preg_replace('!(\s*]*>)!', '$1', $pee);
- if (strpos($pee, ')(.*?)!ise', "
stripslashes('$1') . stripslashes(clean_pre('$2')) . '' ", $pee);
-+$pee = preg_replace('!()(.*?)!ise', "
wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . ''
", $pee);
- $pee = preg_replace( "|\n$|", '', $pee );
-
- return $pee;
-Index: wp-login.php
wp-login.php.orig2007-04-19 04:53:19 +0200
-+++ wp-login.php 2007-05-17 09:20:19 +0200
-@@ -114,7 +114,7 @@
+Index: wordpress/wp-login.php
+--- wordpress/wp-login.php.orig 2007-09-19 00:23:16 +0200
wordpress/wp-login.php 2007-09-25 07:35:56 +0200
+@@ -113,7 +113,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";
@@ -22,7 +10,7 @@
$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";
-@@ -188,7 +188,7 @@
+@@ -187,7 +187,7 @@
wp_cache_delete($user->user_login, 'userlogins');
$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
$message .= sprintf(__('Password: %s'), $new_pass) . "\r\n";
@@ -31,9 +19,9 @@
if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new
password'), get_option('blogname')), $message)) {
die('' . __('The e-mail could not be sent.') . "\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'');
-Index: wp-mail.php
wp-mail.php.orig 2007-05-05 04:51:20 +0200
-+++ wp-mail.php 2007-05-17 09:20:19 +0200
+Index: wordpress/wp-mail.php
+--- wordpress/wp-mail.php.orig 2007-09-18 18:32:22 +0200
wordpress/wp-mail.php2007-09-25 07:35:56 +0200
@@ -142,7 +142,7 @@
$post_category = $post_categories;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.48 -r1.49 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 8 Sep 2007 07:35:02 -
1.48
+++ openpkg-src/wordpress/wordpress.spec 1 Oct 2007 11:41:56 -
1.49
@@ -23,16 +23,16 @@
##
# package versions
-%define V_wordpress2.2.3
+%define V_wordpress2.3
%define V_plugin_simpletagging 1-6
-%define V_plugin_dbmanager 211
-%define V_plugin_pagenavi 211
-%define V_plugin_polls 220
-%define V_plugin_postviews 111
-%define V_plugin_print 211
-%define V_plugin_relativedate 111
-%define V_plugin_stats 211
-%define V_plugin_ban 111
+%define V_plugin_dbmanager 220
+%define V_plugin_pagenavi 220
+%define V_plugin_polls 221
+%define V_plugin_postviews 120
+%define V_plugin_print 220
+%define V_plugin_relativedate 120
+%define V_plugin_stats
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 21-Jun-2007 11:23:05
Branch: HEAD Handle: 2007062110230500
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
upgrading package: wordpress 2.2 -> 2.2.1
Summary:
RevisionChanges Path
1.6 +0 -12 openpkg-src/wordpress/wordpress.patch
1.44+2 -2 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r1.5 -r1.6 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 8 Jun 2007 15:52:19 -
1.5
+++ openpkg-src/wordpress/wordpress.patch 21 Jun 2007 09:23:05 -
1.6
@@ -43,15 +43,3 @@
$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);
-Index: xmlrpc.php
xmlrpc.php.orig 2007-05-11 23:40:15 +0200
-+++ xmlrpc.php 2007-06-08 16:07:27 +0200
-@@ -538,7 +538,7 @@
- $username = $args[1];
- $password = $args[2];
- $category = $args[3];
--$max_results= $args[4];
-+$max_results= (int) $args[4];
-
- if(!$this->login_pass_ok($username, $password)) {
- return($this->error);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.43 -r1.44 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 8 Jun 2007 16:08:38 -
1.43
+++ openpkg-src/wordpress/wordpress.spec 21 Jun 2007 09:23:05 -
1.44
@@ -23,7 +23,7 @@
##
# package versions
-%define V_wordpress2.2
+%define V_wordpress2.2.1
%define V_plugin_simpletagging 1-6
%define V_plugin_dbmanager 211
%define V_plugin_pagenavi 211
@@ -46,7 +46,7 @@
Group:CMS
License: GPL
Version: %{V_wordpress}
-Release: 20070608
+Release: 20070621
# list of sources
Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 08-Jun-2007 17:52:20
Branch: HEAD Handle: 2007060816521900
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
fix security bug
Summary:
RevisionChanges Path
1.5 +12 -0 openpkg-src/wordpress/wordpress.patch
1.42+1 -1 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r1.4 -r1.5 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 17 May 2007 08:28:45 -
1.4
+++ openpkg-src/wordpress/wordpress.patch 8 Jun 2007 15:52:19 -
1.5
@@ -43,3 +43,15 @@
$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);
+Index: xmlrpc.php
+--- xmlrpc.php.orig 2007-05-11 23:40:15 +0200
xmlrpc.php 2007-06-08 16:07:27 +0200
+@@ -538,7 +538,7 @@
+ $username = $args[1];
+ $password = $args[2];
+ $category = $args[3];
+-$max_results= $args[4];
++$max_results= (int) $args[4];
+
+ if(!$this->login_pass_ok($username, $password)) {
+ return($this->error);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.41 -r1.42 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 31 May 2007 16:43:31 -
1.41
+++ openpkg-src/wordpress/wordpress.spec 8 Jun 2007 15:52:19 -
1.42
@@ -46,7 +46,7 @@
Group:CMS
License: GPL
Version: %{V_wordpress}
-Release: 20070531
+Release: 20070608
# list of sources
Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 17-May-2007 10:28:45
Branch: HEAD Handle: 2007051709284500
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
upgrading package: wordpress 2.1.3 -> 2.2
Summary:
RevisionChanges Path
1.4 +11 -18 openpkg-src/wordpress/wordpress.patch
1.38+3 -3 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r1.3 -r1.4 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 14 Feb 2007 10:41:24 -
1.3
+++ openpkg-src/wordpress/wordpress.patch 17 May 2007 08:28:45 -
1.4
@@ -1,18 +1,18 @@
Index: wp-includes/formatting.php
wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100
-+++ wp-includes/formatting.php 2007-02-14 11:32:46 +0100
-@@ -80,7 +80,7 @@
+--- wp-includes/formatting.php.orig 2007-04-13 01:19:16 +0200
wp-includes/formatting.php 2007-05-17 09:47:52 +0200
+@@ -78,7 +78,7 @@
$pee = preg_replace('!(]*>)\s*!', "$1",
$pee);
$pee = preg_replace('!(\s*]*>)!', '$1', $pee);
- if ( strstr( $pee, ')(.*?)!ise', "
stripslashes('$1') . stripslashes(clean_pre('$2')) . '' ", $pee);
-+$pee = preg_replace('!()(.*?)!ise', "
wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . ''
", $pee);
++$pee = preg_replace('!()(.*?)!ise', "
wp_kses_stripslashes('$1') . wp_kses_stripslashes(clean_pre('$2')) . ''
", $pee);
$pee = preg_replace( "|\n$|", '', $pee );
- /**/
+
return $pee;
Index: wp-login.php
wp-login.php.orig2006-12-21 11:10:04 +0100
-+++ wp-login.php 2007-02-14 11:32:46 +0100
+--- wp-login.php.orig2007-04-19 04:53:19 +0200
wp-login.php 2007-05-17 09:20:19 +0200
@@ -114,7 +114,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'");
@@ -32,9 +32,9 @@
if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new
password'), get_option('blogname')), $message)) {
die('' . __('The e-mail could not be sent.') . "\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'');
Index: wp-mail.php
wp-mail.php.orig 2006-08-30 23:46:31 +0200
-+++ wp-mail.php 2007-02-14 11:36:00 +0100
-@@ -131,7 +131,7 @@
+--- wp-mail.php.orig 2007-05-05 04:51:20 +0200
wp-mail.php 2007-05-17 09:20:19 +0200
+@@ -142,7 +142,7 @@
$post_category = $post_categories;
// or maybe we should leave the choice to email drafts? propose a way
@@ -43,10 +43,3 @@
$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);
-@@ -161,4 +161,4 @@
-
- $pop3->quit();
-
--?>
-\ No newline at end of file
-+?>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.37 -r1.38 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 18 Apr 2007 21:46:28 -
1.37
+++ openpkg-src/wordpress/wordpress.spec 17 May 2007 08:28:45 -
1.38
@@ -23,7 +23,7 @@
##
# package versions
-%define V_wordpress2.1.3
+%define V_wordpress2.2
%define V_plugin_simpletagging 1-6
%define V_plugin_dbmanager 210
%define V_plugin_pagenavi 210
@@ -46,7 +46,7 @@
Group:CMS
License: GPL
Version: %{V_wordpress}
-Release: 20070418
+Release: 20070517
# list of sources
Source0: http://wordpress.org/wordpress-%{V_wordpress}.tar.gz
@@ -88,7 +88,7 @@
prog wordpress:wordpress = {
version = %{V_wordpress}
url = http://wordpress.org/download/release-archive/
-regex = wordpress-(\d+\.\d+\.\d+)\.tar\.gz
+regex = wordpress-(\d+\.\d+(\.\d+)?)\.tar\.gz
}
prog wordpress:plugin-simpletagging = {
version = %{V_plugin_simpletagging}
@@ .
__
OpenPKG http://
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 14-Feb-2007 11:41:25
Branch: HEAD Handle: 2007021410412400
Modified files:
openpkg-src/wordpress wordpress.patch wordpress.spec
Log:
mailed postings IMHO really should just 'draft' status (so they are
not going online immediately) as they usually always have to be
post-adjusted before publishing
Summary:
RevisionChanges Path
1.3 +21 -2 openpkg-src/wordpress/wordpress.patch
1.27+1 -1 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r1.2 -r1.3 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 13 Feb 2007 12:49:51 -
1.2
+++ openpkg-src/wordpress/wordpress.patch 14 Feb 2007 10:41:24 -
1.3
@@ -1,6 +1,6 @@
Index: wp-includes/formatting.php
--- wp-includes/formatting.php.orig 2007-01-09 23:53:14 +0100
-+++ wp-includes/formatting.php 2007-02-13 13:48:07 +0100
wp-includes/formatting.php 2007-02-14 11:32:46 +0100
@@ -80,7 +80,7 @@
$pee = preg_replace('!(]*>)\s*!', "$1",
$pee);
$pee = preg_replace('!(\s*]*>)!', '$1', $pee);
@@ -12,7 +12,7 @@
return $pee;
Index: wp-login.php
--- wp-login.php.orig2006-12-21 11:10:04 +0100
-+++ wp-login.php 2007-02-13 13:47:46 +0100
wp-login.php 2007-02-14 11:32:46 +0100
@@ -114,7 +114,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'");
@@ -31,3 +31,22 @@
if (FALSE == wp_mail($user->user_email, sprintf(__('[%s] Your new
password'), get_option('blogname')), $message)) {
die('' . __('The e-mail could not be sent.') . "\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'');
+Index: wp-mail.php
+--- wp-mail.php.orig 2006-08-30 23:46:31 +0200
wp-mail.php 2007-02-14 11:36:00 +0100
+@@ -131,7 +131,7 @@
+ $post_category = $post_categories;
+
+ // or maybe we should leave the choice to email drafts? propose a way
+-$post_status = 'publish';
++$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);
+@@ -161,4 +161,4 @@
+
+ $pop3->quit();
+
+-?>
+\ No newline at end of file
++?>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.26 -r1.27 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 13 Feb 2007 14:48:31 -
1.26
+++ openpkg-src/wordpress/wordpress.spec 14 Feb 2007 10:41:24 -
1.27
@@ -33,7 +33,7 @@
Group:CMS
License: GPL
Version: 2.1
-Release: 20070213
+Release: 20070214
# list of sources
Source0:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/wordpress/wordpress-%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wordpress/ wordpress.patch wordpress.spec
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: 10-Feb-2007 22:30:40
Branch: HEAD Handle: 2007021021303900
Added files:
openpkg-src/wordpress wordpress.patch
Modified files:
openpkg-src/wordpress wordpress.spec
Log:
little bit of cosmetics to the sent mails
Summary:
RevisionChanges Path
1.1 +21 -0 openpkg-src/wordpress/wordpress.patch
1.24+2 -0 openpkg-src/wordpress/wordpress.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
$ cvs diff -u -r0 -r1.1 wordpress.patch
--- /dev/null 2007-02-10 22:30:14 +0100
+++ wordpress.patch 2007-02-10 22:30:40 +0100
@@ -0,0 +1,21 @@
+Index: wp-login.php
+--- wp-login.php.orig2006-12-21 11:10:04 +0100
wp-login.php 2007-02-10 22:29:05 +0100
+@@ -114,7 +114,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";
+@@ -188,7 +188,7 @@
+ wp_cache_delete($user->user_login, 'userlogins');
+ $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)) {
+ die('' . __('The e-mail could not be sent.') . "\n" .
__('Possible reason: your host may have disabled the mail() function...') .
'');
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.spec
$ cvs diff -u -r1.23 -r1.24 wordpress.spec
--- openpkg-src/wordpress/wordpress.spec 10 Feb 2007 19:17:35 -
1.23
+++ openpkg-src/wordpress/wordpress.spec 10 Feb 2007 21:30:39 -
1.24
@@ -40,6 +40,7 @@
Source1: wordpress-apache.conf
Source2: wordpress-setup.sh
Source3: rc.wordpress
+Patch0: wordpress.patch
# build information
Prefix: %{l_prefix}
@@ -68,6 +69,7 @@
%prep
%setup -q -n wordpress
+%patch -p0
%build
# create configuration file
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
