www-apps/drupal: Security releases to address PSA-2018-001 (7.58, 8.4.6 and 8.5.1).

Bug: https://bugs.gentoo.org/651822
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>

4 files changed, 89 insertions, 2 deletions

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 45083d42f96d..c52e2004b1d2 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,2 +1,3 @@
-DIST drupal-7.57.tar.gz 3279405 BLAKE2B 4697f5f30d5d2bbe821a766c2f0a05813fba091c1e976f0e0ca726e86a6d14633eecd586c29fd3a66001b143c641c74c277e90f13fd96cf14f02c38f0f9b43e0 SHA512 79e7e38c605cf60e458b2846ef4ce95f82368954f86fac6e79c19357e7a4ff714367c5580836ae2e45b22029d9ba2f2566901887d37bfa1ec2ed94a5a370fa0e
-DIST drupal-8.4.5.tar.gz 13414036 BLAKE2B b82753e320c3970d786ca10292b0aacbb3c5b6ba15dedf210144205b9e24bd25d3913453e70fc6736c34184dcc486f2323b39b9f6e60a3e8ec1b15bc55ae9c0b SHA512 105a6bce140b1f5965d42f46df4a8fa0f8802ae6b4efde5c095004f51beebe5f1c4d3064e3363f59f9a15f739ea598b2e9a03304630731113777b3639b3440d2
+DIST drupal-7.58.tar.gz 3281269 BLAKE2B 128ce0e9df584036771ead0f345dd3277e8a1b584398c4e766817774ded159ab8be6666e3f4702f8d636dd14ca7f3f2d7df6a7e0accb2d8e82d3d20802a1134c SHA512 13e437e0458d6b45723ceeca28ec9f82a67497b3dafff0152512e3ad07e1a9b53cdc39404565089ea1531495a047f803e3a1006ca218cbe3dcbbb7a6119e154e
+DIST drupal-8.4.6.tar.gz 13413996 BLAKE2B 26202aa2388d2240239c83e6023e262b45bf7f8e8040e591ed765c1bbd4435f8cd1fb24cce7029220e7a2617bc8657bcfa70203cf3ee4e799ef8fab25d32116b SHA512 ded7d5e9af8e01d098e1e436afebeadc69bf99a436a3516c4884af689c812770ec41609a55d2f41aaf226f8ad8e4318acb864af0bbf5d243a81cd373611d5795
+DIST drupal-8.5.1.tar.gz 15537139 BLAKE2B 49dc9c732ea3ba625c78642eca6fa1717543251749a1c6642ba1a5ae372f5e36e16fae263a686a554cd2051d38367eeba597d3bbd7e21c6f69ca458ad96e54a7 SHA512 a4b095102a1d929a40f0b0b9c71f5956280eb03a88a4ba41b54523c22a5a704404d95b2541670f91fb54874d3e1b35f550fd87040d24df29b37d960929f02df2
diff --git a/www-apps/drupal/drupal-7.57.ebuild b/www-apps/drupal/drupal-7.58.ebuild
index 904fbef88e17..904fbef88e17 100644
--- a/www-apps/drupal/drupal-7.57.ebuild
+++ b/www-apps/drupal/drupal-7.58.ebuild
diff --git a/www-apps/drupal/drupal-8.4.5.ebuild b/www-apps/drupal/drupal-8.4.6.ebuild
index 703cace2293b..703cace2293b 100644
--- a/www-apps/drupal/drupal-8.4.5.ebuild
+++ b/www-apps/drupal/drupal-8.4.6.ebuild
diff --git a/www-apps/drupal/drupal-8.5.1.ebuild b/www-apps/drupal/drupal-8.5.1.ebuild
new file mode 100644
index 000000000000..703cace2293b
--- /dev/null
+++ b/www-apps/drupal/drupal-8.5.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	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() {
+	echo
+	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}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}