Thu Jan 6 13:19:08 2011 UTC ()
Update contao29 (and implicitly contao29-example) pacakge to 2.9.3.

Version 2.9.3 (2011-01-06)
--------------------------
- Fixed: custom templates were not always shown in "override all" mode (#2725)
- Fixed: prevent the X_FORWARDED_FOR header against XSS attacks (#2751)
- Fixed: preserve the selector fields in the personal data module (#2609)
- Fixed: skip mounted folders in the file manager if they do not exist (#2708)
- Fixed: the quick navigation modules failed to work when aliases were
  disabled (#2718)
- Fixed some minor issues


(taca)
diff -r1.9 -r1.10 pkgsrc/www/contao29/Makefile
diff -r1.3 -r1.4 pkgsrc/www/contao29/Makefile.version
diff -r1.5 -r1.6 pkgsrc/www/contao29/distinfo
cvs diff -r1.9 -r1.10 pkgsrc/www/contao29/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/contao29/Attic/Makefile 2010/12/02 15:41:30 1.9
+++ pkgsrc/www/contao29/Attic/Makefile 2011/01/06 13:19:08 1.10
@@ -1,124 +1,123 @@ @@ -1,124 +1,123 @@
1# $NetBSD: Makefile,v 1.9 2010/12/02 15:41:30 taca Exp $ 1# $NetBSD: Makefile,v 1.10 2011/01/06 13:19:08 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_VERSION} 4DISTNAME= contao-${CT_VERSION}
5PKGNAME= contao${CT_VER}-${CT_PKGVER} 5PKGNAME= contao${CT_VER}-${CT_PKGVER}
6PKGREVISION= 1 
7CATEGORIES= www 6CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typolight/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=typolight/}
9DIST_SUBDIR= ${PKGBASE}-20101203 8DIST_SUBDIR= ${PKGBASE}-20101203
10 9
11MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
12HOMEPAGE= http://www.contao.org/ 11HOMEPAGE= http://www.contao.org/
13COMMENT= Contao Open Source CMS 12COMMENT= Contao Open Source CMS
14LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
15 14
16DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom 15DEPENDS+= ${PHP_PKG_PREFIX}-dom>=5.2.0:../../textproc/php-dom
17DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd 16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd
18DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring 17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring
19DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql 18DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql
20DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt 19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.2.0:../../security/php-mcrypt
21DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap 20DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.2.0:../../net/php-soap
22 21
23PKG_DESTDIR_SUPPORT= user-destdir 22PKG_DESTDIR_SUPPORT= user-destdir
24 23
25USE_TOOLS= pax 24USE_TOOLS= pax
26NO_BUILD= yes 25NO_BUILD= yes
27 26
28EG_DATA= ${WWW_EG_FILES} system/config tl_files 27EG_DATA= ${WWW_EG_FILES} system/config tl_files
29EG_FILES= system/config/config.php system/config/countries.php \ 28EG_FILES= system/config/config.php system/config/countries.php \
30 system/config/dcaconfig.php system/config/editArea.php \ 29 system/config/dcaconfig.php system/config/editArea.php \
31 system/config/fancyUpload.php system/config/initconfig.php \ 30 system/config/fancyUpload.php system/config/initconfig.php \
32 system/config/langconfig.php system/config/languages.php \ 31 system/config/langconfig.php system/config/languages.php \
33 system/config/tcpdf.php system/config/timezones.php \ 32 system/config/tcpdf.php system/config/timezones.php \
34 system/config/tinyFlash.php system/config/tinyMCE.php \ 33 system/config/tinyFlash.php system/config/tinyMCE.php \
35 system/config/tinyNews.php 34 system/config/tinyNews.php
36TMPL_FILES= tl_files/tinymce.css tl_files/tiny_templates/index.html 35TMPL_FILES= tl_files/tinymce.css tl_files/tiny_templates/index.html
37WWW_EG_FILES= basic.css print.css robots.txt 36WWW_EG_FILES= basic.css print.css robots.txt
38 37
39CONF_FILES_PERMS+= ${CT_EGDIR}/system/config/localconfig.php \ 38CONF_FILES_PERMS+= ${CT_EGDIR}/system/config/localconfig.php \
40 ${CT_WEBDIR}/system/config/localconfig.php \ 39 ${CT_WEBDIR}/system/config/localconfig.php \
41 ${APACHE_USER} ${APACHE_GROUP} 0600 40 ${APACHE_USER} ${APACHE_GROUP} 0600
42 41
43CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 42CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
44 43
45.for f in ${EG_FILES} 44.for f in ${EG_FILES}
46CONF_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} 45CONF_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
47.endfor 46.endfor
48 47
49.for f in ${TMPL_FILES} 48.for f in ${TMPL_FILES}
50REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} 49REQD_FILES+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f}
51.endfor 50.endfor
52 51
53.for f in ${WWW_EG_FILES} 52.for f in ${WWW_EG_FILES}
54CONF_FILES_PERMS+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} \ 53CONF_FILES_PERMS+= ${CT_EGDIR}/${f} ${CT_WEBDIR}/${f} \
55 ${APACHE_USER} ${APACHE_GROUP} 0644 54 ${APACHE_USER} ${APACHE_GROUP} 0644
56.endfor 55.endfor
57 56
58SUBST_CLASSES+= conf 57SUBST_CLASSES+= conf
59SUBST_FILES.conf+= ${WRKDIR}/contao.conf 58SUBST_FILES.conf+= ${WRKDIR}/contao.conf
60SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' 59SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g'
61SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g' 60SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g'
62SUBST_STAGE.conf= post-configure 61SUBST_STAGE.conf= post-configure
63 62
64WWW_FILES= CHANGELOG.txt GPL.txt INSTALL.txt LGPL.txt \ 63WWW_FILES= CHANGELOG.txt GPL.txt INSTALL.txt LGPL.txt \
65 contao cron.php index.php plugins share.php templates \ 64 contao cron.php index.php plugins share.php templates \
66 typolight 65 typolight
67WWW_SYSFILES= config/.htaccess constants.php contao.css drivers \ 66WWW_SYSFILES= config/.htaccess constants.php contao.css drivers \
68 functions.php html iefixes.css initialize.php interface.php \ 67 functions.php html iefixes.css initialize.php interface.php \
69 libraries logs/.htaccess mbstring.php modules themes \ 68 libraries logs/.htaccess mbstring.php modules themes \
70 tmp/.htaccess utf8_lookup.php 69 tmp/.htaccess utf8_lookup.php
71 70
72INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config 71INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
73OWN_DIRS_PERMS+= \ 72OWN_DIRS_PERMS+= \
74 ${CT_WEBDIR} ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 73 ${CT_WEBDIR} ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
75 ${CT_WEBDIR}/plugins ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 74 ${CT_WEBDIR}/plugins ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
76 ${CT_WEBDIR}/plugins/tcpdf/cache \ 75 ${CT_WEBDIR}/plugins/tcpdf/cache \
77 ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 76 ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
78 ${CT_WEBDIR}/system ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 77 ${CT_WEBDIR}/system ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
79 ${CT_WEBDIR}/system/drivers ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 78 ${CT_WEBDIR}/system/drivers ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
80 ${CT_WEBDIR}/system/html ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 79 ${CT_WEBDIR}/system/html ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
81 ${CT_WEBDIR}/system/libraries ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 80 ${CT_WEBDIR}/system/libraries ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
82 ${CT_WEBDIR}/system/logs ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 81 ${CT_WEBDIR}/system/logs ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
83 ${CT_WEBDIR}/system/modules ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 82 ${CT_WEBDIR}/system/modules ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
84 ${CT_WEBDIR}/system/themes ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \ 83 ${CT_WEBDIR}/system/themes ${REAL_ROOT_USER} ${APACHE_GROUP} 0775 \
85 ${CT_WEBDIR}/system/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 84 ${CT_WEBDIR}/system/tmp ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
86 ${CT_WEBDIR}/templates ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 85 ${CT_WEBDIR}/templates ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
87 ${CT_WEBDIR}/tl_files ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \ 86 ${CT_WEBDIR}/tl_files ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 \
88 ${CT_WEBDIR}/tl_files/tiny_templates \ 87 ${CT_WEBDIR}/tl_files/tiny_templates \
89 ${REAL_ROOT_USER} ${APACHE_GROUP} 0770 88 ${REAL_ROOT_USER} ${APACHE_GROUP} 0770
90 89
91PKG_GROUPS_VARS+= APACHE_GROUP 90PKG_GROUPS_VARS+= APACHE_GROUP
92PKG_USERS_VARS+= APACHE_USER 91PKG_USERS_VARS+= APACHE_USER
93 92
94.include "../../www/contao/options.mk" 93.include "../../www/contao/options.mk"
95 94
96pre-configure: 95pre-configure:
97 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 96 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
98 97
99pre-install: 98pre-install:
100 cd ${WRKSRC}; ${RM} -rf music_academy.css \ 99 cd ${WRKSRC}; ${RM} -rf music_academy.css \
101 templates/music_academy.sql tl_files/music_academy 100 templates/music_academy.sql tl_files/music_academy
102 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \; 101 ${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
103 102
104do-install: 103do-install:
105 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR} 104 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
106 cd ${WRKSRC}/system; \ 105 cd ${WRKSRC}/system; \
107 pax -rw ${WWW_SYSFILES} \ 106 pax -rw ${WWW_SYSFILES} \
108 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system; \ 107 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system; \
109 ${INSTALL_DATA} config/.htaccess \ 108 ${INSTALL_DATA} config/.htaccess \
110 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system/config 109 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/system/config
111 ${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \ 110 ${INSTALL_DATA} ${WRKSRC}/templates/.htaccess \
112 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates 111 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/templates
113 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR} 112 cd ${WRKSRC}; pax -rw ${EG_DATA} ${DESTDIR}${PREFIX}/${CT_EGDIR}
114 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess 113 rm -f ${DESTDIR}${PREFIX}/${CT_EGDIR}/system/config/.htaccess
115 ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \ 114 ${INSTALL_DATA} ${WRKSRC}/.htaccess.default \
116 ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default 115 ${DESTDIR}${PREFIX}/${CT_EGDIR}/htaccess.default
117 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} 116 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR}
118 ${INSTALL_DATA} ${FILESDIR}/README \ 117 ${INSTALL_DATA} ${FILESDIR}/README \
119 ${DESTDIR}${PREFIX}/${CT_DOCDIR} 118 ${DESTDIR}${PREFIX}/${CT_DOCDIR}
120 119
121.include "Makefile.version" 120.include "Makefile.version"
122.include "../../www/contao/Makefile.common" 121.include "../../www/contao/Makefile.common"
123.include "../../lang/php/phpversion.mk" 122.include "../../lang/php/phpversion.mk"
124.include "../../mk/bsd.pkg.mk" 123.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/www/contao29/Attic/Makefile.version (switch to unified diff)

