Pullup ticket #4358 - requested by taca

www/contao32: security update

Revisions pulled up:
- www/contao/Makefile.common                                    1.64
- www/contao32/distinfo                                         1.10
- www/contao32/patches/patch-system_bin_sqldump                 1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Apr  7 13:30:06 UTC 2014

   Modified Files:
   	pkgsrc/www/contao: Makefile.common
   	pkgsrc/www/contao32: distinfo
   	pkgsrc/www/contao32/patches: patch-system_bin_sqldump

   Log Message:
   Update contao32 to 3.2.9.

   Version 3.2.9 (2014-04-07)
   --------------------------

   ### Fixed
   Fixed a critical vulnerability of the install tool (see #6855).

   ### Fixed
   Filter disabled groups in the registration module in the front end (see #6757).

   ### Fixed
   Work around a bug in SimplePie with the "skip items" option (see #6107).

   ### Fixed
   Fix the Swipe "continuous" option if there are exactly two slides (see #6812).

   ### Fixed
   Apply `addslashes()` to strings in the `Config` class (see #6808).

   ### Fixed
   Do not empty all fallback fields in sorting mode 4 (see #6498).

   ### Fixed
   Do not allow template names to be longer than the DB fields (see #6819).

   ### Fixed
   Correctly set the start time of a multi-day event (see #6802).

   ### Fixed
   Correctly handle OR queries in the listing module (see #6344).

   ### Fixed
   Use a monospaced font for the plain text newsletter preview (see #6790).

   ### Fixed
   Adjust the `vScrollTo()` offset if the paste hint is visible (see #6478).

3 files changed, 16 insertions, 12 deletions

diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common
index 45f0253601d..f3b59fa8796 100644
--- a/www/contao/Makefile.common
+++ b/www/contao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62.2.1 2014/04/09 10:59:14 tron Exp $
+# $NetBSD: Makefile.common,v 1.62.2.2 2014/04/09 11:10:15 tron Exp $
 #
 # used by www/contao/Makefile.example"
 # used by www/contao211/Makefile
@@ -9,7 +9,7 @@ CT_MASTER_SITE=	https://github.com/contao/core/archive/
 
 # current release
 CT211_VERSION=	2.11.17
-CT32_VERSION=	3.2.8
+CT32_VERSION=	3.2.9
 
 CT_VERS?=	211
 
diff --git a/www/contao32/distinfo b/www/contao32/distinfo
index 5231355dee1..11411d54fe6 100644
--- a/www/contao32/distinfo
+++ b/www/contao32/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2014/03/13 13:55:07 taca Exp $
+$NetBSD: distinfo,v 1.9.2.1 2014/04/09 11:10:15 tron Exp $
 
-SHA1 (contao/3.2.8.tar.gz) = d7b3b8062022f8edf9b7a1256681cf2c5bbbcac8
-RMD160 (contao/3.2.8.tar.gz) = 2cd9d886291775a3db3f8c924f66f3185673cb39
-Size (contao/3.2.8.tar.gz) = 10998490 bytes
-SHA1 (patch-system_bin_sqldump) = a22f7dab9043cf9f965e695b895d7c32f48c9f91
+SHA1 (contao/3.2.9.tar.gz) = 89c604013a05926403edb2d5bf57cefb334434a5
+RMD160 (contao/3.2.9.tar.gz) = bbe387c2bb68001d2273820b27e636d363c895d9
+Size (contao/3.2.9.tar.gz) = 11002065 bytes
+SHA1 (patch-system_bin_sqldump) = 920e6e8e579ae2cbeb84ca6ac74f4b9951a66f5c
diff --git a/www/contao32/patches/patch-system_bin_sqldump b/www/contao32/patches/patch-system_bin_sqldump
index d584410b7e4..4f8133f1ca5 100644
--- a/www/contao32/patches/patch-system_bin_sqldump
+++ b/www/contao32/patches/patch-system_bin_sqldump
@@ -1,12 +1,16 @@
-$NetBSD: patch-system_bin_sqldump,v 1.1 2013/11/21 16:52:43 taca Exp $
+$NetBSD: patch-system_bin_sqldump,v 1.1.4.1 2014/04/09 11:10:15 tron Exp $
 
 No bash specific function is needed here.
 
---- system/bin/sqldump.orig	2013-10-24 09:11:21.000000000 +0000
+--- system/bin/sqldump.orig	2014-04-07 08:30:27.000000000 +0000
 +++ system/bin/sqldump
-@@ -1,4 +1,4 @@
+@@ -1,7 +1,7 @@
 -#!/bin/bash
 +#!/bin/sh
  
- # Clean the database
- mysql <<EOF
+ # Database name
+-if [[ $1 != "" ]]; then
++if [ "$1" ]; then
+   tpl=$1
+ else
+   tpl="music_academy"