Fix for bug #53563; thanks to Kai Groner <kai@ubergeeks.com> for the fix

5 files changed, 84 insertions, 4 deletions

diff --git a/net-www/wordpress/ChangeLog b/net-www/wordpress/ChangeLog
index 6f3865f6c653..f96d72a9f972 100644
--- a/net-www/wordpress/ChangeLog
+++ b/net-www/wordpress/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/wordpress
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/wordpress/ChangeLog,v 1.6 2004/07/20 22:19:20 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wordpress/ChangeLog,v 1.7 2004/08/08 10:46:37 stuart Exp $
+
+*wordpress-1.2-r1 (08 Aug 2004)
+
+  08 Aug 2004; Stuart Herbert <stuart@gentoo.org> files/1.2/login-patch.diff,
+  +wordpress-1.2-r1.ebuild:
+  Improved login patch; thanks to Kai Groner <kai@ubergeeks.com>
 
   20 Jul 2004; Stuart Herbert <stuart@gentoo.org> files/1.2/login-patch.diff:
   New login patch; this one works for me on Konquerer and Mozilla
diff --git a/net-www/wordpress/Manifest b/net-www/wordpress/Manifest
index 1d4bf29c5624..361b06b75c08 100644
--- a/net-www/wordpress/Manifest
+++ b/net-www/wordpress/Manifest
@@ -1,9 +1,11 @@
-MD5 355bc43c8f820a5e289dfdcdfc7ce2ea ChangeLog 1290
+MD5 466144f1c1091f2f9be0189696ca3133 ChangeLog 1495
 MD5 9d471cc484027d6985487e1f0064643f wordpress-1.0.2.ebuild 1959
 MD5 3d182d43f7f0341a9a42f96694f04e72 metadata.xml 224
 MD5 854b49269847305ac5b9d202007ee6e2 wordpress-1.2.ebuild 1930
+MD5 b76db346dcc1b670f7a8b07425673c62 wordpress-1.2-r1.ebuild 1933
 MD5 3310de51163cfb2a4b23c784003c123d files/digest-wordpress-1.0.2 74
 MD5 8798d44320b59c755a81271d58bd3827 files/wordpress-1.0.2.gentoo.diff 7670
 MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2 72
+MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2-r1 72
 MD5 c2b531747ebb18f8bc7eed6261710c66 files/1.2/postinstall-en.txt 490
-MD5 831533425b7654ea6ace6c302d06901f files/1.2/login-patch.diff 2048
+MD5 bf77b16b46337e5eb66a5fb42c3b263d files/1.2/login-patch.diff 2062
diff --git a/net-www/wordpress/files/1.2/login-patch.diff b/net-www/wordpress/files/1.2/login-patch.diff
index 96d03a76baea..2ed450fc1705 100644
--- a/net-www/wordpress/files/1.2/login-patch.diff
+++ b/net-www/wordpress/files/1.2/login-patch.diff
@@ -63,7 +63,7 @@ diff -u --recursive wordpress/wp-login.php diary/wp-login.php
  		$userdata = get_userdatabylogin($user_login);
  
 -		if ($user_pass_md5 != md5($userdata->user_pass)) {
-+		if ($user_pass_md5 != $userdata->user_pass) {
++		if (!$userdata || $user_pass_md5 != $userdata->user_pass) {
  			return false;
  		} else {
  			return true;
diff --git a/net-www/wordpress/files/digest-wordpress-1.2-r1 b/net-www/wordpress/files/digest-wordpress-1.2-r1
new file mode 100644
index 000000000000..8f1647645808
--- /dev/null
+++ b/net-www/wordpress/files/digest-wordpress-1.2-r1
@@ -0,0 +1 @@
+MD5 1ba3cde7b7245d4cadc4a31d067dfa46 wordpress-1.2-mingus.tar.gz 247985
diff --git a/net-www/wordpress/wordpress-1.2-r1.ebuild b/net-www/wordpress/wordpress-1.2-r1.ebuild
new file mode 100644
index 000000000000..234bfe65b8dc
--- /dev/null
+++ b/net-www/wordpress/wordpress-1.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/wordpress/wordpress-1.2-r1.ebuild,v 1.1 2004/08/08 10:46:37 stuart Exp $
+# Mostly ripped off from the squirrelmail ebuild!
+# By Peter Westwood <peter.westwood@ftwr.co.uk>
+
+inherit webapp eutils
+
+#Wordpress releases have a release name tagged on the end of the version on the tar.gz files
+MY_EXT="mingus"
+
+DESCRIPTION="Wordpress php and mysql based CMS system."
+HOMEPAGE="http://wordpress.org/"
+SRC_URI="mirror://sourceforge/cafelog/${P}-${MY_EXT}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE=""
+RDEPEND=">=dev-php/mod_php-4.1
+	 >=dev-db/mysql-3.23.23"
+
+DEPEND="${DEPEND} ${RDEPEND} >=net-www/webapp-config-1.10-r5"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}/login-patch.diff
+}
+
+src_install() {
+	local docs="license.txt readme.html"
+
+	webapp_src_preinst
+
+	einfo "Installing main files"
+	cp -r * ${D}${MY_HTDOCSDIR}
+	einfo "Done"
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	dodoc ${docs}
+	for doc in ${docs} INSTALL; do
+		rm -f ${doc}
+	done
+
+	# Identify the configuration files that this app uses
+	# User can want to make changes to these!
+	webapp_serverowned ${MY_HTDOCSDIR}/index.php
+	webapp_serverowned ${MY_HTDOCSDIR}/wp-layout.css
+	webapp_serverowned ${MY_HTDOCSDIR}/wp-admin/menu.php
+	webapp_serverowned ${MY_HTDOCSDIR}
+
+	# Identify any script files that need #! headers adding to run under
+	# a CGI script (such as PHP/CGI)
+	#
+	# for wordpress, we *assume* that all .php files need to have CGI/BIN
+	# support added
+
+	for x in `find . -name '*.php' -print ` ; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
+	done
+
+	# post-install instructions
+	webapp_postinst_txt en ${FILESDIR}/1.2/postinstall-en.txt
+
+	# now strut stuff
+	webapp_src_install
+}