Version bump, plus security bug release, bug 159229

Package-Manager: portage-2.1.1-r2

3 files changed, 12 insertions, 113 deletions

diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 3b204e1e6a41..3958ad776d82 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -6,19 +6,19 @@ AUX wordpress-2.0.5-templates-sec.diff 705 RMD160 dd753b82f9617371f01f1ae6beec7f
 MD5 46c575c0054a037c74283dc74f782789 files/wordpress-2.0.5-templates-sec.diff 705
 RMD160 dd753b82f9617371f01f1ae6beec7fbaadcde6c9 files/wordpress-2.0.5-templates-sec.diff 705
 SHA256 b7999c11c59dd04e489222657b9303457b9eb943978b0368b01a9bc885e4065a files/wordpress-2.0.5-templates-sec.diff 705
-DIST wordpress-2.0.5.tar.gz 517574 RMD160 dcf6d225c25d74a659717b682827d32ddbfdf939 SHA1 754aed73994043901f40208fd4143cc50a168f34 SHA256 e4bb49dabc68e10e973a23ea86dd5748594f226ddb9298bab823e7dcc3c859cf
-EBUILD wordpress-2.0.5-r1.ebuild 3094 RMD160 241c3675f77be9822749f8a8b69f6dd0105ece37 SHA1 a3cdc473eb45d1a7e1cb8029b7c0a408de687d2c SHA256 519cd5d97fc5037ad376baaf8e58fc5b9c88bba2a4f7f5656af2692fc6f0735c
-MD5 d75a9ddc633e4fd1a4ed8de56b425107 wordpress-2.0.5-r1.ebuild 3094
-RMD160 241c3675f77be9822749f8a8b69f6dd0105ece37 wordpress-2.0.5-r1.ebuild 3094
-SHA256 519cd5d97fc5037ad376baaf8e58fc5b9c88bba2a4f7f5656af2692fc6f0735c wordpress-2.0.5-r1.ebuild 3094
-MISC ChangeLog 11194 RMD160 0beb0045216f491143f9d9aaac93667f5a9795cb SHA1 675c9c2bab73c0763c009dea11184621dc8cc1f8 SHA256 f37e34471d3aa3ab3158f2399cb6e6b0faf62b755dc1b512f301abb6180de616
-MD5 35178253d00d29ad577c46f7759377e8 ChangeLog 11194
-RMD160 0beb0045216f491143f9d9aaac93667f5a9795cb ChangeLog 11194
-SHA256 f37e34471d3aa3ab3158f2399cb6e6b0faf62b755dc1b512f301abb6180de616 ChangeLog 11194
+DIST wordpress-2.0.6.tar.gz 518012 RMD160 294dcb56148694c937386d4a2cc92a523753a135 SHA1 a7841d277ba977437602cf55b747595ec6b11945 SHA256 9c835fb3e72f28ac6babcc4f4159d67d0265ed0b95b33a4fcbcf812b207dfce5
+EBUILD wordpress-2.0.6.ebuild 2960 RMD160 d78c07a8929d26e9869b225e9a8d290869a42f7b SHA1 e44d2c2772ce953fc8359ac58f861e422fa48e4a SHA256 a4f3cee4e900b7262519df4ef459ddb3fb69116aedbaa004df639e0d54bd666d
+MD5 07dd6f96581e48ec83bc2a2c105905d1 wordpress-2.0.6.ebuild 2960
+RMD160 d78c07a8929d26e9869b225e9a8d290869a42f7b wordpress-2.0.6.ebuild 2960
+SHA256 a4f3cee4e900b7262519df4ef459ddb3fb69116aedbaa004df639e0d54bd666d wordpress-2.0.6.ebuild 2960
+MISC ChangeLog 11383 RMD160 3477068d8dba57907f84647635ffd5b81e763fb6 SHA1 53e35e470b24afd404cc210409f4d5fd34c4c7c6 SHA256 0785b6bb6a824235e04234bf9d99dd10bc5a936dabf4e08d68899698b3b85b0a
+MD5 d4367d6764359e0c526a355c18cf9e3f ChangeLog 11383
+RMD160 3477068d8dba57907f84647635ffd5b81e763fb6 ChangeLog 11383
+SHA256 0785b6bb6a824235e04234bf9d99dd10bc5a936dabf4e08d68899698b3b85b0a ChangeLog 11383
 MISC metadata.xml 250 RMD160 a949fd7db409016df176aa9ad2c3a70e8a30fb74 SHA1 c09e27785e1d60437adc54c13347b28e1dd16530 SHA256 c13737189b14763e281f6f246666eaaa576c6b9c0ff85938f052d75bad6ba4a6
 MD5 d2dae098f39db5649196fc948cb7e8fd metadata.xml 250
 RMD160 a949fd7db409016df176aa9ad2c3a70e8a30fb74 metadata.xml 250
 SHA256 c13737189b14763e281f6f246666eaaa576c6b9c0ff85938f052d75bad6ba4a6 metadata.xml 250
