Security bumps, bug 168529

(Portage version: 2.1.2.11)

9 files changed, 17 insertions, 101 deletions

diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index a1efa102ab95..e7b40e2db20c 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.83 2007/07/07 08:36:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.84 2007/08/11 22:17:01 beandog Exp $
+
+*wordpress-2.2.2 (11 Aug 2007)
+*wordpress-2.0.11 (11 Aug 2007)
+
+  11 Aug 2007; Steve Dibb <beandog@gentoo.org> -wordpress-2.0.10.ebuild,
+  +wordpress-2.0.11.ebuild, -wordpress-2.1.3.ebuild,
+  -wordpress-2.2.1.ebuild, +wordpress-2.2.2.ebuild:
+  Security bumps, bug 168529
 
 *wordpress-2.2.1 (07 Jul 2007)
 
diff --git a/www-apps/wordpress/files/digest-wordpress-2.0.10 b/www-apps/wordpress/files/digest-wordpress-2.0.10
deleted file mode 100644
index ce4c36691cfa..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-2.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9d5373b3c6413791f864d56b473dd54 wordpress-2.0.10.tar.gz 520314
-RMD160 bfaca186fbbf5790b9d407d3186d7a4e0add4582 wordpress-2.0.10.tar.gz 520314
-SHA256 52c903d40196ed1cc563ec48320ddeb943e635029df23e4503fd07f1bc59636c wordpress-2.0.10.tar.gz 520314
diff --git a/www-apps/wordpress/files/digest-wordpress-2.0.11 b/www-apps/wordpress/files/digest-wordpress-2.0.11
new file mode 100644
index 000000000000..f815767abe4f
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-2.0.11
@@ -0,0 +1,3 @@
+MD5 9f98be0f062a496f5648b81c5e25df40 wordpress-2.0.11.tar.gz 520667
+RMD160 c276b5572750acc6217afc1777a4ea99985e5932 wordpress-2.0.11.tar.gz 520667
+SHA256 e705d6658652d479b3b44a26c900b4243b2a86698b15d0681a1e1b8f2a8feaa1 wordpress-2.0.11.tar.gz 520667
diff --git a/www-apps/wordpress/files/digest-wordpress-2.1.3 b/www-apps/wordpress/files/digest-wordpress-2.1.3
deleted file mode 100644
index fcdc501b54c5..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-2.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d480bcaff18c4751eda572be878ef7bc wordpress-2.1.3.tar.gz 695489
-RMD160 66257df248117bcacfd2cea0591fce2d557c1cf0 wordpress-2.1.3.tar.gz 695489
-SHA256 ba30533a836e9fb56ddc8dd3c629990c3894c5cb17ffbea2a906a9887cb07564 wordpress-2.1.3.tar.gz 695489
diff --git a/www-apps/wordpress/files/digest-wordpress-2.2.1 b/www-apps/wordpress/files/digest-wordpress-2.2.1
deleted file mode 100644
index d5a2ce6f6b9d..000000000000
--- a/www-apps/wordpress/files/digest-wordpress-2.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2670e28b2ebfe165278ce03ff75fa06 wordpress-2.2.1.tar.gz 822006
-RMD160 d89b8d82be5370c99e32b503add6299928caf59c wordpress-2.2.1.tar.gz 822006
-SHA256 eb806a2cb4297064ffa37dce185a4176160b8365c08355b4b36ac521fe3005e7 wordpress-2.2.1.tar.gz 822006
diff --git a/www-apps/wordpress/files/digest-wordpress-2.2.2 b/www-apps/wordpress/files/digest-wordpress-2.2.2
new file mode 100644
index 000000000000..fbd45dcfa506
--- /dev/null
+++ b/www-apps/wordpress/files/digest-wordpress-2.2.2
@@ -0,0 +1,3 @@
+MD5 a87666c6fe6cb4db94e2ae0531e5b633 wordpress-2.2.2.tar.gz 822143
+RMD160 76d2d0158df9e693348a77c09271d98a6782569f wordpress-2.2.2.tar.gz 822143
+SHA256 044623ea63cc383d06da2985f29751b8c7795f877ee830b69f925fc125f88fae wordpress-2.2.2.tar.gz 822143
diff --git a/www-apps/wordpress/wordpress-2.0.10.ebuild b/www-apps/wordpress/wordpress-2.0.11.ebuild
index 4ade01524179..736a34e6d5ac 100644
--- a/www-apps/wordpress/wordpress-2.0.10.ebuild
+++ b/www-apps/wordpress/wordpress-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # 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.10.ebuild,v 1.1 2007/04/10 13:16:54 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.0.11.ebuild,v 1.1 2007/08/11 22:17:01 beandog Exp $
 
 inherit webapp eutils depend.php
 
diff --git a/www-apps/wordpress/wordpress-2.2.1.ebuild b/www-apps/wordpress/wordpress-2.2.1.ebuild
deleted file mode 100644
index 2b5bd1189e78..000000000000
--- a/www-apps/wordpress/wordpress-2.2.1.ebuild
+++ /dev/null
@@ -1,89 +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.2.1.ebuild,v 1.1 2007/07/07 08:36:19 dertobi123 Exp $
-
-inherit webapp eutils depend.php
-
-DESCRIPTION="Wordpress php and mysql based CMS system."
-HOMEPAGE="http://wordpress.org/"
-SRC_URI="http://www.wordpress.org/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	require_php_with_any_use mysql mysqli
-	require_php_with_use pcre
-}
-
-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
-}
diff --git a/www-apps/wordpress/wordpress-2.1.3.ebuild b/www-apps/wordpress/wordpress-2.2.2.ebuild
index ac80b9620ae6..1a2b076b7109 100644
--- a/www-apps/wordpress/wordpress-2.1.3.ebuild
+++ b/www-apps/wordpress/wordpress-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.3.ebuild,v 1.1 2007/04/10 13:16:54 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.2.2.ebuild,v 1.1 2007/08/11 22:17:01 beandog Exp $
 
 inherit webapp eutils depend.php