Version bump. Patched up nice to kill u bug #102002

(Portage version: 2.0.51.22-r2)

4 files changed, 91 insertions, 14 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index cc94659fefde..6e611237a902 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.24 2005/07/20 20:30:56 superlag Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.25 2005/08/15 05:25:00 superlag Exp $
+
+*wordpress-1.5.2 (15 Aug 2005)
+
+  15 Aug 2005; Aaron Kulbe <superlag@gentoo.org> +wordpress-1.5.2.ebuild:
+  Version bump. Cleans up issues in bug #102002
 
   20 Jul 2005; Aaron Kulbe <superlag@gentoo.org> wordpress-1.5.1.3.ebuild:
   Tidy up all vulnerable versions: -wordpress-1.2.2.ebuild
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 29d7e2be5967..7671602015a3 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 450a2951b91e071e7eb0c6d32d507c8a wordpress-1.5.2.ebuild 2323
+MD5 28945cdb797167f203a455789d60ed89 wordpress-1.5.1.3.ebuild 2053
 MD5 5e57d1e990cffd8abfb750f35b284c57 ChangeLog 5611
-MD5 01d53342f3a1885d4067674e6d8feb5b files/digest-wordpress-1.5.1.3 69
-MD5 f816ff62dcd7cadf0fae9384ab9618e5 files/dummy-templates.php 269
 MD5 bed9c007e8ee867414a21e2da8e92b3f metadata.xml 252
-MD5 28945cdb797167f203a455789d60ed89 wordpress-1.5.1.3.ebuild 2053
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3s8sI1lqEGTUzyQRAhGaAJ9qqPoOxMDkQ0nheHOGdBTTDEyD0ACeJj7G
-O2N4BjkWGNr1DFsZZLYGiXk=
-=LmTK
------END PGP SIGNATURE-----
+MD5 f816ff62dcd7cadf0fae9384ab9618e5 files/dummy-templates.php 269
+MD5 77f6e444886a1c9d39719c96d87ed625 files/digest-wordpress-1.5.2 67
+MD5 01d53342f3a1885d4067674e6d8feb5b files/digest-wordpress-1.5.1.3 69
diff --git a/www-apps/wordpress/files/digest-wordpress-1.5.2 b/www-apps/wordpress/files/digest-wordpress-1.5.2
new file mode 100644
index 000000000000..7d4bdd1dc468
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-1.5.2
@@ -0,0 +1 @@
+MD5 680e6381c8111f555a2c7066ddafd575 wordpress-1.5.2.tar.gz 298514
diff --git a/www-apps/wordpress/wordpress-1.5.2.ebuild b/www-apps/wordpress/wordpress-1.5.2.ebuild
new file mode 100644
index 000000000000..77f728d04a58
--- /dev/null
+++ b/www-apps/wordpress/wordpress-1.5.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-1.5.2.ebuild,v 1.1 2005/08/15 05:25:00 superlag Exp $
+
+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/"
+#Latest version is only available in the format!
+#Download is renamed by HTTP Header as wordpress-<version number>.tar.gz
+SRC_URI=mirror://gentoo/${P}.tar.gz
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+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}
+# no patch needed anymore
+#	epatch ${FILESDIR}/${PV}/login-patch.diff
+}
+
+src_install() {
+	local docs="license.txt readme.html"
+
+	webapp_src_preinst
+
+	# remove wp-admin/templates.php (XSS exploit).  See bug #88926.
+	rm -f wp-admin/templates.php
+	cp ${FILESDIR}/dummy-templates.php wp-admin/templates.php
+
+	einfo "Installing main files"
+	cp -r * ${D}${MY_HTDOCSDIR}
+	einfo "Done"
+
+	ewarn *
+	ewarn * Please make sure you have register_globals = off set in your /etc/apache2/php.ini file
+	ewarn * If this is not an option for your web server and you NEED it set to on, then insert the following in your WordPress .htaccess file:
+	ewarn * php_flag register_globals off
+	ewarn *
+
+	# 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
+
+	# post-install instructions
+	#webapp_postinst_txt en ${FILESDIR}/1.2/postinstall-en.txt
+
+	# now strut stuff
+	webapp_src_install
+
+}