Pullup ticket #4557 - requested by taca

www/contao32: security update

Revisions pulled up:
- www/contao/Makefile.common                                    patch
- www/contao32/PLIST                                            1.9
- www/contao32/distinfo                                         1.16-1.17

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Nov  2 01:17:44 UTC 2014

   Modified Files:
   	pkgsrc/www/contao: Makefile.common
   	pkgsrc/www/contao32: PLIST distinfo

   Log Message:
   Update contao32 to 3.2.15.

   Version 3.2.15 (2014-10-31)
   ---------------------------

   ### Fixed
   Always pass a DC object in the `toggleVisibility` callback (see #7314).

   ### Fixed
   Correctly render the "read more" and article navigation links (see #7300).

   ### Fixed
   Consider the `useSSL` flag of the root page when generating URLs (see #7390).

   ### Fixed
   Fixed the FAQ sorting in the back end (see #7362).

   ### Fixed
   Added the `Widget::__isset()` method (see #7290).

   ### Fixed
   Correctly handle dynamic parent tables in the `DC_Table` driver (see #7335).

   ### Fixed
   Correctly shortend HTML strings in `String::substrHtml()` (see #7311).

   ### Updated
   Updated MooTools to version 1.5.1 (see #7267).

   ### Fixed
   Updated swipe.js to version 2.0.1 (see #7307).

   ### Fixed
   Use an `.invisible` class which plays nicely with screen readers (see #7372).

   ### Fixed
   Handle disabled modules in the module loader (see #7380).

   ### Fixed
   Fixed the "link_target" insert tag.

   ### Updated
   Updated the ACE editor to version 1.1.6 (see #7278).

   ### Fixed
   Fix the `Database::list_fields()` method (see #7277).

   ### Fixed
   Correctly assign "col_first" and "col_last" in the image gallery (see #7250).

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Nov 24 13:29:08 UTC 2014

   Modified Files:
   	pkgsrc/www/contao: Makefile.common
   	pkgsrc/www/contao32: distinfo

   Log Message:
   Update contao32 to 3.2.16, security release.

   Version 3.2.16 (2014-11-24)
   ---------------------------

   ### Fixed
   Fixed a potential directory traversal vulnerability.

   ### Fixed
   Fixed a severe XSS vulnerability. In this context, the insert tag flags
   `base64_encode` and `base64_decode` have been removed.

   ### Fixed
   Handle nested insert tags in strip_insert_tags().

   ### Fixed
   Correctly store the model in Dbafs::addResource() (see #7440).

   ### Fixed
   Send the request token when toggling the visibility of an element (see #7406).

   ### Fixed
   Always apply the IE security fix in the Environment class (see #7453).

   ### Fixed
   Correctly handle archives being part of multiple RSS feeds (see #7398).

   ### Fixed
   Correctly handle `0` in utf8_convert_encoding() (see #7403).

   ### Fixed
   Send a 301 redirect to forward to the language root page (see #7420).

3 files changed, 64 insertions, 64 deletions

diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common
index cceb2ea63b4..ba1971d85c4 100644
--- a/www/contao/Makefile.common
+++ b/www/contao/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.81 2014/08/29 14:35:30 taca Exp $
+# $NetBSD: Makefile.common,v 1.81.2.1 2014/11/25 14:53:03 tron Exp $
 #
 # used by www/contao32/Makefile
 # used by www/contao33/Makefile
 
 # current release
-CT32_VERSION=	3.2.14
+CT32_VERSION=	3.2.16
 CT33_VERSION=	3.3.5
 
 CT_VERS?=	32
diff --git a/www/contao32/PLIST b/www/contao32/PLIST
index 5019cc0a509..e879123226d 100644
--- a/www/contao32/PLIST
+++ b/www/contao32/PLIST
@@ -1,54 +1,54 @@
-@comment $NetBSD: PLIST,v 1.8 2014/07/30 03:26:40 taca Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2014/11/25 14:53:03 tron Exp $
 ${CT_WEBDIR}/.gitignore
 ${CT_WEBDIR}/.htaccess.default
 ${CT_WEBDIR}/README.md
-${CT_WEBDIR}/assets/ace/1.1.3/ace.js
-${CT_WEBDIR}/assets/ace/1.1.3/ext-searchbox.js
-${CT_WEBDIR}/assets/ace/1.1.3/ext-spellcheck.js
-${CT_WEBDIR}/assets/ace/1.1.3/ext-static_highlight.js
-${CT_WEBDIR}/assets/ace/1.1.3/ext-textarea.js
-${CT_WEBDIR}/assets/ace/1.1.3/keybinding-emacs.js
-${CT_WEBDIR}/assets/ace/1.1.3/keybinding-vim.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-asciidoc.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-css.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-diff.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-html.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-ini.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-java.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-javascript.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-json.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-jsp.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-jsx.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-less.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-livescript.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-markdown.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-mysql.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-perl.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-pgsql.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-php.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-python.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-rdoc.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-rhtml.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-ruby.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-scss.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-sh.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-sql.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-text.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-textile.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-xml.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-xquery.js
-${CT_WEBDIR}/assets/ace/1.1.3/mode-yaml.js
-${CT_WEBDIR}/assets/ace/1.1.3/theme-clouds.js
-${CT_WEBDIR}/assets/ace/1.1.3/theme-textmate.js
-${CT_WEBDIR}/assets/ace/1.1.3/theme-vibrant_ink.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-coffee.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-css.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-html.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-javascript.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-json.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-lua.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-php.js
-${CT_WEBDIR}/assets/ace/1.1.3/worker-xquery.js
+${CT_WEBDIR}/assets/ace/1.1.6/ace.js
+${CT_WEBDIR}/assets/ace/1.1.6/ext-searchbox.js
+${CT_WEBDIR}/assets/ace/1.1.6/ext-spellcheck.js
+${CT_WEBDIR}/assets/ace/1.1.6/ext-static_highlight.js
+${CT_WEBDIR}/assets/ace/1.1.6/ext-textarea.js
+${CT_WEBDIR}/assets/ace/1.1.6/keybinding-emacs.js
+${CT_WEBDIR}/assets/ace/1.1.6/keybinding-vim.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-asciidoc.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-css.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-diff.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-html.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-ini.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-java.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-javascript.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-json.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-jsp.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-jsx.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-less.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-livescript.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-markdown.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-mysql.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-perl.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-pgsql.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-php.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-python.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-rdoc.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-rhtml.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-ruby.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-scss.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-sh.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-sql.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-text.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-textile.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-xml.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-xquery.js
+${CT_WEBDIR}/assets/ace/1.1.6/mode-yaml.js
+${CT_WEBDIR}/assets/ace/1.1.6/theme-clouds.js
+${CT_WEBDIR}/assets/ace/1.1.6/theme-textmate.js
+${CT_WEBDIR}/assets/ace/1.1.6/theme-vibrant_ink.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-coffee.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-css.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-html.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-javascript.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-json.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-lua.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-php.js
+${CT_WEBDIR}/assets/ace/1.1.6/worker-xquery.js
 ${CT_WEBDIR}/assets/contao/css/debug-uncompressed.css
 ${CT_WEBDIR}/assets/contao/css/debug.css
 ${CT_WEBDIR}/assets/contao/css/form-uncompressed.css
@@ -213,16 +213,16 @@ ${CT_WEBDIR}/assets/mootools/colorpicker/1.3/images/moor_slider.png
 ${CT_WEBDIR}/assets/mootools/colorpicker/1.3/images/moor_woverlay.png
 ${CT_WEBDIR}/assets/mootools/colorpicker/1.3/js/mooRainbow-uncompressed.js
 ${CT_WEBDIR}/assets/mootools/colorpicker/1.3/js/mooRainbow.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-core-uncompressed.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-core.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-mobile-uncompressed.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-mobile.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-more-uncompressed.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-more.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-request-uncompressed.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-request.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools-uncompressed.js
-${CT_WEBDIR}/assets/mootools/core/1.5.0/mootools.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-core-uncompressed.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-core.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-mobile-uncompressed.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-mobile.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-more-uncompressed.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-more.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-request-uncompressed.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-request.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools-uncompressed.js
+${CT_WEBDIR}/assets/mootools/core/1.5.1/mootools.js
 ${CT_WEBDIR}/assets/mootools/datepicker/2.2.0/buttons.png
 ${CT_WEBDIR}/assets/mootools/datepicker/2.2.0/dashboard.css
 ${CT_WEBDIR}/assets/mootools/datepicker/2.2.0/datepicker.js
diff --git a/www/contao32/distinfo b/www/contao32/distinfo
index eb1d58b2541..918a9ba7463 100644
--- a/www/contao32/distinfo
+++ b/www/contao32/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2014/08/29 14:33:08 taca Exp $
+$NetBSD: distinfo,v 1.15.2.1 2014/11/25 14:53:03 tron Exp $
 
-SHA1 (contao/3.2.14.tar.gz) = 803aed4576f89a9099a514b22a0de15a50b1b411
-RMD160 (contao/3.2.14.tar.gz) = fae6b888ed0cecbb98c2db9b02ea692c4122c999
-Size (contao/3.2.14.tar.gz) = 10621643 bytes
+SHA1 (contao/3.2.16.tar.gz) = 0ca4af45ba3f287510c0ef7b33e5ca28832d5bb9
+RMD160 (contao/3.2.16.tar.gz) = 16532482571147bce6456af950897fe1a1e53ae6
+Size (contao/3.2.16.tar.gz) = 11128999 bytes
 SHA1 (patch-system_bin_sqldump) = 920e6e8e579ae2cbeb84ca6ac74f4b9951a66f5c