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: 30-Dec-2007 12:59:07
Branch: HEAD Handle: 2007123011590700
Modified files:
openpkg-src/wordpress wordpress-apache.conf wordpress.patch
Log:
apply my shameless hack as one usually needs anyway
Summary:
Revision Changes Path
1.11 +1 -0 openpkg-src/wordpress/wordpress-apache.conf
1.8 +22 -6 openpkg-src/wordpress/wordpress.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress-apache.conf
============================================================================
$ cvs diff -u -r1.10 -r1.11 wordpress-apache.conf
--- openpkg-src/wordpress/wordpress-apache.conf 25 Dec 2007 15:59:31
-0000 1.10
+++ openpkg-src/wordpress/wordpress-apache.conf 30 Dec 2007 11:59:07
-0000 1.11
@@ -88,6 +88,7 @@
ExpiresByType text/html A1
#RewriteEngine on
#RewriteRule ^/blog(.*)$ $1 [PT,L]
+Alias /blog @l_prefix@/libexec/wordpress
<Directory "@l_prefix@/libexec/wordpress">
Options -Indexes +FollowSymLinks
AllowOverride None
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wordpress/wordpress.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 wordpress.patch
--- openpkg-src/wordpress/wordpress.patch 1 Oct 2007 11:41:56 -0000
1.7
+++ openpkg-src/wordpress/wordpress.patch 30 Dec 2007 11:59:07 -0000
1.8
@@ -1,7 +1,23 @@
+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 @@
+ $user_home = @parse_url(get_option('home'));
+ $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
++ $user_home['port'] = 80;
++ $redirect['port'] = 80;
++ $original['port'] = 80;
++
+ // Handle ports
+ if ( isset($user_home['port']) )
+ $redirect['port'] = $user_home['port'];
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 @@
+--- 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";
@@ -10,7 +26,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";
-@@ -187,7 +187,7 @@
+@@ -189,7 +189,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";
@@ -20,8 +36,8 @@
if (FALSE == 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-09-18 18:32:22 +0200
-+++ wordpress/wp-mail.php 2007-09-25 07:35:56 +0200
+--- 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;
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
