pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/drupal7 Update drupal7 to 7.61
details: https://anonhg.NetBSD.org/pkgsrc/rev/4002383f3022
branches: trunk
changeset: 325360:4002383f3022
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Thu Nov 15 14:26:45 2018 +0000
description:
Update drupal7 to 7.61
Full compatibility with PHP 7.2 (#2947772)
Drupal 7.61, 2018-11-07
-----------------------
- File upload validation functions and hook_file_validate() implementations are
now always passed the correct file URI.
- The default form cache expiration of 6 hours is now configurable (API
addition: https://www.drupal.org/node/2857751).
- Allowed callers of drupal_http_request() to optionally specify an explicit
Host header.
- Allowed the + character to appear in usernames.
- PHP 7.2: Fixed Archive_Tar incompatibility.
- PHP 7.2: Removed deprecated function each().
- PHP 7.2: Avoid count() calls on uncountable variables.
- PHP 7.2: Removed deprecated create_function() call.
- PHP 7.2: Make sure variables are arrays in theme_links().
- Fixed theme-settings.php not being loaded on cached forms
- Fixed problem with IE11 & Chrome(PointerEvents enabled) & some Firefox scroll to the top of the page after dragging the bottom item with jquery 1.5 <-> 1.11
diffstat:
www/drupal7/Makefile | 20 +-
www/drupal7/distinfo | 23 +-
www/drupal7/patches/patch-includes_bootstrap.inc | 22 -
www/drupal7/patches/patch-includes_form.inc | 23 -
www/drupal7/patches/patch-includes_install.inc | 17 -
www/drupal7/patches/patch-includes_menu.inc | 38 --
www/drupal7/patches/patch-includes_module.inc | 34 --
www/drupal7/patches/patch-includes_theme.inc | 103 ------
www/drupal7/patches/patch-modules_book_book.module | 37 --
www/drupal7/patches/patch-modules_field_modules_list_list.install | 31 --
www/drupal7/patches/patch-modules_locale_locale.test | 21 -
www/drupal7/patches/patch-modules_simpletest_tests_themes_test__theme_theme-settings.php | 42 --
www/drupal7/patches/patch-modules_system_system.admin.inc | 23 -
www/drupal7/patches/patch-modules_system_system.tar.inc | 152 ----------
www/drupal7/patches/patch-modules_system_system.test | 40 --
15 files changed, 7 insertions(+), 619 deletions(-)
diffs (truncated from 698 to 300 lines):
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/Makefile
--- a/www/drupal7/Makefile Thu Nov 15 14:14:41 2018 +0000
+++ b/www/drupal7/Makefile Thu Nov 15 14:26:45 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2018/10/18 14:32:48 taca Exp $
+# $NetBSD: Makefile,v 1.53 2018/11/15 14:26:45 prlw1 Exp $
-DISTNAME= drupal-7.60
+DISTNAME= drupal-7.61
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME}
CATEGORIES= www
MASTER_SITES= https://ftp.drupal.org/files/projects/
@@ -65,22 +65,6 @@
post-extract:
${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
-pre-install:
- ${RM} \
- ${WRKSRC}/includes/bootstrap.inc.orig \
- ${WRKSRC}/includes/form.inc.orig \
- ${WRKSRC}/includes/install.inc.orig \
- ${WRKSRC}/includes/menu.inc.orig \
- ${WRKSRC}/includes/module.inc.orig \
- ${WRKSRC}/includes/theme.inc.orig \
- ${WRKSRC}/modules/book/book.module.orig \
- ${WRKSRC}/modules/field/modules/list/list.install.orig \
- ${WRKSRC}/modules/locale/locale.test.orig \
- ${WRKSRC}/modules/simpletest/tests/themes/test_theme/theme-settings.php.orig \
- ${WRKSRC}/modules/system/system.admin.inc.orig \
- ${WRKSRC}/modules/system/system.test.orig \
- ${WRKSRC}/modules/system/system.tar.inc.orig
-
do-install:
${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL}
${INSTALL_DATA} ${WRKSRC}/drupal.conf \
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/distinfo
--- a/www/drupal7/distinfo Thu Nov 15 14:14:41 2018 +0000
+++ b/www/drupal7/distinfo Thu Nov 15 14:26:45 2018 +0000
@@ -1,19 +1,6 @@
-$NetBSD: distinfo,v 1.40 2018/10/18 14:32:48 taca Exp $
+$NetBSD: distinfo,v 1.41 2018/11/15 14:26:45 prlw1 Exp $
-SHA1 (drupal-7.60.tar.gz) = aa54d7fc85d2bc2dc20a639208b91256f8f8d2b0
-RMD160 (drupal-7.60.tar.gz) = 839ce4dc73fa52cf0cdbae9d8bcd74772c9b0c5b
-SHA512 (drupal-7.60.tar.gz) = fee59cf303a6c44e3fa3cbeda4912f7d61ffe8294282f9ad0416a6536cc6ea65cf114a6a801dd1f68572185c2b1e300f58f907f9bd61f96beaba3706c527d512
-Size (drupal-7.60.tar.gz) = 3283058 bytes
-SHA1 (patch-includes_bootstrap.inc) = 19af750379de283a17a1f8f202586d588fa58569
-SHA1 (patch-includes_form.inc) = 3f8955b576ebf292573f0953f0a07467dbdd4f64
-SHA1 (patch-includes_install.inc) = ff182d242f4637f7bbb509a1b043671ebd952f64
-SHA1 (patch-includes_menu.inc) = 7aa6f4ae82b37f024d54cc7dc6c6d5433f352916
-SHA1 (patch-includes_module.inc) = 4af9f2c26eb16d39bbcd08949183b54a78391b25
-SHA1 (patch-includes_theme.inc) = 4421f9ad1235825f7b3c360e44bbac994fcfe214
-SHA1 (patch-modules_book_book.module) = bab6aabf09736f5ebb7e60860a96116c2779db06
-SHA1 (patch-modules_field_modules_list_list.install) = 45fffa25115818babe9e743fb1f02020d620efca
-SHA1 (patch-modules_locale_locale.test) = 66f82c0517d32100da28f33b10d1caa27de839be
-SHA1 (patch-modules_simpletest_tests_themes_test__theme_theme-settings.php) = 40f7c7578f4f3c802cd2aaf55130ad9b22b9fea2
-SHA1 (patch-modules_system_system.admin.inc) = d052516a117ca5fecf0da81779ecaac9ef1c4e18
-SHA1 (patch-modules_system_system.tar.inc) = f5bbca9c1b0f5dbb52b744fd5627f83fb8e71cc6
-SHA1 (patch-modules_system_system.test) = 5761278afaa8369453b5857f806cd5d34a2589d0
+SHA1 (drupal-7.61.tar.gz) = 84de421176793566679a7931a2a009cf6c1fbe19
+RMD160 (drupal-7.61.tar.gz) = 44f908cb190bddcabed24fb87c5ebec30a3bf323
+SHA512 (drupal-7.61.tar.gz) = 8f0bdd5b7ef33e62d09698b3889726fab1edb14df6263635bca65c9bbe0400df618dbf02ef298eeee169d48ab554d3b58d867bd4ce0d429b4b9167979917db51
+Size (drupal-7.61.tar.gz) = 3287629 bytes
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/patches/patch-includes_bootstrap.inc
--- a/www/drupal7/patches/patch-includes_bootstrap.inc Thu Nov 15 14:14:41 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-includes_bootstrap.inc,v 1.1 2018/10/03 10:58:15 prlw1 Exp $
-
-Issue #2925449
-Function each() is deprecated since PHP 7.2
-commit 28de6772813387bf02a4bf6f75b9119c4c20a3f4
-
---- includes/bootstrap.inc.orig 2018-04-25 15:32:27.000000000 +0000
-+++ includes/bootstrap.inc
-@@ -3785,8 +3785,12 @@ function _drupal_shutdown_function() {
- chdir(DRUPAL_ROOT);
-
- try {
-- while (list($key, $callback) = each($callbacks)) {
-+ // Manually iterate over the array instead of using a foreach loop.
-+ // A foreach operates on a copy of the array, so any shutdown functions that
-+ // were added from other shutdown functions would never be called.
-+ while ($callback = current($callbacks)) {
- call_user_func_array($callback['callback'], $callback['arguments']);
-+ next($callbacks);
- }
- }
- catch (Exception $exception) {
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/patches/patch-includes_form.inc
--- a/www/drupal7/patches/patch-includes_form.inc Thu Nov 15 14:14:41 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-includes_form.inc,v 1.1 2018/10/03 10:58:15 prlw1 Exp $
-
-Issue #2885610
-Avoid count() calls on uncountable variables
-commit 73e12f0ddf1ed60c13331dc3a9b8ea16d1599307
-
---- includes/form.inc.orig 2018-04-25 15:32:27.000000000 +0000
-+++ includes/form.inc
-@@ -1438,10 +1438,12 @@ function _form_validate(&$elements, &$fo
- // length if it's a string, and the item count if it's an array.
- // An unchecked checkbox has a #value of integer 0, different than string
- // '0', which could be a valid value.
-- $is_empty_multiple = (!count($elements['#value']));
-+ $is_countable = is_array($elements['#value']) || $elements['#value'] instanceof \Countable;
-+ $is_empty_multiple = $is_countable && count($elements['#value']) == 0;
- $is_empty_string = (is_string($elements['#value']) && drupal_strlen(trim($elements['#value'])) == 0);
- $is_empty_value = ($elements['#value'] === 0);
-- if ($is_empty_multiple || $is_empty_string || $is_empty_value) {
-+ $is_empty_null = is_null($elements['#value']);
-+ if ($is_empty_multiple || $is_empty_string || $is_empty_value || $is_empty_null) {
- // Although discouraged, a #title is not mandatory for form elements. In
- // case there is no #title, we cannot set a form error message.
- // Instead of setting no #title, form constructors are encouraged to set
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/patches/patch-includes_install.inc
--- a/www/drupal7/patches/patch-includes_install.inc Thu Nov 15 14:14:41 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-includes_install.inc,v 1.1 2018/10/03 10:58:15 prlw1 Exp $
-
-Issue #2925449
-Function each() is deprecated since PHP 7.2
-commit 28de6772813387bf02a4bf6f75b9119c4c20a3f4
-
---- includes/install.inc.orig 2018-04-25 15:32:27.000000000 +0000
-+++ includes/install.inc
-@@ -779,7 +779,7 @@ function drupal_uninstall_modules($modul
- $module_list = array_flip(array_values($module_list));
-
- $profile = drupal_get_profile();
-- while (list($module) = each($module_list)) {
-+ foreach (array_keys($module_list) as $module) {
- if (!isset($module_data[$module]) || drupal_get_installed_schema_version($module) == SCHEMA_UNINSTALLED) {
- // This module doesn't exist or is already uninstalled. Skip it.
- unset($module_list[$module]);
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/patches/patch-includes_menu.inc
--- a/www/drupal7/patches/patch-includes_menu.inc Thu Nov 15 14:14:41 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-includes_menu.inc,v 1.1 2018/10/03 10:58:15 prlw1 Exp $
-
-Issue #2925449
-Function each() is deprecated since PHP 7.2
-commit 28de6772813387bf02a4bf6f75b9119c4c20a3f4
-
---- includes/menu.inc.orig 2018-04-25 15:32:27.000000000 +0000
-+++ includes/menu.inc
-@@ -576,7 +576,8 @@ function _menu_load_objects(&$item, &$ma
- // 'load arguments' in the hook_menu() entry, but they need
- // some processing. In this case the $function is the key to the
- // load_function array, and the value is the list of arguments.
-- list($function, $args) = each($function);
-+ $args = current($function);
-+ $function = key($function);
- $load_functions[$index] = $function;
-
- // Some arguments are placeholders for dynamic items to process.
-@@ -2402,7 +2403,8 @@ function menu_set_active_trail($new_trai
- // a stripped down menu tree containing the active trail only, in case
- // the given menu has not been built in this request yet.
- $tree = menu_tree_page_data($preferred_link['menu_name'], NULL, TRUE);
-- list($key, $curr) = each($tree);
-+ $curr = current($tree);
-+ next($tree);
- }
- // There is no link for the current path.
- else {
-@@ -2432,7 +2434,8 @@ function menu_set_active_trail($new_trai
- }
- $tree = $curr['below'] ? $curr['below'] : array();
- }
-- list($key, $curr) = each($tree);
-+ $curr = current($tree);
-+ next($tree);
- }
- // Make sure the current page is in the trail to build the page title, by
- // appending either the preferred link or the menu router item for the
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/patches/patch-includes_module.inc
--- a/www/drupal7/patches/patch-includes_module.inc Thu Nov 15 14:14:41 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-includes_module.inc,v 1.1 2018/10/03 10:58:15 prlw1 Exp $
-
-Issue #2925449
-Function each() is deprecated since PHP 7.2
-commit 28de6772813387bf02a4bf6f75b9119c4c20a3f4
-
---- includes/module.inc.orig 2018-04-25 15:32:27.000000000 +0000
-+++ includes/module.inc
-@@ -404,7 +404,11 @@ function module_enable($module_list, $en
- // Create an associative array with weights as values.
- $module_list = array_flip(array_values($module_list));
-
-- while (list($module) = each($module_list)) {
-+ // The array is iterated over manually (instead of using a foreach) because
-+ // modules may be added to the list within the loop and we need to process
-+ // them.
-+ while ($module = key($module_list)) {
-+ next($module_list);
- if (!isset($module_data[$module])) {
- // This module is not found in the filesystem, abort.
- return FALSE;
-@@ -540,7 +544,11 @@ function module_disable($module_list, $d
- $module_list = array_flip(array_values($module_list));
-
- $profile = drupal_get_profile();
-- while (list($module) = each($module_list)) {
-+ // The array is iterated over manually (instead of using a foreach) because
-+ // modules may be added to the list within the loop and we need to process
-+ // them.
-+ while ($module = key($module_list)) {
-+ next($module_list);
- if (!isset($module_data[$module]) || !$module_data[$module]->status) {
- // This module doesn't exist or is already disabled, skip it.
- unset($module_list[$module]);
diff -r 00c0dd6ea690 -r 4002383f3022 www/drupal7/patches/patch-includes_theme.inc
--- a/www/drupal7/patches/patch-includes_theme.inc Thu Nov 15 14:14:41 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-$NetBSD: patch-includes_theme.inc,v 1.1 2018/10/03 10:58:15 prlw1 Exp $
-
-Issue #2885610
-Avoid count() calls on uncountable variables
-commit 73e12f0ddf1ed60c13331dc3a9b8ea16d1599307
-
-Issue #2996519
-PHP 7.2 compatibility - make sure some variables are arrays in
-theme_links()
-commit 083a4eca4a2ebc5276eed2f11fc4a595b07898ba
-
---- includes/theme.inc.orig 2018-10-03 09:32:02.932500773 +0000
-+++ includes/theme.inc
-@@ -1776,8 +1776,8 @@ function theme_link($variables) {
- * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
- */
- function theme_links($variables) {
-- $links = $variables['links'];
-- $attributes = $variables['attributes'];
-+ $links = (array) $variables['links'];
-+ $attributes = (array) $variables['attributes'];
- $heading = $variables['heading'];
- global $language_url;
- $output = '';
-@@ -1995,7 +1995,7 @@ function theme_table($variables) {
- $empty = $variables['empty'];
-
- // Add sticky headers, if applicable.
-- if (count($header) && $sticky) {
-+ if (!empty($header) && $sticky) {
- drupal_add_js('misc/tableheader.js');
- // Add 'sticky-enabled' class to the table to identify it for JS.
- // This is needed to target tables constructed by this function.
-@@ -2009,7 +2009,7 @@ function theme_table($variables) {
- }
-
- // Format the table columns:
-- if (count($colgroups)) {
-+ if (!empty($colgroups)) {
- foreach ($colgroups as $number => $colgroup) {
- $attributes = array();
-
-@@ -2044,38 +2044,40 @@ function theme_table($variables) {
- }
-
- // Add the 'empty' row message if available.
-- if (!count($rows) && $empty) {
-+ if (empty($rows) && $empty) {
- $header_count = 0;
-- foreach ($header as $header_cell) {
-- if (is_array($header_cell)) {
-- $header_count += isset($header_cell['colspan']) ? $header_cell['colspan'] : 1;
-- }
-- else {
-- $header_count++;
-+ if (!empty($header)) {
-+ foreach ($header as $header_cell) {
-+ if (is_array($header_cell)) {
-+ $header_count += isset($header_cell['colspan']) ? $header_cell['colspan'] : 1;
-+ }
-+ else {
-+ $header_count++;
-+ }
- }
- }
- $rows[] = array(array('data' => $empty, 'colspan' => $header_count, 'class' => array('empty', 'message')));
- }
-
- // Format the table header:
-- if (count($header)) {
-+ if (!empty($header)) {
- $ts = tablesort_init($header);
- // HTML requires that the thead tag has tr tags in it followed by tbody
- // tags. Using ternary operator to check and see if we have any rows.
-- $output .= (count($rows) ? ' <thead><tr>' : ' <tr>');
-+ $output .= (!empty($rows) ? ' <thead><tr>' : ' <tr>');
- foreach ($header as $cell) {
- $cell = tablesort_header($cell, $header, $ts);
- $output .= _theme_table_cell($cell, TRUE);
Home |
Main Index |
Thread Index |
Old Index