Version bump to fix security issue #376689. Drop old.

Package-Manager: portage-2.1.10/cvs/Linux x86_64

5 files changed, 11 insertions, 153 deletions

diff --git a/www-apps/drupal/ChangeLog b/www-apps/drupal/ChangeLog
index 5c2b8ec374e9..ae56d15b230f 100644
--- a/www-apps/drupal/ChangeLog
+++ b/www-apps/drupal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/drupal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.72 2011/07/08 00:14:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/ChangeLog,v 1.73 2011/07/28 08:51:23 pva Exp $
+
+*drupal-7.7 (28 Jul 2011)
+
+  28 Jul 2011; Peter Volkov <pva@gentoo.org> -drupal-6.20.ebuild,
+  -drupal-7.0.ebuild, -drupal-7.2.ebuild, +drupal-7.7.ebuild:
+  Version bump to fix security issue #376689. Drop old.
 
 *drupal-7.4 (08 Jul 2011)
 
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 3569762a315d..85d744e0b298 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX postinstall-en.txt 830 RMD160 4997cbee7b19d60dd0c36f2b5060f0526221fe1a SHA1 1474f5012ddcbf49a6e624de50562d6988d8dd43 SHA256 ff1b9004e65d7a46a7d94b23e2ea90563d5703f2afb45b9dec6ff7e750e788dc
 DIST drupal-5.23.tar.gz 768263 RMD160 3ef5e809d522efc7c91c2cfae564c3e6af3525b4 SHA1 9b70b5822a34d6ec9b97214675b1443c265ef481 SHA256 c7590400ebb2fff6e6cbee512a514cf0d9cb875940ce916e2cffeab606e06762
-DIST drupal-6.20.tar.gz 1100246 RMD160 04f5f014f783bd508537ea0e838e3b8243e67b01 SHA1 948f26f7c52aade0f1d7ac7dd36f358b1afd4ef7 SHA256 8403a06c1887c0821a78da4af3a5d3cbff43773c22c5cc63542d89b645ba4d8b
 DIST drupal-6.22.tar.gz 1100999 RMD160 42cb64a32ca457779e498ef8edb952e04f8b2c86 SHA1 a67acdb606aabbd9da6ddd2c016d43bb9ec17431 SHA256 d43da1858bfb8211a26ad7f749cce8cc3ae701fd28b13502cf5daef51d31f021
-DIST drupal-7.0.tar.gz 2728271 RMD160 fd27d5f4b826fb818d6b35754b2ea6b548445369 SHA1 124911c7de07b5acd1f801c4a7093440a0e0e3d3 SHA256 62e4146b2a2208d0772cef6578205b369f361b2079bf3fa9408e92f5419902e8
-DIST drupal-7.2.tar.gz 2731345 RMD160 c839936fc0c7480c8b11f2305540c49981370a5f SHA1 4a0d43081ed2615a9a06eac8188257e6e3d67174 SHA256 d318fcf6b788aa76801bbd8b049b57715e57788c7b4a57858aff8a5323a9c44c
 DIST drupal-7.4.tar.gz 2744808 RMD160 bfb44319df159fd7597b1a043abffb0f27e37a2f SHA1 5baafc27b3473dae1056e6053734fab42a1bfc25 SHA256 ff55543ce00b0c49d6db0cc75097a90acb9dc720326d86d4c793ae36b5cf2f3f
+DIST drupal-7.7.tar.gz 2754113 RMD160 cdd3e35a0a72af466e454eff9f317e9fe856e27a SHA1 30351894503b283c1a5f73bbcb0e3bf7f1c98de8 SHA256 f85456586c88e035743827bda200ff9d4c2d90f0b331a22b3a533899f1f98e26
 EBUILD drupal-5.23.ebuild 1453 RMD160 3cc338b3d875dcd549a6e7efb2056fa3f6013937 SHA1 03907649f3f91f714349aa513458774a9f914844 SHA256 a495eae9534407370c382e524d2a8ce3ca073897be29f0aa0d820207a495cbc8
-EBUILD drupal-6.20.ebuild 1766 RMD160 420b12143ce54be39b4cf3aba9be8ab11c3fbb76 SHA1 d54c25e41f3fa98c8ba1e49ec89729800f9090d4 SHA256 eaced2a94fd61ecb179be23fbed15f93ed55a7959cf0b93ea75fcf45f3c13c15
 EBUILD drupal-6.22.ebuild 1769 RMD160 11bc5157266440be47a59ab47326002aed6d9575 SHA1 e24a8664c9c9565f18922a1766337b090aceebcb SHA256 c6ce72ce06c5df5fef0dd79634a57ccb33883a63d96b74ca76c152f5d9af59af
