Wed Apr 10 11:45:57 2019 UTC ()
Pullup ticket #5940 - requested by taca
www/contao35: security fix

Revisions pulled up:
- www/contao/Makefile.common                                    1.111
- www/contao/files/README                                       deleted
- www/contao/files/contao.conf                                  deleted
- www/contao35/Makefile                                         1.43
- www/contao35/distinfo                                         1.35

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Apr  9 13:07:42 UTC 2019

   Modified Files:
   	pkgsrc/www/contao: Makefile.common
   Removed Files:
   	pkgsrc/www/contao/files: README contao.conf

   Log Message:
   www/contao: clean up

   Remove support files for Contao 4 and later.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Apr  9 13:09:17 UTC 2019

   Modified Files:
   	pkgsrc/www/contao35: Makefile distinfo

   Log Message:
   www/contao35: update to 3.5.39

   pkgsrc change: use SUBST_VARS.

   Version 3.5.39 (2019-04-09)
   ---------------------------

   ### Fixed
   Invalidate the user sessions if a password changes (see CVE-2019-10641).


(bsiegert)
diff -r1.110 -r1.110.6.1 pkgsrc/www/contao/Makefile.common
diff -r1.4 -r0 pkgsrc/www/contao/files/README
diff -r1.4 -r0 pkgsrc/www/contao/files/contao.conf
diff -r1.42 -r1.42.4.1 pkgsrc/www/contao35/Makefile
diff -r1.34 -r1.34.4.1 pkgsrc/www/contao35/distinfo
cvs diff -r1.110 -r1.110.6.1 pkgsrc/www/contao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/contao/Makefile.common 2018/09/18 16:14:35 1.110
+++ pkgsrc/www/contao/Makefile.common 2019/04/10 11:45:57 1.110.6.1
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1# $NetBSD: Makefile.common,v 1.110 2018/09/18 16:14:35 taca Exp $ 1# $NetBSD: Makefile.common,v 1.110.6.1 2019/04/10 11:45:57 bsiegert Exp $
2# 2#
3# used by www/contao35/Makefile 3# used by www/contao35/Makefile
4 4
5CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} 5CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
6CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/} 6CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
7CT_PKGVER= ${CT_VERSION:S/.RC/rc/} 7CT_PKGVER= ${CT_VERSION:S/.RC/rc/}
8 8
9FILESDIR= ${.CURDIR}/../../www/contao/files 
10 
11FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \ 9FILES_SUBST+= PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
12 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q} 10 WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
13MESSAGE_SUBST+= CT_VER=${CT_VER} 11MESSAGE_SUBST+= CT_VER=${CT_VER}
14PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \ 12PLIST_SUBST+= CT_DOCDIR=${CT_DOCDIR:Q} CT_EGDIR=${CT_EGDIR:Q} \
15 CT_WEBDIR=${CT_WEBDIR:Q} 13 CT_WEBDIR=${CT_WEBDIR:Q}
16 14
17PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \ 15PRINT_PLIST_AWK+= /^${CT_WEBDIR:S|/|\\/|g}/ \
18 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \ 16 { gsub(/${CT_WEBDIR:S|/|\\/|g}/, "$${CT_WEBDIR}"); \
19 print; next; } 17 print; next; }
20PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \ 18PRINT_PLIST_AWK+= /^${CT_DOCDIR:S|/|\\/|g}/ \
21 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \ 19 { gsub(/${CT_DOCDIR:S|/|\\/|g}/, "$${CT_DOCDIR}"); \
22 print; next; } 20 print; next; }
23PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \ 21PRINT_PLIST_AWK+= /^${CT_EGDIR:S|/|\\/|g}/ \
File Deleted: pkgsrc/www/contao/files/Attic/README
File Deleted: pkgsrc/www/contao/files/Attic/contao.conf
cvs diff -r1.42 -r1.42.4.1 pkgsrc/www/contao35/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao35/Makefile 2018/12/22 11:47:33 1.42
+++ pkgsrc/www/contao35/Makefile 2019/04/10 11:45:57 1.42.4.1
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.42 2018/12/22 11:47:33 taca Exp $ 1# $NetBSD: Makefile,v 1.42.4.1 2019/04/10 11:45:57 bsiegert Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_PKGVER} 4DISTNAME= contao-${CT_PKGVER}
5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_PKGVER} 5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_PKGVER}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
8GITHUB_PROJECT= core 8GITHUB_PROJECT= core
9GITHUB_RELEASE= ${CT_VERSION} 9GITHUB_RELEASE= ${CT_VERSION}
10 10
11MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
12HOMEPAGE= https://contao.org/ 12HOMEPAGE= https://contao.org/
13COMMENT= Contao Open Source CMS ${CT_VERSION} 13COMMENT= Contao Open Source CMS ${CT_VERSION}
14LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
15 15
16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd 16DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring 17DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
18DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli 18DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli
19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap 19DEPENDS+= ${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap
20DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl 20DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
21DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib 21DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
22 22
23CT_VERSION= 3.5.38 23CT_VERSION= 3.5.39
24USE_TOOLS= bash:run pax 24USE_TOOLS= bash:run pax
25NO_BUILD= yes 25NO_BUILD= yes
26FILESDIR?= ${.CURDIR}/files 
27 26
28EG_CONFIG= ace.php agents.php constants.php countries.php \ 27EG_CONFIG= ace.php agents.php constants.php countries.php \
29 languages.php mimetypes.php tcpdf.php timezones.php \ 28 languages.php mimetypes.php tcpdf.php timezones.php \
30 tinyFlash.php tinyMCE.php tinyNews.php 29 tinyFlash.php tinyMCE.php tinyNews.php
31EG_DATA= ${WWW_EG_FILES} system/config files 30EG_DATA= ${WWW_EG_FILES} system/config files
32EG_TEMPLATES= tinymce.css tiny_templates/index.html 31EG_TEMPLATES= tinymce.css tiny_templates/index.html
33WWW_EG_FILES= robots.txt 32WWW_EG_FILES= robots.txt
34RESTRICT_DIRS= system/config system/cache system/logs system/tmp templates \ 33RESTRICT_DIRS= system/config system/cache system/logs system/tmp templates \
35 files 34 files
36 35
37CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf 36CONF_FILES+= ${CT_EGDIR}/contao.conf ${PKG_SYSCONFDIR}/contao.conf
38 37
39.for f in ${EG_CONFIG} 38.for f in ${EG_CONFIG}
@@ -61,28 +60,27 @@ REPLACE.php.old= .*php[^ ]* @@ -61,28 +60,27 @@ REPLACE.php.old= .*php[^ ]*
61REPLACE.php.new= ${PREFIX}/bin/php 60REPLACE.php.new= ${PREFIX}/bin/php
62REPLACE_FILES.php= system/bin/automator system/bin/filesync \ 61REPLACE_FILES.php= system/bin/automator system/bin/filesync \
63 system/bin/ide_compat system/bin/txpurge system/bin/version \ 62 system/bin/ide_compat system/bin/txpurge system/bin/version \
64 vendor/bin/lessc vendor/bin/minifycss vendor/bin/minifyjs \ 63 vendor/bin/lessc vendor/bin/minifycss vendor/bin/minifyjs \
65 vendor/bin/pscss vendor/leafo/scssphp/bin/pscss \ 64 vendor/bin/pscss vendor/leafo/scssphp/bin/pscss \
66 vendor/matthiasmullie/minify/bin/minifycss \ 65 vendor/matthiasmullie/minify/bin/minifycss \
67 vendor/matthiasmullie/minify/bin/minifyjs \ 66 vendor/matthiasmullie/minify/bin/minifyjs \
68 vendor/oyejorge/less.php/bin/lessc \ 67 vendor/oyejorge/less.php/bin/lessc \
69 vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \ 68 vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
70 vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php 69 vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
71 70
72SUBST_CLASSES+= conf 71SUBST_CLASSES+= conf
73SUBST_FILES.conf+= ${WRKDIR}/contao.conf 72SUBST_FILES.conf+= ${WRKDIR}/contao.conf
74SUBST_SED.conf+= -e 's|@PREFIX@|${PREFIX:Q}|g' 73SUBST_VARS.conf+= PREFIX CT_WEBDIR
75SUBST_SED.conf+= -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g' 
76SUBST_STAGE.conf= post-configure 74SUBST_STAGE.conf= post-configure
77 75
78WWW_FILES= .htaccess.default README.md assets contao \ 76WWW_FILES= .htaccess.default README.md assets contao \
79 index.php share templates vendor 77 index.php share templates vendor
80WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \ 78WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \
81 initialize.php modules themes 79 initialize.php modules themes
82 80
83INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config 81INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
84 82
85.include "../../lang/php/phpversion.mk" 83.include "../../lang/php/phpversion.mk"
86 84
87.if ${PKG_PHP_VERSION} < 71 85.if ${PKG_PHP_VERSION} < 71
88DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt 86DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt
cvs diff -r1.34 -r1.34.4.1 pkgsrc/www/contao35/distinfo (expand / switch to unified diff)

--- pkgsrc/www/contao35/distinfo 2018/12/22 11:47:33 1.34
+++ pkgsrc/www/contao35/distinfo 2019/04/10 11:45:57 1.34.4.1
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.34 2018/12/22 11:47:33 taca Exp $ 1$NetBSD: distinfo,v 1.34.4.1 2019/04/10 11:45:57 bsiegert Exp $
2 2
3SHA1 (contao-3.5.38.tar.gz) = 3d81718874c50aedc15833b9fc09d68888e8d876 3SHA1 (contao-3.5.39.tar.gz) = 21426862e2ea79c4361115d16cf8f5d3d51d3efd
4RMD160 (contao-3.5.38.tar.gz) = 0eb89fea2fe518b287820c9b17850f80809a643c 4RMD160 (contao-3.5.39.tar.gz) = 034ad0a91bd8d314de589d0564d042905f67c3a3
5SHA512 (contao-3.5.38.tar.gz) = 1cfef68f60ddaedb6e27f2e89eb09054d89cbbba1d69774a86acd97d0ef293970cefbcbd5a89f673685e6a92ba485879df47ee53160763643812afb41376ca7d 5SHA512 (contao-3.5.39.tar.gz) = 5de65507654b436739ad2893b9372b949a02017ad44bc7629e5fbf3d1902a468a21252359a2b30bc612e0b2f01955ccdd8d20d0d936e4033b4b99ff300841d28
6Size (contao-3.5.38.tar.gz) = 11203259 bytes 6Size (contao-3.5.39.tar.gz) = 11204655 bytes