Security bumps, bug 168529

Package-Manager: portage-2.1.2.11

10 files changed, 37 insertions, 129 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/Manifest b/www-apps/wordpress/Manifest
index ce658eefc88d..1c118ecb6ed9 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -2,35 +2,27 @@ AUX dummy-templates.php 269 RMD160 7f1362f12b8c73ac8a371e5b00b7d31e7bc36438 SHA1
 MD5 f816ff62dcd7cadf0fae9384ab9618e5 files/dummy-templates.php 269
 RMD160 7f1362f12b8c73ac8a371e5b00b7d31e7bc36438 files/dummy-templates.php 269
 SHA256 3f7a088aa968469652690f47a2d598bd35e8f87e741f322fcb2d5063c8c88e48 files/dummy-templates.php 269
-DIST wordpress-2.0.10.tar.gz 520314 RMD160 bfaca186fbbf5790b9d407d3186d7a4e0add4582 SHA1 46cc11a76d61e2dd51191008e3894a921466cb67 SHA256 52c903d40196ed1cc563ec48320ddeb943e635029df23e4503fd07f1bc59636c
-DIST wordpress-2.1.3.tar.gz 695489 RMD160 66257df248117bcacfd2cea0591fce2d557c1cf0 SHA1 f8e767c17e4de7d985d89aa3cdfa6d5d9aa6b566 SHA256 ba30533a836e9fb56ddc8dd3c629990c3894c5cb17ffbea2a906a9887cb07564
-DIST wordpress-2.2.1.tar.gz 822006 RMD160 d89b8d82be5370c99e32b503add6299928caf59c SHA1 9014fe17c1f8913ca89b2e1de67ca9bb4df26bfd SHA256 eb806a2cb4297064ffa37dce185a4176160b8365c08355b4b36ac521fe3005e7
-EBUILD wordpress-2.0.10.ebuild 2789 RMD160 76a9df42e6b2c8737fd39683d053f7e3d0a53398 SHA1 c510434723cee9df97c9fddcd57b0426d0a5492a SHA256 e476f2b54abd64a2d300fc1704d2b7a4466c59973e611d81368911c92e15473d
-MD5 59a2a1956ab564cc404568cd47ff0d51 wordpress-2.0.10.ebuild 2789
-RMD160 76a9df42e6b2c8737fd39683d053f7e3d0a53398 wordpress-2.0.10.ebuild 2789
-SHA256 e476f2b54abd64a2d300fc1704d2b7a4466c59973e611d81368911c92e15473d wordpress-2.0.10.ebuild 2789
-EBUILD wordpress-2.1.3.ebuild 2795 RMD160 5c4b2d01e2313c6e3a10e34cc92316c5d12a6408 SHA1 3e7dbf57923ed8f7001e5df1c004d01ad1179f71 SHA256 27f213991b9627f4aece91de5aedacea9e03c25944fda5fc62a24e19b65b7cc4
-MD5 d4effa5523091531bdeffc6be66d08bf wordpress-2.1.3.ebuild 2795
-RMD160 5c4b2d01e2313c6e3a10e34cc92316c5d12a6408 wordpress-2.1.3.ebuild 2795
-SHA256 27f213991b9627f4aece91de5aedacea9e03c25944fda5fc62a24e19b65b7cc4 wordpress-2.1.3.ebuild 2795
-EBUILD wordpress-2.2.1.ebuild 2798 RMD160 b2a43bf6fe8a48a782b61533409d002a00ef3472 SHA1 d3bd0455b4f0daaf9072680f6f4517e3cbe06896 SHA256 88b3c3d821d9525f7c838720a589c094eda66e2407194747bace19945bd76c63
-MD5 54ebe1ad8f215a02e03b1c008e5bc22e wordpress-2.2.1.ebuild 2798
-RMD160 b2a43bf6fe8a48a782b61533409d002a00ef3472 wordpress-2.2.1.ebuild 2798
-SHA256 88b3c3d821d9525f7c838720a589c094eda66e2407194747bace19945bd76c63 wordpress-2.2.1.ebuild 2798
-MISC ChangeLog 13622 RMD160 099f18a76ed92e9049ee167eb0c48f238d95ef82 SHA1 62239e3055b99c49cf62d67aaf433fd8223f6938 SHA256 85c8b3458485c9baae210a3951dc035b325b16d65cc2a798b5432aa494a01c65
-MD5 56ddf2ad884b86d0b8fd2a1e6be1a65f ChangeLog 13622
-RMD160 099f18a76ed92e9049ee167eb0c48f238d95ef82 ChangeLog 13622
-SHA256 85c8b3458485c9baae210a3951dc035b325b16d65cc2a798b5432aa494a01c65 ChangeLog 13622
+DIST wordpress-2.0.11.tar.gz 520667 RMD160 c276b5572750acc6217afc1777a4ea99985e5932 SHA1 2e0c5a2e0338b986190b3d547767476be95d0971 SHA256 e705d6658652d479b3b44a26c900b4243b2a86698b15d0681a1e1b8f2a8feaa1
+DIST wordpress-2.2.2.tar.gz 822143 RMD160 76d2d0158df9e693348a77c09271d98a6782569f SHA1 2ab690dea011f9addcda18ef6579cdc93b7af3fc SHA256 044623ea63cc383d06da2985f29751b8c7795f877ee830b69f925fc125f88fae
+EBUILD wordpress-2.0.11.ebuild 2789 RMD160 33f9891727214cc491969c6139acd4cec710a0a6 SHA1 65f12ad4ea5a82399d54f439650e2be51ad7f8ce SHA256 2d2a664fc9960b37cb5de0264b3286e67abbce6a4688a95072c2e72b28a32f7b
+MD5 6232d0446611495eb48ee1ed1a2639a1 wordpress-2.0.11.ebuild 2789
+RMD160 33f9891727214cc491969c6139acd4cec710a0a6 wordpress-2.0.11.ebuild 2789
+SHA256 2d2a664fc9960b37cb5de0264b3286e67abbce6a4688a95072c2e72b28a32f7b wordpress-2.0.11.ebuild 2789
+EBUILD wordpress-2.2.2.ebuild 2795 RMD160 b4bd8ec41b2af6fec0aa3327a7d27f70dd3d5daf SHA1 7f0d286c23004c22ef22194409ee5517f030e05c SHA256 012c8919009dd49050a8a15d8f522fcc46f67300ca33ec706bfbae195de0bec5
+MD5 c627887fa24f1a1eabb9739ffaa1a510 wordpress-2.2.2.ebuild 2795
+RMD160 b4bd8ec41b2af6fec0aa3327a7d27f70dd3d5daf wordpress-2.2.2.ebuild 2795
+SHA256 012c8919009dd49050a8a15d8f522fcc46f67300ca33ec706bfbae195de0bec5 wordpress-2.2.2.ebuild 2795
+MISC ChangeLog 13891 RMD160 172500ab00ffd86834d47d6ece45a3f0cdaa1d69 SHA1 c2b69c3d95147710f092ba69e895ccbcff23ce0b SHA256 fca1ee00b757be4cec33a6c01493692161e4c9d12ae532efb113f0381361e712
+MD5 45bda18e4e5e7594143ddf9adb353dcb ChangeLog 13891
+RMD160 172500ab00ffd86834d47d6ece45a3f0cdaa1d69 ChangeLog 13891
+SHA256 fca1ee00b757be4cec33a6c01493692161e4c9d12ae532efb113f0381361e712 ChangeLog 13891
 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 b28fdbece1b615ec24f73826601abb21 files/digest-wordpress-2.0.10 250
