CVS commit: [pkgsrc-2019Q1] pkgsrc/www

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Apr 10 11:45:57 UTC 2019

Modified Files:
        pkgsrc/www/contao [pkgsrc-2019Q1]: Makefile.common
        pkgsrc/www/contao35 [pkgsrc-2019Q1]: Makefile distinfo
Removed Files:
        pkgsrc/www/contao/files [pkgsrc-2019Q1]: README contao.conf

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.110.6.1 pkgsrc/www/contao/Makefile.common
cvs rdiff -u -r1.4 -r0 pkgsrc/www/contao/files/README \
    pkgsrc/www/contao/files/contao.conf
cvs rdiff -u -r1.42 -r1.42.4.1 pkgsrc/www/contao35/Makefile
cvs rdiff -u -r1.34 -r1.34.4.1 pkgsrc/www/contao35/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/contao/Makefile.common
diff -u pkgsrc/www/contao/Makefile.common:1.110 pkgsrc/www/contao/Makefile.common:1.110.6.1
--- pkgsrc/www/contao/Makefile.common:1.110     Tue Sep 18 16:14:35 2018
+++ pkgsrc/www/contao/Makefile.common   Wed Apr 10 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.110 2018/09/18 16:14:35 taca Exp $
+# $NetBSD: Makefile.common,v 1.110.6.1 2019/04/10 11:45:57 bsiegert Exp $
 #
 # used by www/contao35/Makefile
 
@@ -6,8 +6,6 @@ CT_VER=         ${CT_VERSION:C/([0-9]+)\.([0-9]
 CT_VERBASE=    ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/}
 CT_PKGVER=     ${CT_VERSION:S/.RC/rc/}
 
-FILESDIR=      ${.CURDIR}/../../www/contao/files
-
 FILES_SUBST+=  PAX=${PAX} CT_EGDIR=${CT_EGDIR:Q} CT_WEBDIR=${CT_WEBDIR:Q} \
                WWWGRP=${APACHE_GROUP:Q} WWWOWN=${APACHE_USER:Q}
 MESSAGE_SUBST+=        CT_VER=${CT_VER}

Index: pkgsrc/www/contao35/Makefile
diff -u pkgsrc/www/contao35/Makefile:1.42 pkgsrc/www/contao35/Makefile:1.42.4.1
--- pkgsrc/www/contao35/Makefile:1.42   Sat Dec 22 11:47:33 2018
+++ pkgsrc/www/contao35/Makefile        Wed Apr 10 11:45:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/12/22 11:47:33 taca Exp $
+# $NetBSD: Makefile,v 1.42.4.1 2019/04/10 11:45:57 bsiegert Exp $
 #
 
 DISTNAME=      contao-${CT_PKGVER}
@@ -20,10 +20,9 @@ DEPENDS+=    ${PHP_PKG_PREFIX}-soap>=5.4.0:
 DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
 
-CT_VERSION=    3.5.38
+CT_VERSION=    3.5.39
 USE_TOOLS=     bash:run pax
 NO_BUILD=      yes
-FILESDIR?=     ${.CURDIR}/files
 
 EG_CONFIG=     ace.php agents.php constants.php countries.php \
                languages.php mimetypes.php tcpdf.php timezones.php \
@@ -71,8 +70,7 @@ REPLACE_FILES.php=    system/bin/automator 
 
 SUBST_CLASSES+=                conf
 SUBST_FILES.conf+=     ${WRKDIR}/contao.conf
-SUBST_SED.conf+=        -e 's|@PREFIX@|${PREFIX:Q}|g'
-SUBST_SED.conf+=        -e 's|@CT_WEBDIR@|${CT_WEBDIR:Q}|g'
+SUBST_VARS.conf+=       PREFIX CT_WEBDIR
 SUBST_STAGE.conf=      post-configure
 
 WWW_FILES=     .htaccess.default README.md assets contao \

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