Version bump; fixes bug #65798

4 files changed, 88 insertions, 6 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 167d344e4b65..ce6c7717988b 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.4 2004/09/08 13:12:50 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.5 2004/10/08 20:17:13 stuart Exp $
+
+*wordpress-1.2.1 (08 Oct 2004)
+
+  08 Oct 2004; Stuart Herbert <stuart@gentoo.org> +wordpress-1.2.1.ebuild:
+  Version bump; fixes security bug #65798; thanks to Peter Westwood
+  <peter.westwood@ftwr.co.uk> for testing
 
   08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
   Fixed herd name
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 00a459b0ad39..d69dd2a34254 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,11 +1,15 @@
-MD5 1acdc936072c448db841db8067b1ff90 wordpress-1.2-r1.ebuild 1935
-MD5 0aaa512ade97b7734981cc159d205106 wordpress-1.2.ebuild 1932
 MD5 eac690be38509dbf2c3437042bf30eda ChangeLog 2449
-MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 11ed2b98b5625fc3366ef084526d663e wordpress-1.0.2.ebuild 1959
-MD5 8798d44320b59c755a81271d58bd3827 files/wordpress-1.0.2.gentoo.diff 7670
-MD5 60c89171f6db7c359da81d9bd4a78853 files/digest-wordpress-1.2-r1 72
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
+MD5 0aaa512ade97b7734981cc159d205106 wordpress-1.2.ebuild 1932
+MD5 1acdc936072c448db841db8067b1ff90 wordpress-1.2-r1.ebuild 1935
+MD5 ad211a47cb142569d174ddb8dbb44910 wordpress-1.2.1.ebuild 1930
 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 ddf9ce79b3f5375fbd1a1d7d7f1ecc0d files/digest-wordpress-1.2.1 67
 MD5 c2b531747ebb18f8bc7eed6261710c66 files/1.2/postinstall-en.txt 490
 MD5 bf77b16b46337e5eb66a5fb42c3b263d files/1.2/login-patch.diff 2062
+MD5 6c80f1e7f474c6a87d67fe8095a29e9f files/1.2.1/login-patch.diff 569
+MD5 c2b531747ebb18f8bc7eed6261710c66 files/1.2.1/postinstall-en.txt 490
diff --git a/www-apps/wordpress/files/digest-wordpress-1.2.1 b/www-apps/wordpress/files/digest-wordpress-1.2.1
new file mode 100644
index 000000000000..562cdc1810ac
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-1.2.1
@@ -0,0 +1 @@
+MD5 603226176b30bdfa6dc80f6b815d5ba5 wordpress-1.2.1.tar.gz 238639
diff --git a/www-apps/wordpress/wordpress-1.2.1.ebuild b/www-apps/wordpress/wordpress-1.2.1.ebuild
new file mode 100644
index 000000000000..4ab5929401f7
--- /dev/null
+++ b/www-apps/wordpress/wordpress-1.2.1.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/www-apps/wordpress/wordpress-1.2.1.ebuild,v 1.1 2004/10/08 20:17:13 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 blog system."
+HOMEPAGE="http://wordpress.org/"
+SRC_URI="mirror://sourceforge/cafelog/${P}.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}/${PV}/postinstall-en.txt
+
+	# now strut stuff
+	webapp_src_install
+}