-RMD160 c3ed2a0db9fb3c2b4f134148298dc8ca36bc4686 files/digest-wordpress-2.0.10 250
-SHA256 1bf949b875d3c566041e2076625980529e31d3e3416284b2ad85b70502c1404f files/digest-wordpress-2.0.10 250
-MD5 60a209bfe0fcad51505e14a0f9b67ca2 files/digest-wordpress-2.1.3 247
-RMD160 f600f1b96726e5ddd4290c04c90ae7f7df8d3f91 files/digest-wordpress-2.1.3 247
-SHA256 87428a4ce9cfacbdf1bdf555b50cb4d24e6c9fb3ad57f4e37b6a82ac793ef27d files/digest-wordpress-2.1.3 247
-MD5 fdfc9ad729af72119be2e259b3bac298 files/digest-wordpress-2.2.1 247
-RMD160 d98bdd387121794e0035961eee7b67af19752233 files/digest-wordpress-2.2.1 247
-SHA256 a6e9dffbb22bf2e87718b1f96394efba684fdce37540cf4cd5e5a7dae2fff2e2 files/digest-wordpress-2.2.1 247
+MD5 25fd40fbe832792ce81f9815268d831c files/digest-wordpress-2.0.11 250
+RMD160 f67e743d7cd2839134f43cc95711746e6d39cb26 files/digest-wordpress-2.0.11 250
+SHA256 2c0e98d898bbfe8b3bf6c63142e01cc033b68ab6f177de69b54235a3f6bacedf files/digest-wordpress-2.0.11 250
+MD5 84076c39e2dbd947412b601ee5c0d4fe files/digest-wordpress-2.2.2 247
+RMD160 fa182108b2e73a3e8520eb2eeba2bb100120f7f7 files/digest-wordpress-2.2.2 247
+SHA256 d92c5e38055842d222ee66a9c4a3a69a009734553a44b60e4f26bc303449c37f files/digest-wordpress-2.2.2 247
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