Pullup ticket #5647 - requested by taca

www/contao35: security fix

Revisions pulled up:
- www/contao35/Makefile                                         1.33-1.35
- www/contao35/PLIST                                            1.16-1.17
- www/contao35/distinfo                                         1.25-1.27

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Sep 28 12:46:25 UTC 2017

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

   Log Message:
   www/contao35: update to 3.5.29

   Version 3.5.29 (2017-09-27)
   ---------------------------

   ### Fixed
   Correctly handle unencoded data images in the Combiner (see #8788).

   ### Fixed
   Correctly show multi-day events if the shortened view is disabled (see #8782).

   ### Fixed
   Do not add a suffix when copying if the "doNotCopy" flag is set (see #8610).

   ### Fixed
   Use the module type as group header if sorted by type (see #8402).

   ### Fixed
   Always show the "show from" and "show until" fields (see #8766).

   ### Fixed
   Encode the username when opening the front end preview as a member (see #8762).

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Oct  7 13:01:17 UTC 2017

   Modified Files:
   	pkgsrc/www/contao35: Makefile distinfo

   Log Message:
   www/contao35: Update to 3.5.30.

   Version 3.5.30 (2017-10-06)
   ---------------------------

   ### Fixed
   Filter multi-day events outside the scope in the event list (see #8792).

   ### Fixed
   Correctly show multi-day events if the shortened view is disabled (see #8782).

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Nov 15 14:07:53 UTC 2017

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

   Log Message:
   Update contaoet to 3.5.31.

   Version 3.5.31 (2017-11-15)
   ---------------------------

   ### Fixed
   Prevent SQL injections in the back end search panel (see CVE-2017-16558).

3 files changed, 11 insertions, 9 deletions

diff --git a/www/contao35/Makefile b/www/contao35/Makefile
index 8412f97eac3..855f16bd9f1 100644
--- a/www/contao35/Makefile
+++ b/www/contao35/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/09/11 16:08:41 taca Exp $
+# $NetBSD: Makefile,v 1.32.4.1 2017/11/25 08:49:25 bsiegert Exp $
 #
 
 DISTNAME=	contao-${CT_PKGVER}
@@ -20,7 +20,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap
 DEPENDS+=	${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
 DEPENDS+=	${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
 
-CT_VERSION=	3.5.28
+CT_VERSION=	3.5.31
 USE_TOOLS=	bash:run pax
 NO_BUILD=	yes
 FILESDIR?=	${.CURDIR}/files
diff --git a/www/contao35/PLIST b/www/contao35/PLIST
index 0cd29d191df..f6ccd0936fb 100644
--- a/www/contao35/PLIST
+++ b/www/contao35/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2017/04/25 15:50:41 taca Exp $
+@comment $NetBSD: PLIST,v 1.15.6.1 2017/11/25 08:49:25 bsiegert Exp $
 ${CT_WEBDIR}/.htaccess.default
 ${CT_WEBDIR}/README.md
 ${CT_WEBDIR}/assets/ace/1.1.9/ace.js
@@ -3305,6 +3305,7 @@ ${CT_WEBDIR}/vendor/leafo/scssphp/src/Type.php
 ${CT_WEBDIR}/vendor/leafo/scssphp/src/Util.php
 ${CT_WEBDIR}/vendor/leafo/scssphp/src/Version.php
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/CONTRIBUTING.md
+${CT_WEBDIR}/vendor/matthiasmullie/minify/Dockerfile
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/LICENSE
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/bin/minifycss
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/bin/minifyjs
@@ -3315,6 +3316,7 @@ ${CT_WEBDIR}/vendor/matthiasmullie/minify/data/js/keywords_reserved.txt
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/data/js/operators.txt
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/data/js/operators_after.txt
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/data/js/operators_before.txt
+${CT_WEBDIR}/vendor/matthiasmullie/minify/docker-compose.yml
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/src/CSS.php
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/src/Exception.php
 ${CT_WEBDIR}/vendor/matthiasmullie/minify/src/Exceptions/BasicException.php
@@ -3649,7 +3651,7 @@ ${CT_WEBDIR}/vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_confi
 ${CT_WEBDIR}/vendor/swiftmailer/swiftmailer/phpunit.xml.dist
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/LICENSE.TXT
-${CT_WEBDIR}/vendor/tecnickcom/tcpdf/README.TXT
+${CT_WEBDIR}/vendor/tecnickcom/tcpdf/README.md
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/composer.json
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/fonts/courier.php
diff --git a/www/contao35/distinfo b/www/contao35/distinfo
index 39473d9b209..28882255f13 100644
--- a/www/contao35/distinfo
+++ b/www/contao35/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2017/07/12 14:42:55 taca Exp $
+$NetBSD: distinfo,v 1.24.4.1 2017/11/25 08:49:25 bsiegert Exp $
 
-SHA1 (contao-3.5.28.tar.gz) = aa0686b67cce429e830621cdcc80f41f07ddb221
-RMD160 (contao-3.5.28.tar.gz) = 0489e34930db87aec5a7c9083758e106d38f724e
-SHA512 (contao-3.5.28.tar.gz) = fb891cfe949e805d2b082622bc640267898d70b70dd2533161df69c4acc05c2efa8b2357b1da53d9200e441eb03fce3634b4394f57fb59ecdd3e57b690856110
-Size (contao-3.5.28.tar.gz) = 11180306 bytes
+SHA1 (contao-3.5.31.tar.gz) = 26b37675d0dd99337118ba3b20e4099c41b46e4e
+RMD160 (contao-3.5.31.tar.gz) = 03d03f064e0b3353767672ac3648c5cf5eff489c
+SHA512 (contao-3.5.31.tar.gz) = eecb648e29f551dc9feaadd5cd1b9c767bd84bea1d2dfdcbe7094f74c2c6a76d4d73a8d55607b87ef84c6e4401e2d6956bbd690196fe04cd3934d0f876e46ff7
+Size (contao-3.5.31.tar.gz) = 11232968 bytes