CVS commit: pkgsrc/www/contao35

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Dec 20 21:08:29 UTC 2016

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

Log Message:
Update contao35 to 3.5.20 which includes potential XSS security problem.

Version 3.5.20 (2016-12-19)
---------------------------

### Fixed
Correctly show running repeated events in the event list (see #8588).

### Fixed
Improve the PHP 7.1 compatibility.

### Fixed
Keep the root nodes order in the page selector (see #8577).

### Fixed
Do not output invalid option values in widget error messages (see #8594).
Thanks to Pascal Gerundt for finding and reporting the issue.

### Fixed
Correctly parse english dates in MooTools (see #8573).


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/contao35/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/contao35/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/contao35/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/contao35/Makefile
diff -u pkgsrc/www/contao35/Makefile:1.19 pkgsrc/www/contao35/Makefile:1.20
--- pkgsrc/www/contao35/Makefile:1.19   Wed Nov 16 16:29:34 2016
+++ pkgsrc/www/contao35/Makefile        Tue Dec 20 21:08:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/11/16 16:29:34 taca Exp $
+# $NetBSD: Makefile,v 1.20 2016/12/20 21:08:29 taca Exp $
 #
 
 DISTNAME=      contao-${CT_PKGVER}
@@ -23,7 +23,7 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-curl>=5.4.0:
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
 DEPENDS+=      bash>=4.0:../../shells/bash
 
-CT_VERSION=    3.5.19
+CT_VERSION=    3.5.20
 USE_TOOLS=     bash pax
 NO_BUILD=      yes
 FILESDIR?=     ${.CURDIR}/files
@@ -66,6 +66,8 @@ REPLACE_FILES.php=    system/bin/automator 
     system/bin/ide_compat system/bin/txpurge system/bin/version \
     vendor/bin/lessc vendor/bin/minifycss vendor/bin/minifyjs \
     vendor/bin/pscss vendor/leafo/scssphp/bin/pscss \
+    vendor/matthiasmullie/minify/bin/minifycss \
+    vendor/matthiasmullie/minify/bin/minifyjs \
     vendor/oyejorge/less.php/bin/lessc \
     vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
     vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
@@ -88,6 +90,12 @@ PKG_USERS_VARS+=     APACHE_USER
 
 pre-configure:
        ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
+       ${CHMOD} -x \
+           ${WRKSRC}/vendor/oyejorge/less.php/lib/Less/Less.php.combine \
+           ${WRKSRC}/vendor/simplepie/simplepie/.travis.yml \
+           ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie.php \
+           ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php \
+           ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie/Registry.php
 
 pre-install:
        ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;

Index: pkgsrc/www/contao35/PLIST
diff -u pkgsrc/www/contao35/PLIST:1.12 pkgsrc/www/contao35/PLIST:1.13
--- pkgsrc/www/contao35/PLIST:1.12      Tue Oct 25 16:27:05 2016
+++ pkgsrc/www/contao35/PLIST   Tue Dec 20 21:08:29 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2016/10/25 16:27:05 taca Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/12/20 21:08:29 taca Exp $
 ${CT_WEBDIR}/.htaccess.default
 ${CT_WEBDIR}/README.md
 ${CT_WEBDIR}/assets/ace/1.1.9/ace.js
@@ -3259,6 +3259,7 @@ ${CT_WEBDIR}/vendor/michelf/php-markdown
 ${CT_WEBDIR}/vendor/michelf/php-markdown/Readme.md
 ${CT_WEBDIR}/vendor/michelf/php-markdown/Readme.php
 ${CT_WEBDIR}/vendor/michelf/php-markdown/composer.json
+${CT_WEBDIR}/vendor/oyejorge/less.php/.gitattributes
 ${CT_WEBDIR}/vendor/oyejorge/less.php/.gitignore
 ${CT_WEBDIR}/vendor/oyejorge/less.php/CHANGES.md
 ${CT_WEBDIR}/vendor/oyejorge/less.php/LICENSE
@@ -3387,6 +3388,7 @@ ${CT_WEBDIR}/vendor/simplepie/simplepie/
 ${CT_WEBDIR}/vendor/simplepie/simplepie/library/SimplePie/Source.php
 ${CT_WEBDIR}/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
 ${CT_WEBDIR}/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
+${CT_WEBDIR}/vendor/swiftmailer/swiftmailer/.gitattributes
 ${CT_WEBDIR}/vendor/swiftmailer/swiftmailer/.gitignore
 ${CT_WEBDIR}/vendor/swiftmailer/swiftmailer/.travis.yml
 ${CT_WEBDIR}/vendor/swiftmailer/swiftmailer/CHANGES

Index: pkgsrc/www/contao35/distinfo
diff -u pkgsrc/www/contao35/distinfo:1.16 pkgsrc/www/contao35/distinfo:1.17
--- pkgsrc/www/contao35/distinfo:1.16   Wed Nov 16 16:29:34 2016
+++ pkgsrc/www/contao35/distinfo        Tue Dec 20 21:08:29 2016
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2016/11/16 16:29:34 taca Exp $
+$NetBSD: distinfo,v 1.17 2016/12/20 21:08:29 taca Exp $
 
-SHA1 (contao-3.5.19.tar.gz) = 603928b7608a000b6e93a45640e71399d8e2a2ce
-RMD160 (contao-3.5.19.tar.gz) = c03af132e356096fb038fefa151fc8de61cc8f0d
-SHA512 (contao-3.5.19.tar.gz) = 20278546a0b19b41a60e13ee2b0e3b7a28ccfbb44fbdb6bd8040689885aa368e2312e104758daebd0375e1882f40b2bdf5eb083b5da1fbdf777582d29f10a530
-Size (contao-3.5.19.tar.gz) = 11050779 bytes
+SHA1 (contao-3.5.20.tar.gz) = c1bfbb718d5ce876634c4fbe7b62d30dfbcc72ac
+RMD160 (contao-3.5.20.tar.gz) = 754e701378537d88ebbd723fde0c3eadfeaf4f37
+SHA512 (contao-3.5.20.tar.gz) = 5f3a1bc57e6aa04355ee3aec8711a870dee2021701d060b2759f4a1cb352dbe86f424fcec5753dbb0130c875bb8bfe87f3372ae530fe053a8ccf158dc20d62a7
+Size (contao-3.5.20.tar.gz) = 11047605 bytes