pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2019Q1]: pkgsrc/www Pullup ticket #5940 - requested by taca
details: https://anonhg.NetBSD.org/pkgsrc/rev/ded808ee602f
branches: pkgsrc-2019Q1
changeset: 334015:ded808ee602f
user: bsiegert <bsiegert%pkgsrc.org@localhost>
date: Wed Apr 10 11:45:57 2019 +0000
description:
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).
diffstat:
www/contao/Makefile.common | 4 +---
www/contao/files/README | 22 ----------------------
www/contao/files/contao.conf | 23 -----------------------
www/contao35/Makefile | 8 +++-----
www/contao35/distinfo | 10 +++++-----
5 files changed, 9 insertions(+), 58 deletions(-)
diffs (117 lines):
diff -r 86977c5d2ec5 -r ded808ee602f www/contao/Makefile.common
--- a/www/contao/Makefile.common Wed Apr 10 11:21:14 2019 +0000
+++ b/www/contao/Makefile.common Wed Apr 10 11:45:57 2019 +0000
@@ -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_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}
diff -r 86977c5d2ec5 -r ded808ee602f www/contao/files/README
--- a/www/contao/files/README Wed Apr 10 11:21:14 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: README,v 1.4 2015/12/16 09:23:54 taca Exp $
-
-1. First, create a database for Contao Open Source CMS.
-
- # mysqladmin -p -u <administrator> create <dbname>.
-
-2. Next, create a user for accessing that database.
-
- # mysql -p -u <administrator> <dbname>
- mysql> grant select, insert, update, delete, create, drop,
- index, alter, create temporary tables, lock tables on
- <dbname>.* to '<dbuser>'@'localhost'
- identified by '<dbpass>' ;
-
-3. Edit ${PKG_SYSCONFDIR}/contao.conf and include from httpd.conf.
-
- Include ${PKG_SYSCONFDIR}/contao.conf
-
-4. Set DocumentRoot to ${CT_WEBDIR}/web, then reload or restart Apache.
-
-5. Start setup from Contao installer, the installer's URL is
- http://www.example.org/install.php.
diff -r 86977c5d2ec5 -r ded808ee602f www/contao/files/contao.conf
--- a/www/contao/files/contao.conf Wed Apr 10 11:21:14 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# $NetBSD: contao.conf,v 1.4 2015/12/13 14:37:08 taca Exp $
-
-#
-# If you want to use contao for whole web site, set your DocumentRoot to
-# "@PREFIX@/@CT_WEBDIR@/web". (http://www.example.org/)
-#
-# If you want to use contao on sub directory, uncomment below line.
-# (http://www.example.org/subdir/)
-#
-#Alias /subdir "@PREFIX@/@CT_WEBDIR@/web"
-
-<Directory "@PREFIX@/@CT_WEBDIR@">
- DirectoryIndex index.php index.html
- Options Indexes SymLinksIfOwnerMatch FollowSymLinks
- AllowOverride All
-<IfModule !mod_authz_core.c>
- Order allow,deny
- Allow from all
-</IfModule>
-<IfModule mod_authz_core.c>
- Require all granted
-</IfModule>
-</Directory>
diff -r 86977c5d2ec5 -r ded808ee602f www/contao35/Makefile
--- a/www/contao35/Makefile Wed Apr 10 11:21:14 2019 +0000
+++ b/www/contao35/Makefile Wed Apr 10 11:45:57 2019 +0000
@@ -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}-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 @@
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 \
diff -r 86977c5d2ec5 -r ded808ee602f www/contao35/distinfo
--- a/www/contao35/distinfo Wed Apr 10 11:21:14 2019 +0000
+++ b/www/contao35/distinfo Wed Apr 10 11:45:57 2019 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index