--- pkgsrc/www/contao29/Attic/Makefile.version 2010/12/02 13:32:44 1.3
+++ pkgsrc/www/contao29/Attic/Makefile.version 2011/01/06 13:19:08 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1# $NetBSD: Makefile.version,v 1.3 2010/12/02 13:32:44 taca Exp $ 1# $NetBSD: Makefile.version,v 1.4 2011/01/06 13:19:08 taca Exp $
2# 2#
3# used by www/contao29/Makefile 3# used by www/contao29/Makefile
4# used by www/contao29-example/Makefile 4# used by www/contao29-example/Makefile
5# used by www/contao29-translations/Makefile 5# used by www/contao29-translations/Makefile
6# 6#
7 7
8CT_VERSION= 2.9.2 8CT_VERSION= 2.9.3
cvs diff -r1.5 -r1.6 pkgsrc/www/contao29/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/contao29/Attic/distinfo 2010/12/02 15:41:30 1.5
+++ pkgsrc/www/contao29/Attic/distinfo 2011/01/06 13:19:08 1.6
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.5 2010/12/02 15:41:30 taca Exp $ 1$NetBSD: distinfo,v 1.6 2011/01/06 13:19:08 taca Exp $
2 2
3SHA1 (contao29-20101203/contao-2.9.2.tar.gz) = 09aad839f1c04766b5e288740529c0c6c86e025a 3SHA1 (contao29-20101203/contao-2.9.3.tar.gz) = 092da76adbea2a2fe33b041799feb43d2981550e
4RMD160 (contao29-20101203/contao-2.9.2.tar.gz) = 4f3b946be5c5b0a69c9570c13e93861619a9d7d1 4RMD160 (contao29-20101203/contao-2.9.3.tar.gz) = 8e9b90a49d317dd825c05a0a493c52d5aaefb839
5Size (contao29-20101203/contao-2.9.2.tar.gz) = 4402683 bytes 5Size (contao29-20101203/contao-2.9.3.tar.gz) = 4402614 bytes