-MD5 bc403ca7b0bc83c1c7f4376c722be93b files/digest-wordpress-2.0.5-r1 247
-RMD160 301f71ef3e5544fce4a09e6ec109a8b838af4f7f files/digest-wordpress-2.0.5-r1 247
-SHA256 b30a6bc96388bc6a7307ce2b69a8d638eb22b55deee2579b6444b32455a37bd2 files/digest-wordpress-2.0.5-r1 247
+MD5 6c9d0e3213785d312e3e6e5607c399a4 files/digest-wordpress-2.0.6 247
+RMD160 8755213343986e0f44485368a8646f5698a6ba61 files/digest-wordpress-2.0.6 247
+SHA256 f9d9e2bf5ab034beaf3410223d9fde31c79b220fa9638153fd55342716582d8c files/digest-wordpress-2.0.6 247
diff --git a/www-apps/wordpress/files/digest-wordpress-2.0.5-r1 b/www-apps/wordpress/files/digest-wordpress-2.0.5-r1
deleted file mode 100644
index a64b1f4054c8..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-2.0.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f16ffc47e22ba3540a1e4f32354fae0e wordpress-2.0.5.tar.gz 517574
-RMD160 dcf6d225c25d74a659717b682827d32ddbfdf939 wordpress-2.0.5.tar.gz 517574
-SHA256 e4bb49dabc68e10e973a23ea86dd5748594f226ddb9298bab823e7dcc3c859cf wordpress-2.0.5.tar.gz 517574
diff --git a/www-apps/wordpress/wordpress-2.0.5-r1.ebuild b/www-apps/wordpress/wordpress-2.0.5-r1.ebuild
deleted file mode 100644
index ca403a56b28b..000000000000
--- a/www-apps/wordpress/wordpress-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.0.5-r1.ebuild,v 1.1 2007/01/04 20:16:57 beandog 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 hppa ppc sparc x86"
-IUSE=""
-RDEPEND="virtual/httpd-php
-	 virtual/mysql"
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="2.0.5"
-
-DEPEND="${DEPEND} ${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/wordpress-2.0.5-templates-sec.diff
-}
-
-src_install() {
-	local docs="license.txt readme.html"
-
-	webapp_src_preinst
-
-	einfo "Installing main files"
-	cp wp-config-sample.php wp-config.php
-	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
-
-	ewarn
-	ewarn You will need to create a table for your WordPress database.  This
-	ewarn assumes you have some knowledge of MySQL, and already have it
-	ewarn installed and configured.  If not, please refer to
-	ewarn the Gentoo MySQL guide at the following URL:
-	ewarn http://www.gentoo.org/doc/en/mysql-howto.xml
-	ewarn Log in to MySQL, and create a new database called
-	ewarn "wordpress". From this point, you will need to edit
-	ewarn your wp-config.php file in $DocumentRoot/wordpress/
-	ewarn and point to your database. Once this is done, you can log in to
-	ewarn WordPress at http://localhost/wordpress
-	ewarn
-
-	ewarn
-	ewarn If you are upgrading from a previous version BACK UP your
-	ewarn database.  Once you are done with that, browse to
-	ewarn http://localhost/wordpress/wp-admin/upgrade.php and follow
-	ewarn the instructions on the screen.
-	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}
-	webapp_configfile  ${MY_HTDOCSDIR}/wp-config.php
-	# 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
-
-}