-EBUILD drupal-7.0.ebuild 1813 RMD160 13b5c6f92027171374a8a5d624d548f9521b4235 SHA1 bde0fa4f672a6d8bc0a33fbe5962e9d33927da51 SHA256 8ec254a4e739f300db35533cc1346fb21d2d653ea4644c78c40d139711d2b83f
-EBUILD drupal-7.2.ebuild 1701 RMD160 94c082cb92cbd9468772c94714c7f3a7305489cc SHA1 b2024c0172f75c33b91de947ca9851e12da7f419 SHA256 45996ba22c35a47d56b3a680d4d1aafd97ace812e91fdf7e011c128ae3b42fa7
 EBUILD drupal-7.4.ebuild 1701 RMD160 1a3e3c7321d6d987dc88731c45939240b5170e7b SHA1 cfb5d0a10d7b2efc3b6363840e5e8fd9d34d3416 SHA256 6141c079b410650fa2bef690a5524c689f8ba4959c06a2e40c0a12b4d2a89e8f
-MISC ChangeLog 11842 RMD160 8c25c62df9ed8a5e311910c90f69a1ac16b62e3c SHA1 50be424027e3ccc4e36119d06cdff5e0621b0d7a SHA256 1fce946d3addd5d971dbb67b23fc2e97d03efdde675f60d9fe338671d2343caf
+EBUILD drupal-7.7.ebuild 1695 RMD160 d6c8e378e12509a672397a2907d446a569bdcdc9 SHA1 670882807bfa4b8882b1ce54267b61c6eac52a9a SHA256 6d1376d8722dad3b30473eee79d9421a7e93e8193213224d8765c35294b94ffb
+MISC ChangeLog 12048 RMD160 c533677292f6b8a2bf7f6013ff3572727711ffe6 SHA1 db01005cb87cc35f1ab1d784c99f3d636afeb3f8 SHA256 6c4c0f69a31767656932e884cfb81a5d0d4a9ebcbd9365380dd94ef79e40e3d0
 MISC metadata.xml 162 RMD160 ece93b69f0e3148e7f73f6ccbde8555665c34be5 SHA1 49168d414be17b0cc9cf29ca70eb19c6754d0853 SHA256 43c8abb1bfcf55dc16e273c011f146d11197054559a26da3500c9b454ceeed40
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJOFkvmAAoJEEqz6FtPBkyjkQAH/3hYrVAa3fW3fwi1w553Vfz4
-KKGPic3uPb2RocFcC8gBG305UAHx0p5on7iCu2vlKRQAFcgAX+rXO0hajJOqrz4x
-/300RXgkGEF0hsmH0en6LpGSGJNG7hr9lSDzuU7CoUm6ApqOlTKeXMKe7c4zZ6Zu
-O6y5wuNOPggmKpjWQZ2xjY/87rX26pX7u254rpTVpd5mHV46fiJXlf9k3tSlV+QZ
-3G3D16KlcktH2hTUS6kcY+E853HwCg8UzcEiQFCsqPkzqQoMi9usYLkMEDZChHo8
-ODP24VLhWGsVC84K2rmT7a+CIFE40latdVEhklCGuvlwPGR39RlfwNlQLjpYvqg=
-=NlZk
------END PGP SIGNATURE-----
diff --git a/www-apps/drupal/drupal-6.20.ebuild b/www-apps/drupal/drupal-6.20.ebuild
deleted file mode 100644
index 31b223652241..000000000000
--- a/www-apps/drupal/drupal-6.20.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-6.20.ebuild,v 1.1 2010/12/19 22:09:02 alexxy Exp $
-
-inherit webapp eutils depend.php
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		local flags="expat"
-	else
-		local flags="xml"
-	fi
-	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
-			die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt
-
-	cp sites/default/{default.settings.php,settings.php}
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	ewarn
-}
diff --git a/www-apps/drupal/drupal-7.0.ebuild b/www-apps/drupal/drupal-7.0.ebuild
deleted file mode 100644
index f24273dc1743..000000000000
--- a/www-apps/drupal/drupal-7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.0.ebuild,v 1.1 2011/01/06 00:45:51 alexxy Exp $
-
-inherit webapp eutils depend.php
-
-MY_PV=${PV:0:3}.0
-
-DESCRIPTION="PHP-based open-source platform and content management system"
-HOMEPAGE="http://drupal.org/"
-SRC_URI="http://drupal.org/files/projects/${P/_/-}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${P/_/-}"
-
-pkg_setup() {
-	webapp_pkg_setup
-	has_php
-	if [[ ${PHP_VERSION} == "4" ]] ; then
-		local flags="expat"
-	else
-		local flags="xml"
-	fi
-	if ! PHPCHECKNODIE="yes" require_php_with_use ${flags} \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
-			die "Re-install ${PHP_PKG} with ${flags} and either gd or gd-external"
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt "
-	dodoc ${docs}
-	rm -f ${docs} INSTALL COPYRIGHT.txt
-
-	cp sites/default/{default.settings.php,settings.php}
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	dodir "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/files
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
-	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
-
-	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "SECURITY NOTICE"
-	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
-	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
-	ewarn
-}
diff --git a/www-apps/drupal/drupal-7.2.ebuild b/www-apps/drupal/drupal-7.7.ebuild
index 12df61a95137..302be8582872 100644
--- a/www-apps/drupal/drupal-7.2.ebuild
+++ b/www-apps/drupal/drupal-7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.2.ebuild,v 1.1 2011/05/27 21:24:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.7.ebuild,v 1.1 2011/07/28 08:51:23 pva Exp $
 
 EAPI=4