Moved from net-www/wordpress to www-apps/wordpress.

6 files changed, 302 insertions, 0 deletions

diff --git a/www-apps/wordpress/files/1.2/login-patch.diff b/www-apps/wordpress/files/1.2/login-patch.diff
new file mode 100644
index 000000000000..2ed450fc1705
--- /dev/null
+++ b/www-apps/wordpress/files/1.2/login-patch.diff
@@ -0,0 +1,69 @@
+diff -u --recursive wordpress/wp-admin/auth.php diary/wp-admin/auth.php
+--- wordpress/wp-admin/auth.php	2004-05-19 08:05:40.000000000 +0100
++++ diary/wp-admin/auth.php	2004-07-20 21:32:39.048004629 +0100
+@@ -15,9 +15,13 @@
+ 	}
+ 
+ 	if ('' == $user_login)
++	{
+ 		return false;
++	}
+ 	if (!$user_pass_md5)
++	{
+ 		return false;
++	}
+ 
+ 	$login = $wpdb->get_row("SELECT user_login, user_pass FROM $tableusers WHERE user_login = '$user_login'");
+ 
+@@ -25,7 +29,7 @@
+ 		return false;
+ 
+ 	} else {
+-		if ($login->user_login == $user_login && md5($login->user_pass) == $user_pass_md5) {
++		if ($login->user_login == $user_login && $login->user_pass == $user_pass_md5) {
+ 			return true;
+ 		} else {
+ 			return false;
+@@ -46,4 +50,4 @@
+ 	exit();
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+Only in /srv/stu.gnqs.org/www/htdocs/diary/: wp-config.php
+diff -u --recursive wordpress/wp-login.php diary/wp-login.php
+--- wordpress/wp-login.php	2004-05-18 02:29:29.000000000 +0100
++++ diary/wp-login.php	2004-07-20 22:10:53.836444653 +0100
+@@ -74,8 +74,8 @@
+ 		global $wpdb, $log, $pwd, $error, $user_ID;
+ 		global $tableusers, $pass_is_md5;
+ 		$user_login = &$log;
+-		$pwd = md5($pwd);
+-		$password = &$pwd;
++		$password = md5($pwd);
++
+ 		if (!$user_login) {
+ 			$error = __('<strong>Error</strong>: the login field is empty.');
+ 			return false;
+@@ -95,8 +95,9 @@
+ 			$pwd = '';
+ 			return false;
+ 		} else {
+-		$user_ID = $login->ID;
+-			if (($pass_is_md5 == 0 && $login->user_login == $user_login && $login->user_pass == $password) || ($pass_is_md5 == 1 && $login->user_login == $user_login && $login->user_pass == md5($password))) {
++			$user_ID = $login->ID;
++
++			if ($login->user_login == $user_login && $login->user_pass == $password) {
+ 				return true;
+ 			} else {
+ 				$error = __('<strong>Error</strong>: wrong login or password.');
+@@ -242,7 +243,7 @@
+ 
+ 		$userdata = get_userdatabylogin($user_login);
+ 
+-		if ($user_pass_md5 != md5($userdata->user_pass)) {
++		if (!$userdata || $user_pass_md5 != $userdata->user_pass) {
+ 			return false;
+ 		} else {
+ 			return true;
diff --git a/www-apps/wordpress/files/1.2/postinstall-en.txt b/www-apps/wordpress/files/1.2/postinstall-en.txt
new file mode 100644
index 000000000000..3ce17f858fcc
--- /dev/null
+++ b/www-apps/wordpress/files/1.2/postinstall-en.txt
@@ -0,0 +1,17 @@
+Install instructions
+
+1) Open up wp-config-sample.php and fill in your database connection details
+2) Save the file as wp-config.php
+
+3) Launch /wp-admin/install.php in your browser.
+4) Note the password given to you.
+
+The install script should then send you to the login page.
+
+Sign in with the username admin and the password generated during the installation.
+
+You can then click on 'Profile' to change the password.
+
+Upgrade instructions
+
+1) Point your browser to /wp-admin/upgrade.php
diff --git a/www-apps/wordpress/files/digest-wordpress-1.0.2 b/www-apps/wordpress/files/digest-wordpress-1.0.2
new file mode 100644
index 000000000000..3c7092e89fbb
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-1.0.2
@@ -0,0 +1 @@
+MD5 62ffd1a241ba9a1652b9681c53e979de wordpress-1.0.2-blakey.tar.gz 223901
diff --git a/www-apps/wordpress/files/digest-wordpress-1.2 b/www-apps/wordpress/files/digest-wordpress-1.2
new file mode 100644
index 000000000000..8f1647645808
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-1.2
@@ -0,0 +1 @@
+MD5 1ba3cde7b7245d4cadc4a31d067dfa46 wordpress-1.2-mingus.tar.gz 247985
diff --git a/www-apps/wordpress/files/digest-wordpress-1.2-r1 b/www-apps/wordpress/files/digest-wordpress-1.2-r1
new file mode 100644
index 000000000000..8f1647645808
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-1.2-r1
@@ -0,0 +1 @@
+MD5 1ba3cde7b7245d4cadc4a31d067dfa46 wordpress-1.2-mingus.tar.gz 247985
diff --git a/www-apps/wordpress/files/wordpress-1.0.2.gentoo.diff b/www-apps/wordpress/files/wordpress-1.0.2.gentoo.diff
new file mode 100644
index 000000000000..fe09c068a3ea
--- /dev/null
+++ b/www-apps/wordpress/files/wordpress-1.0.2.gentoo.diff
@@ -0,0 +1,213 @@
+diff -u --recursive wordpress-1.0.2/b2rdf.php wordpress-1.0.2-patched/b2rdf.php
+--- wordpress-1.0.2/b2rdf.php	2004-03-11 19:15:11.000000000 +0000
++++ wordpress-1.0.2-patched/b2rdf.php	2004-05-01 11:35:57.924240544 +0100
+@@ -1,7 +1,6 @@
+ <?php
+-$curpath = dirname(__FILE__).'/';
+-require_once ($curpath.'wp-config.php');
+-require_once ($curpath.WPINC.'/template-functions.php');
++require_once ('./wp-config.php');
++require_once ('wp-includes/template-functions.php');
+ if (!empty($_SERVER["QUERY_STRING"])) {
+ 	$location = get_bloginfo('rdf_url').'?'.$_SERVER["QUERY_STRING"];
+ }
+@@ -11,4 +10,4 @@
+ header('HTTP/1.0 301 Moved Permanently');
+ header('Location: ' . $location . "\n");
+ exit;
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/b2rss.php wordpress-1.0.2-patched/b2rss.php
+--- wordpress-1.0.2/b2rss.php	2004-03-11 19:15:12.000000000 +0000
++++ wordpress-1.0.2-patched/b2rss.php	2004-05-01 11:36:22.726470032 +0100
+@@ -1,7 +1,6 @@
+ <?php
+-$curpath = dirname(__FILE__).'/';
+-require_once ($curpath.'wp-config.php');
+-require_once ($curpath.WPINC.'/template-functions.php');
++require_once ('./wp-config.php');
++require_once ('wp-includes/template-functions.php');
+ if (!empty($_SERVER["QUERY_STRING"])) {
+ 	$location = get_bloginfo('rss_url').'?'.$_SERVER["QUERY_STRING"];
+ }
+@@ -11,4 +10,4 @@
+ header('HTTP/1.0 301 Moved Permanently');
+ header('Location: ' . $location . "\n");
+ exit;
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/b2rss2.php wordpress-1.0.2-patched/b2rss2.php
+--- wordpress-1.0.2/b2rss2.php	2004-03-11 19:15:12.000000000 +0000
++++ wordpress-1.0.2-patched/b2rss2.php	2004-05-01 11:36:46.635835256 +0100
+@@ -1,7 +1,6 @@
+ <?php
+-$curpath = dirname(__FILE__).'/';
+-require_once ($curpath.'wp-config.php');
+-require_once ($curpath.WPINC.'/template-functions.php');
++require_once ('./wp-config.php');
++require_once ('wp-includes/template-functions.php');
+ if (!empty($_SERVER["QUERY_STRING"])) {
+ 	$location = get_bloginfo('rss2_url').'?'.$_SERVER["QUERY_STRING"];
+ }
+@@ -11,4 +10,4 @@
+ header('HTTP/1.0 301 Moved Permanently');
+ header('Location: ' . $location . "\n");
+ exit;
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/index.php wordpress-1.0.2-patched/index.php
+--- wordpress-1.0.2/index.php	2004-03-11 19:15:12.000000000 +0000
++++ wordpress-1.0.2-patched/index.php	2004-05-01 11:37:09.586346248 +0100
+@@ -56,7 +56,7 @@
+ 	<?php trackback_rdf(); ?>
+ 	-->
+ 
+-<?php include(ABSPATH . 'wp-comments.php'); ?>
++<?php include('./wp-comments.php'); ?>
+ </div>
+ 
+ <?php } } else { // end foreach, end if any posts ?>
+@@ -114,4 +114,4 @@
+ 
+ <p class="credit"><!--<?php echo $wpdb->querycount; ?> queries.--> <?php timer_stop(1); ?> || <cite>Powered by <a href="http://wordpress.org" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p>
+ </body>
+-</html>
+\ No newline at end of file
++</html>
+diff -u --recursive wordpress-1.0.2/wp-blog-header.php wordpress-1.0.2-patched/wp-blog-header.php
+--- wordpress-1.0.2/wp-blog-header.php	2004-03-11 19:15:48.000000000 +0000
++++ wordpress-1.0.2-patched/wp-blog-header.php	2004-05-01 11:38:12.799736352 +0100
+@@ -3,7 +3,7 @@
+ $use_cache = 1; // No reason not to
+ 
+ /* Including config and functions files */
+-$curpath = dirname(__FILE__).'/';
++$curpath = '.';
+ 
+ if (!file_exists($curpath . '/wp-config.php'))
+ 	die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='wp-admin/install-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+@@ -363,4 +363,4 @@
+     	}
+ }
+ }
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/wp-comments-post.php wordpress-1.0.2-patched/wp-comments-post.php
+--- wordpress-1.0.2/wp-comments-post.php	2004-03-11 19:15:48.000000000 +0000
++++ wordpress-1.0.2-patched/wp-comments-post.php	2004-05-01 11:38:32.395757304 +0100
+@@ -1,5 +1,5 @@
+ <?php
+-require(dirname(__FILE__) . '/wp-config.php');
++require('./wp-config.php');
+ 
+ function add_magic_quotes($array) {
+ 	foreach ($array as $k => $v) {
+@@ -129,4 +129,4 @@
+ 	die('Sorry, you can only post a new comment once every 10 seconds. Slow down cowboy.');
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/wp-includes/links-update-xml.php wordpress-1.0.2-patched/wp-includes/links-update-xml.php
+--- wordpress-1.0.2/wp-includes/links-update-xml.php	2004-03-11 19:16:07.000000000 +0000
++++ wordpress-1.0.2-patched/wp-includes/links-update-xml.php	2004-05-01 11:39:00.026556784 +0100
+@@ -3,7 +3,7 @@
+ // Copyright (C) 2003 Mike Little -- mike@zed1.com
+ 
+ // Get the path of our parent directory:
+-$parentpath = dirname(dirname(__FILE__));
++$parentpath = "../";
+ 
+ require_once($parentpath.'/wp-config.php');
+ 
+@@ -171,4 +171,4 @@
+ 	//echo('</pre>');
+ } // end if updated cache file
+ 
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/wp-login.php wordpress-1.0.2-patched/wp-login.php
+--- wordpress-1.0.2/wp-login.php	2004-03-11 19:16:10.000000000 +0000
++++ wordpress-1.0.2-patched/wp-login.php	2004-05-01 11:39:15.439213704 +0100
+@@ -1,5 +1,5 @@
+ <?php
+-require(dirname(__FILE__) . '/wp-config.php');
++require('./wp-config.php');
+ 
+ if (!function_exists('add_magic_quotes')) {
+ 	function add_magic_quotes($array) {
+diff -u --recursive wordpress-1.0.2/wp-mail.php wordpress-1.0.2-patched/wp-mail.php
+--- wordpress-1.0.2/wp-mail.php	2004-03-11 19:16:11.000000000 +0000
++++ wordpress-1.0.2-patched/wp-mail.php	2004-05-01 11:40:02.043128832 +0100
+@@ -1,7 +1,7 @@
+ <?php
+-require(dirname(__FILE__) . '/wp-config.php');
++require('./wp-config.php');
+ 
+-require_once(ABSPATH.WPINC.'/class-pop3.php');
++require_once('wp-includes/class-pop3.php');
+ 
+ 
+ timer_start();
+@@ -286,4 +286,4 @@
+ timer_stop($output_debugging_info);
+ exit;
+ 
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/wp-pass.php wordpress-1.0.2-patched/wp-pass.php
+--- wordpress-1.0.2/wp-pass.php	2004-03-11 19:16:11.000000000 +0000
++++ wordpress-1.0.2-patched/wp-pass.php	2004-05-01 11:40:17.169829224 +0100
+@@ -4,8 +4,8 @@
+   It doesn't need to connect to the DB, or do anything fancy at all. Yum.
+   -- Matt
+ */
+-require(dirname(__FILE__) . '/wp-config.php');
++require('./wp-config.php');
+ setcookie('wp-postpass_'.$cookiehash, $HTTP_POST_VARS['post_password'], time()+60*60*24*30);
+ header('Location: ' . $HTTP_SERVER_VARS['HTTP_REFERER']);
+ 
+-?>
+\ No newline at end of file
++?>
+diff -u --recursive wordpress-1.0.2/wp-register.php wordpress-1.0.2-patched/wp-register.php
+--- wordpress-1.0.2/wp-register.php	2004-03-11 19:16:11.000000000 +0000
++++ wordpress-1.0.2-patched/wp-register.php	2004-05-01 11:40:28.837055536 +0100
+@@ -1,5 +1,5 @@
+ <?php
+-require(dirname(__FILE__) . '/wp-config.php');
++require('./wp-config.php');
+ 
+ function add_magic_quotes($array) {
+ 	foreach ($array as $k => $v) {
+@@ -191,4 +191,4 @@
+ <?php
+ 
+ break;
+-}
+\ No newline at end of file
++}
+diff -u --recursive wordpress-1.0.2/wp-trackback.php wordpress-1.0.2-patched/wp-trackback.php
+--- wordpress-1.0.2/wp-trackback.php	2004-03-11 19:16:13.000000000 +0000
++++ wordpress-1.0.2-patched/wp-trackback.php	2004-05-01 11:40:37.655714896 +0100
+@@ -1,5 +1,5 @@
+ <?php
+-require(dirname(__FILE__) . '/wp-config.php');
++require('./wp-config.php');
+ 
+ // trackback is done by a POST
+ $request_array = 'HTTP_POST_VARS';
+@@ -84,4 +84,4 @@
+ 		trackback_response(0);
+ 	}
+ }
+-?>
+\ No newline at end of file
++?>