Removed vulnerable wordpress-2.5.1, -2.6, added 2.6.2 (#237406).

Package-Manager: portage-2.1.4.4

4 files changed, 19 insertions, 55 deletions

diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
index e9f8a39cc50b..ebbf9910d087 100644
--- a/www-apps/ampache/Manifest
+++ b/www-apps/ampache/Manifest
@@ -1,7 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX installdoc.txt 223 RMD160 204d2be3f0c8838a4bfa168824d34014b685da0c SHA1 3e40f1855deae4a8226689957a394625707ee533 SHA256 ad163088081a596b3fb1b08ae1c606dbea558f839377d6a19268f4e958acf53e
-DIST ampache-3.3.3.5.tar.gz 1820523 RMD160 7b803391cc0561fe77ad925878265aeaef0680c5 SHA1 2b61c465e87ee7913b6e93e4a9e335da3bd14df4 SHA256 3968ff3efcdbb11fb87ea68d06a722ebef8c59b616a4dacdefd5eaa8588627b4
 DIST ampache-3.4.3.tar.gz 1414765 RMD160 e11eeac971c1f6e52c5d1ed85fc043244ffb5c59 SHA1 87fd031f0e424a273f4e4bb7f2405cc72a5e0d00 SHA256 001b34abb77a830ce5f67d9823b8fbeba75a517b577c650349843854deb8d0eb
-EBUILD ampache-3.3.3.5.ebuild 841 RMD160 b207c0f220888187e809456c75f65751baaf225a SHA1 aad81aeb5865e759b9d883f7358318bc21d0d1dd SHA256 ba5c1f7e679d69b8e61a316e71515df136828657739ab7c71a2332064f3486b2
 EBUILD ampache-3.4.3.ebuild 843 RMD160 f8d5555c8ebe386f77aa1ac85557d4c87005021e SHA1 357c297d179a087c6e58f49af25dbb255f3f6f71 SHA256 98ba5d94d105be387c1226b7dfa29380e66bd4183bdf0066973bad01c524d92b
-MISC ChangeLog 6956 RMD160 9d799b15d7c6ee871d90b07a7c8c66c0501cdf0a SHA1 66d5ba380babbb1a464d074f7dc5b4fdab538567 SHA256 b3aba65a2ea8214346eb970a43978864cda8f53087d3d275cc0f015c6461f5c0
+MISC ChangeLog 7059 RMD160 2711d55e6c4e2a6b11bdd9f6642b77950ffa6894 SHA1 528e2b25855e58010e54ef43e50d140ddb5a67b5 SHA256 6dc36ff2c2128149bca995d8cb7b4f9638b2f4de43afc4117c3d8ba28bdb8a79
 MISC metadata.xml 260 RMD160 941f56517ab158046b6f3faa37b87ab86f5f157b SHA1 95a7d3283c195b1933d7b3310a4ae151aa9de998 SHA256 92d82efa2893062cabea389606b0a06706bbc25b7761c0167af2a8e402e7fbb8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFI1kx7EEcxCpcDQ74RAizjAJ9lPRQC0SP9R3qnpiZzbwHP+tY5egCfb46Y
+7SJX0ed3HBWHVMSsZaeh4Z8=
+=IAOc
+-----END PGP SIGNATURE-----
diff --git a/www-apps/wordpress/ChangeLog b/www-apps/wordpress/ChangeLog
index 4b3c78450166..0ef0a1510324 100644
--- a/www-apps/wordpress/ChangeLog
+++ b/www-apps/wordpress/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/wordpress
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.93 2008/08/01 17:24:58 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/ChangeLog,v 1.94 2008/09/21 13:28:32 wrobel Exp $
+
+*wordpress-2.6.2 (21 Sep 2008)
+
+  21 Sep 2008; wrobel@gentoo.org -wordpress-2.5.1.ebuild,
+  -wordpress-2.6.ebuild, +wordpress-2.6.2.ebuild:
+  Removed vulnerable wordpress-2.5.1, -2.6, added 2.6.2 (#237406).
 
 *wordpress-2.6 (01 Aug 2008)
 
diff --git a/www-apps/wordpress/wordpress-2.5.1.ebuild b/www-apps/wordpress/wordpress-2.6.2.ebuild
index 8e431ab9dbb9..b5f53fbfb2d9 100644
--- a/www-apps/wordpress/wordpress-2.5.1.ebuild
+++ b/www-apps/wordpress/wordpress-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.5.1.ebuild,v 1.1 2008/04/27 06:03:25 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.6.2.ebuild,v 1.1 2008/09/21 13:28:32 wrobel Exp $
 
 inherit webapp depend.php
 
diff --git a/www-apps/wordpress/wordpress-2.6.ebuild b/www-apps/wordpress/wordpress-2.6.ebuild
deleted file mode 100644
index da1f719ba720..000000000000
--- a/www-apps/wordpress/wordpress-2.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/wordpress/wordpress-2.6.ebuild,v 1.1 2008/08/01 17:24:58 wrobel Exp $
-
-inherit webapp 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=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}"/${PN}
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_any_use mysql mysqli
-	require_php_with_use pcre
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml readme.html
-	rm -f readme.html license.txt
-
-	cp wp-config-sample.php wp-config.php
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
-	webapp_serverowned "${MY_HTDOCSDIR}"
-
-	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}