Pullup ticket #6216 - requested by taca

www/drupal8: security fix

Revisions pulled up:
- www/drupal8/Makefile                                          1.32-1.33
- www/drupal8/PLIST                                             1.26
- www/drupal8/distinfo                                          1.28

---
   Module Name:	pkgsrc
   Committed By:	rillig
   Date:		Sat May  2 13:40:18 UTC 2020

   Modified Files:
   	pkgsrc/www/drupal8: Makefile

   Log Message:
   www/drupal8: remove SUBST block for nonexistent file

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed May 20 16:31:27 UTC 2020

   Modified Files:
   	pkgsrc/www/drupal8: Makefile PLIST distinfo

   Log Message:
   www/drupal8: update to 8.7.14

   Update drupal8 to 8.7.14.

   8.7.14 (2020-05-20)	-- Security update

       View usage statistics for this release

   Release notes

   Maintenance and security release of the Drupal 8 series.

   This release fixes security vulnerabilities. Sites are urged to upgrade
   immediately after reading the notes below and the security announcement:

   * Drupal core - Moderately critical - Third-party library - SA-CORE-2020-002

   No other fixes are included.

3 files changed, 11 insertions, 14 deletions

diff --git a/www/drupal8/Makefile b/www/drupal8/Makefile
index 254321623fb..1aaff3232f4 100644
--- a/www/drupal8/Makefile
+++ b/www/drupal8/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30.2.1 2020/05/06 11:19:15 bsiegert Exp $
+# $NetBSD: Makefile,v 1.30.2.2 2020/06/04 10:17:58 bsiegert Exp $
 
-DISTNAME=	drupal-8.7.12
+DISTNAME=	drupal-8.7.14
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
@@ -45,12 +45,6 @@ REPLACE_FILES.php+=	core/scripts/update-countries.sh
 REPLACE_FILES.php+=	core/scripts/rebuild_token_calculator.sh
 REPLACE_FILES.php+=	vendor/pear/archive_tar/scripts/phptar.in
 
-SUBST_CLASSES+=		sh
-SUBST_STAGE.sh=		pre-configure
-SUBST_MESSAGE.sh=	Fixing path to sh
-SUBST_FILES.sh+=	vendor/paragonie/random_compat/build-phar.sh
-SUBST_SED.sh=		-e "s|/usr/bin/env bash|${SH}|"
-
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
 SUBST_FILES.conf=	drupal.conf
diff --git a/www/drupal8/PLIST b/www/drupal8/PLIST
index a1c2a7cadaa..1b202d379ae 100644
--- a/www/drupal8/PLIST
+++ b/www/drupal8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24.2.1 2020/05/06 11:19:15 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.24.2.2 2020/06/04 10:17:58 bsiegert Exp $
 share/drupal/.csslintrc
 share/drupal/.editorconfig
 share/drupal/.eslintignore
@@ -472,6 +472,7 @@ share/drupal/core/assets/vendor/jquery.ui/ui/widgets/spinner-min.js
 share/drupal/core/assets/vendor/jquery.ui/ui/widgets/tabs-min.js
 share/drupal/core/assets/vendor/jquery.ui/ui/widgets/tooltip-min.js
 share/drupal/core/assets/vendor/jquery/jquery-extend-3.4.0.js
+share/drupal/core/assets/vendor/jquery/jquery-htmlprefilter-3.5.0.js
 share/drupal/core/assets/vendor/jquery/jquery.js
 share/drupal/core/assets/vendor/jquery/jquery.min.js
 share/drupal/core/assets/vendor/jquery/jquery.min.map
@@ -6643,6 +6644,7 @@ share/drupal/core/modules/menu_link_content/src/Plugin/migrate/process/d6/LinkUr
 share/drupal/core/modules/menu_link_content/src/Plugin/migrate/process/d7/InternalUri.php
 share/drupal/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
 share/drupal/core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLinkTranslation.php
+share/drupal/core/modules/menu_link_content/tests/fixtures/update/drupal-8.menu-link-content-null-data-3056543.php
 share/drupal/core/modules/menu_link_content/tests/menu_link_content_dynamic_route/menu_link_content_dynamic_route.info.yml
 share/drupal/core/modules/menu_link_content/tests/menu_link_content_dynamic_route/menu_link_content_dynamic_route.routing.yml
 share/drupal/core/modules/menu_link_content/tests/menu_link_content_dynamic_route/src/Routes.php
@@ -9926,6 +9928,7 @@ share/drupal/core/modules/taxonomy/taxonomy.services.yml
 share/drupal/core/modules/taxonomy/taxonomy.tokens.inc
 share/drupal/core/modules/taxonomy/taxonomy.views.inc
 share/drupal/core/modules/taxonomy/templates/taxonomy-term.html.twig
+share/drupal/core/modules/taxonomy/tests/fixtures/update/drupal-8.taxonomy-term-null-data-3056543.php
 share/drupal/core/modules/taxonomy/tests/fixtures/update/drupal-8.views-taxonomy-term-publishing-status-2981887.php
 share/drupal/core/modules/taxonomy/tests/fixtures/update/views.view.test_taxonomy_term_view_with_content_translation_status.yml
 share/drupal/core/modules/taxonomy/tests/fixtures/update/views.view.test_taxonomy_term_view_without_content_translation_status.yml
diff --git a/www/drupal8/distinfo b/www/drupal8/distinfo
index 5a68b9bc1c4..46ef8f0ab01 100644
--- a/www/drupal8/distinfo
+++ b/www/drupal8/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26.2.1 2020/05/06 11:19:15 bsiegert Exp $
+$NetBSD: distinfo,v 1.26.2.2 2020/06/04 10:17:58 bsiegert Exp $
 
-SHA1 (drupal-8.7.12.tar.gz) = 2acf8f1cfbba90da7f82809f6f5ffc26b78e43dc
-RMD160 (drupal-8.7.12.tar.gz) = b9dbf04cbfb2ab7c1cc41c13e56b1f9d3d702f1e
-SHA512 (drupal-8.7.12.tar.gz) = f9b140d52d11d9ec0543b8e18315b898f1d09bb4c360c544498b1b6df8d40e59c04e5e04749140c896c51f2ea1844fab8220dd556986b39af0fc846d2571e5c2
-Size (drupal-8.7.12.tar.gz) = 17917274 bytes
+SHA1 (drupal-8.7.14.tar.gz) = 52cf7f84e627d4af7ec15d4369182f973626bfb7
+RMD160 (drupal-8.7.14.tar.gz) = 17f17674bfa108accbba8297a27fab30d4ef8cad
+SHA512 (drupal-8.7.14.tar.gz) = 0dc5ee0d21c6da019aae6cf93d16d938b5fcf3179b74278d03c75cb6fd78f7fa698bc98ccb4040553b010e7b529f8a37640147b928616348abbcfd3060d42995
+Size (drupal-8.7.14.tar.gz) = 17930775 bytes