From e105c30cb898373dd3881ede2c90e98f84f934db Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Wed, 23 Jan 2019 12:17:54 -0500
Subject: [PATCH] 7.x-1.11 Release Candidate 1
---
CHANGELOG.txt | 4 ++++
includes/bootstrap.inc | 2 +-
.../drupal-security/PharExtensionInterceptor.php | 12 +++++++++---
pantheon-yml.patch | 2 +-
pantheon.yml | 2 +-
profiles/wcm_base/CHANGELOG.txt | 6 ++++++
.../panopoly/panopoly_admin/CHANGELOG.txt | 4 ++++
.../panopoly/panopoly_admin/panopoly_admin.info | 6 +++---
.../modules/panopoly/panopoly_core/CHANGELOG.txt | 4 ++++
.../panopoly/panopoly_core/panopoly_core.info | 6 +++---
.../panopoly/panopoly_magic/CHANGELOG.txt | 4 ++++
.../panopoly/panopoly_magic/panopoly_magic.info | 6 +++---
.../panopoly/panopoly_pages/CHANGELOG.txt | 4 ++++
.../panopoly/panopoly_pages/panopoly_pages.info | 6 +++---
.../panopoly/panopoly_search/CHANGELOG.txt | 4 ++++
.../panopoly_search/panopoly_search.info | 6 +++---
.../modules/panopoly/panopoly_test/CHANGELOG.txt | 4 ++++
.../panopoly/panopoly_test/panopoly_test.info | 6 +++---
.../panopoly/panopoly_theme/CHANGELOG.txt | 4 ++++
.../panopoly/panopoly_theme/panopoly_theme.info | 6 +++---
.../panopoly/panopoly_widgets/CHANGELOG.txt | 4 ++++
.../panopoly_widgets/panopoly_widgets.info | 6 +++---
profiles/wcm_base/patches/pantheon-yml.patch | 2 +-
profiles/wcm_base/wcm_base.make | 16 ++++++++--------
24 files changed, 87 insertions(+), 39 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 392826d2..4adf5a43 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Drupal 7.63, 2019-01-16
+-----------------------
+- Fixed a fatal error for some Drush users introduced by SA-CORE-2019-002.
+
Drupal 7.62, 2019-01-15
-----------------------
- Fixed security issues:
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 7734840d..f484fce2 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '7.62');
+define('VERSION', '7.63');
/**
* Core API compatibility.
diff --git a/misc/typo3/drupal-security/PharExtensionInterceptor.php b/misc/typo3/drupal-security/PharExtensionInterceptor.php
index a77e9f84..2e1a0cbc 100644
--- a/misc/typo3/drupal-security/PharExtensionInterceptor.php
+++ b/misc/typo3/drupal-security/PharExtensionInterceptor.php
@@ -22,7 +22,6 @@ class PharExtensionInterceptor implements Assertable {
*
* @param string $path
* The path of the phar file to check.
- *
* @param string $command
* The command being carried out.
*
@@ -46,6 +45,8 @@ class PharExtensionInterceptor implements Assertable {
}
/**
+ * Determines if a path has a .phar extension or invoked execution.
+ *
* @param string $path
* The path of the phar file to check.
*
@@ -62,8 +63,13 @@ class PharExtensionInterceptor implements Assertable {
// not not have .phar extension then this should be allowed. For
// example, some CLI tools recommend removing the extension.
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
- $caller = array_pop($backtrace);
- if (isset($caller['file']) && $baseFile === $caller['file']) {
+ // Find the last entry in the backtrace containing a 'file' key as
+ // sometimes the last caller is executed outside the scope of a file. For
+ // example, this occurs with shutdown functions.
+ do {
+ $caller = array_pop($backtrace);
+ } while (empty($caller['file']) && !empty($backtrace));
+ if (isset($caller['file']) && $baseFile === Helper::determineBaseFile($caller['file'])) {
return TRUE;
}
$fileExtension = pathinfo($baseFile, PATHINFO_EXTENSION);
diff --git a/pantheon-yml.patch b/pantheon-yml.patch
index dfa5c4ff..f65fc452 100644
--- a/pantheon-yml.patch
+++ b/pantheon-yml.patch
@@ -6,7 +6,7 @@ index 0000000..25f0f6d
@@ -0,0 +1,12 @@
+api_version: 1
+
-+php_version: 5.6
++php_version: 7.1
+
+drush_version: 7
+
diff --git a/pantheon.yml b/pantheon.yml
index dea3a030..d247dc1b 100644
--- a/pantheon.yml
+++ b/pantheon.yml
@@ -1,6 +1,6 @@
api_version: 1
-php_version: 5.6
+php_version: 7.1
drush_version: 7
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 9c808d4c..1f722441 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,9 @@
+WCM Base 7.x-1.11-rc1, 2019-01-23
+---------------------------------
+- WCM Base:
+ - Upgraded PHP to 7.1
+ - Updated Panopoly to 1.59.
+
WCM Base 7.x-1.10, 2019-01-16
-----------------------------
- WCM Base: Updated Drupal core to 7.62 per SA-CORE-2019-001.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
index d90a041d..785185a1 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- Patch admin_menu to remove PHP 7 deprecation warning.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
index f19dc6c2..9dbcdc61 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info
@@ -37,8 +37,8 @@ features[page_manager_pages][] = panopoly_admin_layout_library
features[page_manager_pages][] = panopoly_admin_page_library
features[page_manager_pages][] = panopoly_admin_pane_library
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_admin"
-datestamp = "1544590687"
+datestamp = "1547743824"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
index 517e8552..fc1e6dd5 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- Patch defaultcontent module to remove PHP7 deprecation warning.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
index 4600bfa4..30650a11 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info
@@ -82,8 +82,8 @@ features_exclude[variable][panelizer_taxonomy_term:panopoly_categories_allowed_t
features_exclude[variable][panelizer_defaults_taxonomy_term_panopoly_categories] = panelizer_defaults_taxonomy_term_panopoly_categories
features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_core"
-datestamp = "1544590701"
+datestamp = "1547743843"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
index a197e9dd..bb5b8149 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- Allow overriding "more" text on Views-based widgets.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
index 36cbb348..38603858 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info
@@ -15,8 +15,8 @@ stylesheets[all][] = css/panopoly-modal.css
features[features_api][] = api:2
files[] = plugins/views/panopoly_magic_plugin_display_panel_pane.inc
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_magic"
-datestamp = "1544590743"
+datestamp = "1547743904"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
index 0040e704..c64802f7 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
index 8e6f1755..9dccd0e6 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info
@@ -81,8 +81,8 @@ features_exclude[variable][pathauto_node_panopoly_landing_page_pattern] = pathau
features_exclude[variable][pathauto_node_panopoly_page_pattern] = pathauto_node_panopoly_page_pattern
features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_pages"
-datestamp = "1544590755"
+datestamp = "1547743926"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
index 1b2e6271..d381b76d 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- Update search_api to 1.25 and search_api_db to 1.7.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
index 586a2159..7b3b8d7b 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info
@@ -54,8 +54,8 @@ features[variable][] = search_cron_limit
features[views_view][] = panopoly_database_search
features[views_view][] = panopoly_search
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_search"
-datestamp = "1544590768"
+datestamp = "1547743955"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
index d05a5ed9..262b2842 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
index ac0cc919..6a987eee 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info
@@ -99,8 +99,8 @@ features_exclude[dependencies][panopoly_pages] = panopoly_pages
features_exclude[dependencies][panelizer] = panelizer
hidden = 1
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_test"
-datestamp = "1544590782"
+datestamp = "1547743980"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
index a1048d20..124a1aae 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- No changes since last release.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
index 879dcac2..ff7871a9 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info
@@ -11,8 +11,8 @@ stylesheets[all][] = css/panopoly-accordian.css
stylesheets[all][] = css/panopoly-layouts.css
features[features_api][] = api:2
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_theme"
-datestamp = "1544590793"
+datestamp = "1547744004"
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
index 621a7f19..f2bd5d6b 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt
@@ -1,3 +1,7 @@
+7.x-1.59, 2019-01-17
+-------------------
+- No changes since last release.
+
7.x-1.58, 2018-12-11
-------------------
- File entity overwriting slide title on spotlight widgets.
diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
index 338c8eaf..fabc9d5e 100644
--- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
+++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info
@@ -125,8 +125,8 @@ features[linkit_profiles][] = content_fields
features[views_view][] = panopoly_widgets_general_content
features_exclude[dependencies][linkit] = linkit
-; Information added by Drupal.org packaging script on 2018-12-12
-version = "7.x-1.58"
+; Information added by Drupal.org packaging script on 2019-01-17
+version = "7.x-1.59"
core = "7.x"
project = "panopoly_widgets"
-datestamp = "1544590822"
+datestamp = "1547744042"
diff --git a/profiles/wcm_base/patches/pantheon-yml.patch b/profiles/wcm_base/patches/pantheon-yml.patch
index dfa5c4ff..f65fc452 100644
--- a/profiles/wcm_base/patches/pantheon-yml.patch
+++ b/profiles/wcm_base/patches/pantheon-yml.patch
@@ -6,7 +6,7 @@ index 0000000..25f0f6d
@@ -0,0 +1,12 @@
+api_version: 1
+
-+php_version: 5.6
++php_version: 7.1
+
+drush_version: 7
+
diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make
index f0d12313..13343b3b 100644
--- a/profiles/wcm_base/wcm_base.make
+++ b/profiles/wcm_base/wcm_base.make
@@ -485,31 +485,31 @@ libraries[ocio_modernizr][download][branch] = 7.x-1.x
; The Panopoly Foundation
-projects[panopoly_core][version] = 1.58
+projects[panopoly_core][version] = 1.59
projects[panopoly_core][subdir] = panopoly
-projects[panopoly_theme][version] = 1.58
+projects[panopoly_theme][version] = 1.59
projects[panopoly_theme][subdir] = panopoly
-projects[panopoly_magic][version] = 1.58
+projects[panopoly_magic][version] = 1.59
projects[panopoly_magic][subdir] = panopoly
-projects[panopoly_widgets][version] = 1.58
+projects[panopoly_widgets][version] = 1.59
projects[panopoly_widgets][subdir] = panopoly
-projects[panopoly_admin][version] = 1.58
+projects[panopoly_admin][version] = 1.59
projects[panopoly_admin][subdir] = panopoly
; The Panopoly Toolset
-projects[panopoly_pages][version] = 1.58
+projects[panopoly_pages][version] = 1.59
projects[panopoly_pages][subdir] = panopoly
-projects[panopoly_search][version] = 1.58
+projects[panopoly_search][version] = 1.59
projects[panopoly_search][subdir] = panopoly
; For running the automated tests.
-projects[panopoly_test][version] = 1.58
+projects[panopoly_test][version] = 1.59
projects[panopoly_test][subdir] = panopoly
--
GitLab