diff options
author | bsiegert <bsiegert@pkgsrc.org> | 2019-01-29 12:50:28 +0000 |
---|---|---|
committer | bsiegert <bsiegert@pkgsrc.org> | 2019-01-29 12:50:28 +0000 |
commit | f6aa4d89b83111cd057817e5619f40258ea78831 (patch) | |
tree | 9d4f06b2bbe5db15af4af29e5dca8120ab67acd7 | |
parent | 36a66b6e3af4e4f8cfa0abf16f35db9d18f79b54 (diff) | |
download | pkgsrc-f6aa4d89b83111cd057817e5619f40258ea78831.tar.gz |
Pullup ticket #5895 - requested by taca
www/drupal8: security fix
Revisions pulled up:
- www/drupal8/Makefile 1.14-1.16
- www/drupal8/PLIST 1.12-1.13
- www/drupal8/distinfo 1.13-1.15
- www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php 1.1
---
Module Name: pkgsrc
Committed By: wen
Date: Fri Jan 4 08:17:37 UTC 2019
Modified Files:
pkgsrc/www/drupal8: Makefile PLIST distinfo
Log Message:
Update to 8.6.5
Upstream changes:
Changes since 8.6.4
#3023402 by alexpott: \Drupal\Tests\Component\Datetime\DateTimePlusTest fails on latest PHP7.3 build
#3001997 by Krzysztof Domańskii, scott_euser, alexpott: Transliteration a string containing an unknown character (e.g. 0x80) is not valid
#3018942 by welly, alexpott, jibran, Krzysztof Domańskii, floydm: Domain URL language detection - InvalidArgumentException: The user-entered string must begin with a '/', '?', or '#'
#3020902 by Berdir, alexpott: PostgresqlDateSql fails to serialize
Revert "Issue #2986725 by Mile23, devitate, alexpott: doctrine common 2.9 has moved reflection"
#3022183 by wengerk, benjifisher: Fix BlockContentAccessHandlerTest::providerTestAccess wrong coverage by early return
#2984072 by vijaycs85, Lendude, ApacheEx, dawehner: System: Convert ErrorHandlerTest to phpunit
#3019706 by hchonov, alexpott, sheanhoxie, jibran, dawehner: Functional JS Tests are broken if XDEBUG_CONFIG is set as an env variable
Revert "Issue #3019706 by hchonov, jibran: Functional JS Tests are broken if XDEBUG_CONFIG is set as an env variable"
#3021204 by maxocub: Remove maxocub from Migrate maintainers
#3019706 by hchonov, jibran: Functional JS Tests are broken if XDEBUG_CONFIG is set as an env variable
#2986725 by Mile23, devitate, alexpott: doctrine common 2.9 has moved reflection
#2939908 by kjay, steveparks, spitzialist, cferthorney, danharper, Eli-T: Add an article to Umami - Dairy-free chocolate
#3007439 by tim.plunkett, Wim Leers, xopoc: Layout builder renders Book navigation block on non-book pages
#2927768 by justinlevi, Lendude, pritish.kumar, Wim Leers, dawehner: Update RestRegisterUserTest to use the ResourceTestBase base class instead of the deprecated RESTTestBase
#3020550 by catch: Passing commands as a string to Process is deprecated in Symfony 4
#3020579 by catch: TypeError: Argument 3 passed to Symfony\Component\HttpKernel\Event\FilterResponseEvent::__construct() must be of the type integer, string given [Symfony 4]
#2618606 by dawehner, rbayliss: Update.php - Reverse proxy settings not used
#2865344 by mpdonadio, Lendude, mbovan, organicwire, alexpott, jibran, jhedstrom, bobemoe, Berdir, larowlan: Exposed date filters 'empty' and 'not empty' are broken
#2974274 by mitrpaka, RumyanaRuseva, joachim: exception message for unrecognized source IDs in lookupDestinationIds() should have more detail
#2809305 by Upchuk, Pavan B S, Jo Fitzgerald, tim.plunkett, Berdir: Block Context assignment form element shows even if no options are available
#3018774 by xjm: hook_post_update_NAME() docs do not explain batching/ parameter
#3018539 by phenaproxima, rodrigoaguilera, alexpott: Media types cannot be created in the UI without JavaScript
#3018764 by Wim Leers: One test case in MediaUiFunctionalTest is not actually tested due to a duplicate key
#2998462 by AndyF, Baysaa, Siavash, tim.plunkett, millionleaves, fatmarker: Error adding Content Type Selection criteria or Context
#3016501 by govind.maloo, andrewmacpherson, markconroy: Writing style - Umami should be capitalised when it is used as a proper noun in English
#2916595 by phenaproxima, AdamPS, Wim Leers: File element discards attributes if #multiple
#2883260 by kiamlaluno, yogeshmpawar, msankhala, benjifisher, alexpott, bdlangton: Replace the schema example with one actually used from a module
#2883553 by govind.maloo, msankhala, seanB, Berdir, xjm, alexpott: Obsolete argument for hasPermission in node_node_access()
#3016011 by mikelutz, quietone, alexpott: Reroll all migrate dump files
#3017753 by mxr576, alexpott: MemoryBackend should validate the passed cids
---
Module Name: pkgsrc
Committed By: prlw1
Date: Wed Jan 9 11:56:17 UTC 2019
Modified Files:
pkgsrc/www/drupal8: Makefile distinfo
Added Files:
pkgsrc/www/drupal8/patches:
patch-core_lib_Drupal_Core_Extension_ModulesHandler.php
Log Message:
drupal8 fix for:
Drupal\Core\Extension\Exception\UnknownExtensionException: The module standard does not exist. in Drupal\Core\Extension\ExtensionList->get() (line 257 of /usr/pkg/share/drupal/core/lib/Drupal/Core/Extension/ExtensionList.php)
e.g. when trying to put the site in maintenance mode.
---
Module Name: pkgsrc
Committed By: taca
Date: Sat Jan 19 07:33:55 UTC 2019
Modified Files:
pkgsrc/www/drupal8: Makefile PLIST distinfo
Log Message:
www/drupal8: update to 8.6.6
This is a hotfix release for a regression affecting some Drush installations
that was introduced by the fix for SA-CORE-2019-002. No other fixes are
included.
-rw-r--r-- | www/drupal8/Makefile | 7 | ||||
-rw-r--r-- | www/drupal8/PLIST | 27 | ||||
-rw-r--r-- | www/drupal8/distinfo | 11 | ||||
-rw-r--r-- | www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php | 22 |
4 files changed, 57 insertions, 10 deletions
diff --git a/www/drupal8/Makefile b/www/drupal8/Makefile index e8b2eba51ae..ed5ad6b00fd 100644 --- a/www/drupal8/Makefile +++ b/www/drupal8/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2018/12/11 09:45:54 prlw1 Exp $ +# $NetBSD: Makefile,v 1.13.2.1 2019/01/29 12:50:28 bsiegert Exp $ -DISTNAME= drupal-8.6.4 +DISTNAME= drupal-8.6.6 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ @@ -66,6 +66,9 @@ INSTALLATION_DIRS+= ${DRUPAL}/${i} post-extract: ${CP} ${FILESDIR}/drupal.conf ${WRKSRC} +pre-install: + ${RM} ${WRKSRC}/core/lib/Drupal/Core/Extension/ModuleHandler.php.orig + do-install: ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL} ${INSTALL_DATA} ${WRKSRC}/drupal.conf \ diff --git a/www/drupal8/PLIST b/www/drupal8/PLIST index c64769bd302..51caeb9ac37 100644 --- a/www/drupal8/PLIST +++ b/www/drupal8/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2018/12/11 09:45:54 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.11.2.1 2019/01/29 12:50:28 bsiegert Exp $ share/drupal/.csslintrc share/drupal/.editorconfig share/drupal/.eslintignore @@ -2259,6 +2259,7 @@ share/drupal/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php share/drupal/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php share/drupal/core/lib/Drupal/Core/Routing/UrlMatcher.php share/drupal/core/lib/Drupal/Core/Routing/routing.api.php +share/drupal/core/lib/Drupal/Core/Security/PharExtensionInterceptor.php share/drupal/core/lib/Drupal/Core/Security/RequestSanitizer.php share/drupal/core/lib/Drupal/Core/Serialization/Yaml.php share/drupal/core/lib/Drupal/Core/Session/AccountInterface.php @@ -2947,6 +2948,7 @@ share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAc share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestBlockInstantiation.php share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestCacheBlock.php share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php +share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareNoValidContextOptionsBlock.php share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestFormBlock.php share/drupal/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestHtmlBlock.php @@ -4258,6 +4260,7 @@ share/drupal/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php share/drupal/core/modules/datetime/tests/src/Functional/DateTimeTimeAgoFormatterTest.php share/drupal/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDateonlyTest.php share/drupal/core/modules/datetime/tests/src/Functional/EntityResource/EntityTest/EntityTestDatetimeTest.php +share/drupal/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php share/drupal/core/modules/datetime/tests/src/Kernel/DateTimeFormInjectionTest.php share/drupal/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php share/drupal/core/modules/datetime/tests/src/Kernel/Views/ArgumentDateTimeTest.php @@ -6076,6 +6079,7 @@ share/drupal/core/modules/media/tests/src/Functional/MediaSettingsTest.php share/drupal/core/modules/media/tests/src/Functional/MediaSourceFileTest.php share/drupal/core/modules/media/tests/src/Functional/MediaTemplateSuggestionsTest.php share/drupal/core/modules/media/tests/src/Functional/MediaTranslationUITest.php +share/drupal/core/modules/media/tests/src/Functional/MediaTypeCreationTest.php share/drupal/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php share/drupal/core/modules/media/tests/src/Functional/ProviderRepositoryTest.php share/drupal/core/modules/media/tests/src/Functional/ResourceFetcherTest.php @@ -7726,6 +7730,7 @@ share/drupal/core/modules/simpletest/files/invalid-img-test.png share/drupal/core/modules/simpletest/files/invalid-img-zero-size.png share/drupal/core/modules/simpletest/files/javascript-1.txt share/drupal/core/modules/simpletest/files/javascript-2.script +share/drupal/core/modules/simpletest/files/phar-1.phar share/drupal/core/modules/simpletest/files/php-1.txt share/drupal/core/modules/simpletest/files/php-2.php share/drupal/core/modules/simpletest/files/sql-1.txt @@ -8065,7 +8070,6 @@ share/drupal/core/modules/system/src/Tests/Path/UrlAliasFixtures.php share/drupal/core/modules/system/src/Tests/Routing/MockAliasManager.php share/drupal/core/modules/system/src/Tests/Routing/MockRouteProvider.php share/drupal/core/modules/system/src/Tests/Session/SessionHttpsTest.php -share/drupal/core/modules/system/src/Tests/System/ErrorHandlerTest.php share/drupal/core/modules/system/src/Tests/System/SystemConfigFormTestBase.php share/drupal/core/modules/system/src/Tests/Update/DbUpdatesTrait.php share/drupal/core/modules/system/src/Tests/Update/UpdatePathTestBase.php @@ -8539,6 +8543,7 @@ share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestDetail share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestDisabledElementsForm.php share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestEmailForm.php share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestEmptySelectForm.php +share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestFileForm.php share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanAdvancedForm.php share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestFormStateValuesCleanForm.php share/drupal/core/modules/system/tests/modules/form_test/src/Form/FormTestGetForm.php @@ -9066,6 +9071,7 @@ share/drupal/core/modules/system/tests/src/Functional/System/DateFormatsLockedTe share/drupal/core/modules/system/tests/src/Functional/System/DateFormatsMachineNameTest.php share/drupal/core/modules/system/tests/src/Functional/System/DateTimeTest.php share/drupal/core/modules/system/tests/src/Functional/System/DefaultMobileMetaTagsTest.php +share/drupal/core/modules/system/tests/src/Functional/System/ErrorHandlerTest.php share/drupal/core/modules/system/tests/src/Functional/System/FrontPageTest.php share/drupal/core/modules/system/tests/src/Functional/System/HtaccessTest.php share/drupal/core/modules/system/tests/src/Functional/System/IndexPhpTest.php @@ -9155,6 +9161,7 @@ share/drupal/core/modules/system/tests/src/Kernel/Common/SystemListingTest.php share/drupal/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php share/drupal/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php share/drupal/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php +share/drupal/core/modules/system/tests/src/Kernel/Form/FileElementTest.php share/drupal/core/modules/system/tests/src/Kernel/Form/FormElementLabelTest.php share/drupal/core/modules/system/tests/src/Kernel/Form/FormElementMaxlengthTest.php share/drupal/core/modules/system/tests/src/Kernel/Form/FormObjectTest.php @@ -9917,7 +9924,6 @@ share/drupal/core/modules/user/src/RoleStorageInterface.php share/drupal/core/modules/user/src/SharedTempStore.php share/drupal/core/modules/user/src/SharedTempStoreFactory.php share/drupal/core/modules/user/src/StatusItem.php -share/drupal/core/modules/user/src/Tests/RestRegisterUserTest.php share/drupal/core/modules/user/src/Tests/UserResetEmailTestTrait.php share/drupal/core/modules/user/src/Theme/AdminNegotiator.php share/drupal/core/modules/user/src/TimeZoneItem.php @@ -9991,6 +9997,7 @@ share/drupal/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.ph share/drupal/core/modules/user/tests/src/Functional/Rest/UserXmlAnonTest.php share/drupal/core/modules/user/tests/src/Functional/Rest/UserXmlBasicAuthTest.php share/drupal/core/modules/user/tests/src/Functional/Rest/UserXmlCookieTest.php +share/drupal/core/modules/user/tests/src/Functional/RestRegisterUserTest.php share/drupal/core/modules/user/tests/src/Functional/Update/UserUpdateEmailToken.php share/drupal/core/modules/user/tests/src/Functional/Update/UserUpdateOrderPermissionsTest.php share/drupal/core/modules/user/tests/src/Functional/UserAccountLinksTest.php @@ -11363,6 +11370,7 @@ share/drupal/core/profiles/demo_umami/demo_umami.profile share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/.htaccess share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/LICENCE.txt share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/baking-mishaps-our-troubleshooting-tips.html +share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/dairy-free-delicious-milk-chocolate.html share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/give-it-a-go-and-grow-your-own-herbs.html share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/give-your-oatmeal-the-ultimate-makeover.html share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/lets-hear-it-for-carrots.html @@ -11383,6 +11391,7 @@ share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/supermarket-savvy-umami.jpg share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/thai-green-curry-umami.jpg share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/umami-bundle.png +share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/vegan-chocolate.jpg share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/veggie-pasta-bake-hero-umami.jpg share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/veggie-pasta-bake-umami.jpg share/drupal/core/profiles/demo_umami/modules/demo_umami_content/default_content/images/victoria-sponge-umami.jpg @@ -12003,6 +12012,7 @@ share/drupal/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php share/drupal/core/tests/Drupal/KernelTests/Core/File/HtaccessTest.php share/drupal/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php share/drupal/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php +share/drupal/core/tests/Drupal/KernelTests/Core/File/PharWrapperTest.php share/drupal/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php share/drupal/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php share/drupal/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php @@ -15439,6 +15449,17 @@ share/drupal/vendor/twig/twig/src/TwigFunction.php share/drupal/vendor/twig/twig/src/TwigTest.php share/drupal/vendor/twig/twig/src/Util/DeprecationCollector.php share/drupal/vendor/twig/twig/src/Util/TemplateDirIterator.php +share/drupal/vendor/typo3/phar-stream-wrapper/.gitignore +share/drupal/vendor/typo3/phar-stream-wrapper/LICENSE +share/drupal/vendor/typo3/phar-stream-wrapper/README.md +share/drupal/vendor/typo3/phar-stream-wrapper/composer.json +share/drupal/vendor/typo3/phar-stream-wrapper/src/Assertable.php +share/drupal/vendor/typo3/phar-stream-wrapper/src/Behavior.php +share/drupal/vendor/typo3/phar-stream-wrapper/src/Exception.php +share/drupal/vendor/typo3/phar-stream-wrapper/src/Helper.php +share/drupal/vendor/typo3/phar-stream-wrapper/src/Interceptor/PharExtensionInterceptor.php +share/drupal/vendor/typo3/phar-stream-wrapper/src/Manager.php +share/drupal/vendor/typo3/phar-stream-wrapper/src/PharStreamWrapper.php share/drupal/vendor/web.config share/drupal/vendor/wikimedia/composer-merge-plugin/LICENSE share/drupal/vendor/wikimedia/composer-merge-plugin/README.md diff --git a/www/drupal8/distinfo b/www/drupal8/distinfo index 271cb764020..9cf0efa8222 100644 --- a/www/drupal8/distinfo +++ b/www/drupal8/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2018/12/11 09:45:54 prlw1 Exp $ +$NetBSD: distinfo,v 1.12.2.1 2019/01/29 12:50:28 bsiegert Exp $ -SHA1 (drupal-8.6.4.tar.gz) = 4ea912ac2fd0483fe887df425075407b07dd691a -RMD160 (drupal-8.6.4.tar.gz) = fcc2c2ee4ad906795eb5afb63936964fb6084cf5 -SHA512 (drupal-8.6.4.tar.gz) = ff81fe8aa10f635b5906d7a21efc5e8d44e96594d26a2637987ea2ef36b6ea323638bf4fca2374553d381645e4d187ef72d0284d4d0bad8663efe1e0b7bfcf8b -Size (drupal-8.6.4.tar.gz) = 16401179 bytes +SHA1 (drupal-8.6.6.tar.gz) = 73f6895c868156e38b588f0b0278545dbce3766d +RMD160 (drupal-8.6.6.tar.gz) = a87c3542188df65e334fee9341bdf89d6f3e295d +SHA512 (drupal-8.6.6.tar.gz) = 8db15dfc06e2a183a9e608f853b8a65c4fdacb8f8f9cd7def98fb3104a5f6121e95aa185bbdbf47bb446aff82633addcf2db420a5e21d3fb35239ce0c53f6c1d +Size (drupal-8.6.6.tar.gz) = 16478660 bytes +SHA1 (patch-core_lib_Drupal_Core_Extension_ModulesHandler.php) = 3d3bb6f82f14d213c805e9958916b1fab3169fe7 diff --git a/www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php b/www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php new file mode 100644 index 00000000000..2eee76dae1f --- /dev/null +++ b/www/drupal8/patches/patch-core_lib_Drupal_Core_Extension_ModulesHandler.php @@ -0,0 +1,22 @@ +$NetBSD: patch-core_lib_Drupal_Core_Extension_ModulesHandler.php,v 1.1.2.2 2019/01/29 12:50:28 bsiegert Exp $ + +Avoids UnknownExtensionException: +https://www.drupal.org/project/drupal/issues/3000677 + +--- core/lib/Drupal/Core/Extension/ModuleHandler.php.orig 2019-01-02 21:52:52.000000000 +0000 ++++ core/lib/Drupal/Core/Extension/ModuleHandler.php +@@ -777,7 +777,13 @@ class ModuleHandler implements ModuleHan + * {@inheritdoc} + */ + public function getName($module) { +- return \Drupal::service('extension.list.module')->getName($module); ++ try { ++ return \Drupal::service('extension.list.module')->getName($module); ++ } ++ catch (UnknownExtensionException $e) { ++ @trigger_error('Calling ModuleHandler::getName() with an unknown module is deprecated in Drupal 8.7.0 and support for this will be removed in Drupal 9.0.0, check that the module exists before calling this method. See https://www.drupal.org/node/3024541.', E_USER_DEPRECATED); ++ return $module; ++ } + } + + } |