Pullup ticket #5062 - requested by taca

www/contao42: security update

Revisions pulled up:
- www/contao42/Makefile                                         1.2
- www/contao42/PLIST                                            1.2
- www/contao42/distinfo                                         1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Jul 17 14:00:25 UTC 2016

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

   Log Message:
   Update contao42 to 4.2.1.

   ### 4.2.1 (2016-07-15)

    * Strip soft hyphens when indexing a page (see contao/core#8389).
    * Do not run the command scheduler if the installation is incomplete (see #541).
    * Do not index randomly ordered image galleries.
    * Fix the filter menu layout on mobile devices.
    * Provide the back end fonts in different variants (see #523).
    * Fix the message markup in the member templates.
    * Correctly load the language strings in the pretty error screen listener.


   To generate a diff of this commit:
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/contao42/Makefile \
       pkgsrc/www/contao42/PLIST pkgsrc/www/contao42/distinfo

3 files changed, 36 insertions, 18 deletions

diff --git a/www/contao42/Makefile b/www/contao42/Makefile
index 07cd3250ce7..45648b4ef0a 100644
--- a/www/contao42/Makefile
+++ b/www/contao42/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/06/19 12:53:04 taca Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2016/07/28 17:25:23 spz Exp $
 #
 
 DISTNAME=	contao-${CT_PKGVER}
@@ -24,7 +24,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
 DEPENDS+=	bash>=4.0:../../shells/bash
 
-CT_VERSION=	4.2.0
+CT_VERSION=	4.2.1
 USE_TOOLS=	bash pax
 NO_BUILD=	yes
 
diff --git a/www/contao42/PLIST b/www/contao42/PLIST
index 84c047ef9db..7322e3515b7 100644
--- a/www/contao42/PLIST
+++ b/www/contao42/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/06/19 12:53:04 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2016/07/28 17:25:23 spz Exp $
 ${CT_WEBDIR}/CHANGELOG.md
 ${CT_WEBDIR}/README.md
 ${CT_WEBDIR}/app/AppCache.php
@@ -1896,12 +1896,30 @@ ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/basi
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/confirm.css
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/diff.css
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts.css
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/ArchitectsDaughter.woff
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/OFL.txt
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Light.woff
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Medium.woff
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Regular.woff
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/RobotoMono-Light.woff
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Architects-Daughter-regular/Architects-Daughter-regular.eot
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Architects-Daughter-regular/Architects-Daughter-regular.svg
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Architects-Daughter-regular/Architects-Daughter-regular.ttf
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Architects-Daughter-regular/Architects-Daughter-regular.woff
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Architects-Daughter-regular/Architects-Daughter-regular.woff2
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Architects-Daughter-regular/LICENSE.txt
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-300/LICENSE.txt
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-300/Roboto-300.eot
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-300/Roboto-300.svg
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-300/Roboto-300.ttf
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-300/Roboto-300.woff
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-300/Roboto-300.woff2
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-500/LICENSE.txt
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-500/Roboto-500.eot
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-500/Roboto-500.svg
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-500/Roboto-500.ttf
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-500/Roboto-500.woff
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-500/Roboto-500.woff2
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Mono-300/LICENSE.txt
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Mono-300/Roboto-Mono-300.eot
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Mono-300/Roboto-Mono-300.svg
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Mono-300/Roboto-Mono-300.ttf
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Mono-300/Roboto-Mono-300.woff
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/fonts/Roboto-Mono-300/Roboto-Mono-300.woff2
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/help.css
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/hover.js
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/1cl.svg
@@ -1938,7 +1956,6 @@ ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icon
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/copychilds_.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/css.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/cssimport.svg
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/current.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/cut.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/cut_.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/db.svg
@@ -1992,7 +2009,6 @@ ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icon
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/help.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/hints.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/important.svg
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/index.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/invisible.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/layout.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/left.svg
@@ -2033,7 +2049,6 @@ ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icon
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/preview.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/profile.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/published.svg
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/purge.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/redirect.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/redirect_1.svg
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/themes/flexible/icons/redirect_2.svg
@@ -4389,9 +4404,9 @@ ${CT_WEBDIR}/vendor/symfony/swiftmailer-bundle/phpunit.xml.dist
 ${CT_WEBDIR}/vendor/symfony/symfony/.composer/config.json
 ${CT_WEBDIR}/vendor/symfony/symfony/.editorconfig
 ${CT_WEBDIR}/vendor/symfony/symfony/.github/PULL_REQUEST_TEMPLATE.md
+${CT_WEBDIR}/vendor/symfony/symfony/.github/travis.php
 ${CT_WEBDIR}/vendor/symfony/symfony/.gitignore
 ${CT_WEBDIR}/vendor/symfony/symfony/.php_cs
-${CT_WEBDIR}/vendor/symfony/symfony/.travis.php
 ${CT_WEBDIR}/vendor/symfony/symfony/.travis.yml
 ${CT_WEBDIR}/vendor/symfony/symfony/CHANGELOG-3.0.md
 ${CT_WEBDIR}/vendor/symfony/symfony/CHANGELOG-3.1.md
@@ -5507,6 +5522,7 @@ ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validat
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/RepeatedTypeValidatorExtension.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/SubmitTypeValidatorExtension.php
+${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -5616,6 +5632,7 @@ ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/ApacheR
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/CHANGELOG.md
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Cookie.php
+${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Exception/ConflictingHeadersException.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/Exception/AccessDeniedException.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/File/Exception/FileException.php
@@ -5749,6 +5766,7 @@ ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListen
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/TranslatorListener.php
+${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/EventListener/ValidateRequestListener.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Exception/AccessDeniedHttpException.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Exception/BadRequestHttpException.php
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Exception/ConflictHttpException.php
diff --git a/www/contao42/distinfo b/www/contao42/distinfo
index d931c8f606c..8889b5b4588 100644
--- a/www/contao42/distinfo
+++ b/www/contao42/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2016/06/19 12:53:04 taca Exp $
+$NetBSD: distinfo,v 1.1.2.1 2016/07/28 17:25:23 spz Exp $
 
-SHA1 (contao-4.2.0.tar.gz) = f76a5ea6b3d15958a70cd5bee4fd36ec9bcb9d94
-RMD160 (contao-4.2.0.tar.gz) = 7ff336cf1a738eaec491ec09cc75b171c5ef4e32
-SHA512 (contao-4.2.0.tar.gz) = e6f0ef473fda35f7421ec894675339c6d49caa0199b1826ed996837da0ba93777e72c25e128f6c4596ec7392212d7dc6cc68d9d7c88a3f09e2d54b378ca0b49e
-Size (contao-4.2.0.tar.gz) = 14323205 bytes
+SHA1 (contao-4.2.1.tar.gz) = 8cdcd8e6ca8b46b25ed5bdf8e27e81eee9a3d03c
+RMD160 (contao-4.2.1.tar.gz) = 84a793e6ef51b8672fb8ee173fd934a1d8be1200
+SHA512 (contao-4.2.1.tar.gz) = b808480581b4de6589688ddbffc0392fdb05b765a417e6d907aaa77093f48b6d4baf3ef0f4bbb74950b27c99ccd11ee9625e700377a7c048eab2515f887e61e5
+Size (contao-4.2.1.tar.gz) = 14613848 bytes