Mon Feb 3 15:23:22 2014 UTC ()
Update contao32 to 3.2.5, including fix for CVE-2014-1860.

* pkgsrc change: remove obsolete lines for contao31.

Version 3.2.5 (2014-02-03)
--------------------------

### Fixed
Correctly load the parent pages in the navigation modules (see #6696).

### Fixed
Correctly encode URLs with GET parameters in the syndication links (see #6683).

### Fixed
Do not pass POST data to the `deserialize()` function, so it is not vulnerable
to PHP object injection. Thanks to Pedro Ribeiro for his input (see #6695).

### Fixed
Allow any character in passwords, especially the less-than symbol (see #6447).

### Fixed
Purge the image cache if a file is being renamed (see #6641).

### Fixed
Preserve tags in custom CSS definitions (see #6667).

### Fixed
Make the swipe CSS selectors more specific (see #6666).

### Fixed
Correctly optimize floating-point numbers in style sheets (see #6674).


(taca)
diff -r1.56 -r1.57 pkgsrc/www/contao/Makefile.common
diff -r1.5 -r1.6 pkgsrc/www/contao32/distinfo
cvs diff -r1.56 -r1.57 pkgsrc/www/contao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/contao/Makefile.common 2014/02/03 15:20:39 1.56
+++ pkgsrc/www/contao/Makefile.common 2014/02/03 15:23:22 1.57
@@ -1,33 +1,30 @@ @@ -1,33 +1,30 @@
1# $NetBSD: Makefile.common,v 1.56 2014/02/03 15:20:39 taca Exp $ 1# $NetBSD: Makefile.common,v 1.57 2014/02/03 15:23:22 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).
8CT_MASTER_SITE= https://github.com/contao/core/archive/ 8CT_MASTER_SITE= https://github.com/contao/core/archive/
9 9
10# current release 10# current release
11CT211_VERSION= 2.11.14 11CT211_VERSION= 2.11.14
12CT31_VERSION= 3.1.5 12CT32_VERSION= 3.2.5
13CT32_VERSION= 3.2.4 
14 13
15CT_VERS?= 211 14CT_VERS?= 211
16 15
17.if ${CT_VERS} == "211" 16.if ${CT_VERS} == "211"
18CT_VERSION= ${CT211_VERSION} 17CT_VERSION= ${CT211_VERSION}
19.elif ${CT_VERS} == "31" 
20CT_VERSION= ${CT31_VERSION} 
21.elif ${CT_VERS} == "32" 18.elif ${CT_VERS} == "32"
22CT_VERSION= ${CT32_VERSION} 19CT_VERSION= ${CT32_VERSION}
23.else 20.else
24.error "Illegal version specified: ${CT_VERS}" 21.error "Illegal version specified: ${CT_VERS}"
25.endif 22.endif
26 23
27.if ${CT_VERS} == "211" 24.if ${CT_VERS} == "211"
28CT_FILES= tl_files 25CT_FILES= tl_files
29.else 26.else
30CT_FILES= files 27CT_FILES= files
31FILESDIR= ${.CURDIR}/../../www/contao/files 28FILESDIR= ${.CURDIR}/../../www/contao/files
32.endif 29.endif
33 30
cvs diff -r1.5 -r1.6 pkgsrc/www/contao32/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/contao32/Attic/distinfo 2014/01/21 16:20:09 1.5
+++ pkgsrc/www/contao32/Attic/distinfo 2014/02/03 15:23:22 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2014/01/21 16:20:09 taca Exp $ 1$NetBSD: distinfo,v 1.6 2014/02/03 15:23:22 taca Exp $
2 2
3SHA1 (contao/3.2.4.tar.gz) = 832455aba00944266808cb0f3fa01143017b492c 3SHA1 (contao/3.2.5.tar.gz) = 25b615f535e539eeb8c8cbee9af6c057f48d0b7b
4RMD160 (contao/3.2.4.tar.gz) = 88bf0f94cb9009c82fc8e918fdf8ef065f8d2f11 4RMD160 (contao/3.2.5.tar.gz) = 40ac37d5a3bab39617f34643d8201dfc9046afd7
5Size (contao/3.2.4.tar.gz) = 10990059 bytes 5Size (contao/3.2.5.tar.gz) = 10996027 bytes
6SHA1 (patch-system_bin_sqldump) = a22f7dab9043cf9f965e695b895d7c32f48c9f91 6SHA1 (patch-system_bin_sqldump) = a22f7dab9043cf9f965e695b895d7c32f48c9f91