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).diff -r1.63 -r1.64 pkgsrc/www/contao/Makefile.common
(taca)
@@ -1,25 +1,25 @@ | @@ -1,25 +1,25 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.63 2014/04/07 13:27:56 taca Exp $ | 1 | # $NetBSD: Makefile.common,v 1.64 2014/04/07 13:30:06 taca Exp $ | |
2 | # | 2 | # | |
3 | # used by www/contao/Makefile.example" | 3 | # used by www/contao/Makefile.example" | |
4 | # used by www/contao211/Makefile | 4 | # used by www/contao211/Makefile | |
5 | # used by www/contao32/Makefile | 5 | # used by www/contao32/Makefile | |
6 | 6 | |||
7 | # Contao master site (on GitHub). | 7 | # Contao master site (on GitHub). | |
8 | CT_MASTER_SITE= https://github.com/contao/core/archive/ | 8 | CT_MASTER_SITE= https://github.com/contao/core/archive/ | |
9 | 9 | |||
10 | # current release | 10 | # current release | |
11 | CT211_VERSION= 2.11.17 | 11 | CT211_VERSION= 2.11.17 | |
12 | CT32_VERSION= 3.2.8 | 12 | CT32_VERSION= 3.2.9 | |
13 | 13 | |||
14 | CT_VERS?= 211 | 14 | CT_VERS?= 211 | |
15 | 15 | |||
16 | .if ${CT_VERS} == "211" | 16 | .if ${CT_VERS} == "211" | |
17 | CT_VERSION= ${CT211_VERSION} | 17 | CT_VERSION= ${CT211_VERSION} | |
18 | .elif ${CT_VERS} == "32" | 18 | .elif ${CT_VERS} == "32" | |
19 | CT_VERSION= ${CT32_VERSION} | 19 | CT_VERSION= ${CT32_VERSION} | |
20 | .else | 20 | .else | |
21 | .error "Illegal version specified: ${CT_VERS}" | 21 | .error "Illegal version specified: ${CT_VERS}" | |
22 | .endif | 22 | .endif | |
23 | 23 | |||
24 | .if ${CT_VERS} == "211" | 24 | .if ${CT_VERS} == "211" | |
25 | CT_FILES= tl_files | 25 | CT_FILES= tl_files |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2014/03/13 13:55:07 taca Exp $ | 1 | $NetBSD: distinfo,v 1.10 2014/04/07 13:30:06 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (contao/3.2.8.tar.gz) = d7b3b8062022f8edf9b7a1256681cf2c5bbbcac8 | 3 | SHA1 (contao/3.2.9.tar.gz) = 89c604013a05926403edb2d5bf57cefb334434a5 | |
4 | RMD160 (contao/3.2.8.tar.gz) = 2cd9d886291775a3db3f8c924f66f3185673cb39 | 4 | RMD160 (contao/3.2.9.tar.gz) = bbe387c2bb68001d2273820b27e636d363c895d9 | |
5 | Size (contao/3.2.8.tar.gz) = 10998490 bytes | 5 | Size (contao/3.2.9.tar.gz) = 11002065 bytes | |
6 | SHA1 (patch-system_bin_sqldump) = a22f7dab9043cf9f965e695b895d7c32f48c9f91 | 6 | SHA1 (patch-system_bin_sqldump) = 920e6e8e579ae2cbeb84ca6ac74f4b9951a66f5c |
@@ -1,12 +1,16 @@ | @@ -1,12 +1,16 @@ | |||
1 | $NetBSD: patch-system_bin_sqldump,v 1.1 2013/11/21 16:52:43 taca Exp $ | 1 | $NetBSD: patch-system_bin_sqldump,v 1.2 2014/04/07 13:30:06 taca Exp $ | |
2 | 2 | |||
3 | No bash specific function is needed here. | 3 | No bash specific function is needed here. | |
4 | 4 | |||
5 | --- system/bin/sqldump.orig 2013-10-24 09:11:21.000000000 +0000 | 5 | --- system/bin/sqldump.orig 2014-04-07 08:30:27.000000000 +0000 | |
6 | +++ system/bin/sqldump | 6 | +++ system/bin/sqldump | |
7 | @@ -1,4 +1,4 @@ | 7 | @@ -1,7 +1,7 @@ | |
8 | -#!/bin/bash | 8 | -#!/bin/bash | |
9 | +#!/bin/sh | 9 | +#!/bin/sh | |
10 | 10 | |||
11 | # Clean the database | 11 | # Database name | |
12 | mysql <<EOF | 12 | -if [[ $1 != "" ]]; then | |
13 | +if [ "$1" ]; then | |||
14 | tpl=$1 | |||
15 | else | |||
16 | tpl="music_academy" |