summaryrefslogtreecommitdiff
path: root/databases/redis
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2021-04-01 11:44:53 +0000
committerjperkin <jperkin@pkgsrc.org>2021-04-01 11:44:53 +0000
commit22960562fa07b5a2a3158a5243d9f81420a63b14 (patch)
tree86ab911f857b56ec26df5d946f204fe7a7d237be /databases/redis
parent0940057cbb39775e6ed7d3c8cb6422fa9256a007 (diff)
downloadpkgsrc-22960562fa07b5a2a3158a5243d9f81420a63b14.tar.gz
redis: Fix config file permissions.
The previous change for CVE-2016-2121 installed a configuration file that could not be read by the default redis user. Bump PKGREVISION.
Diffstat (limited to 'databases/redis')
-rw-r--r--databases/redis/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 4487861441b..e4d407ce32d 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2021/03/02 11:56:53 adam Exp $
+# $NetBSD: Makefile,v 1.67 2021/04/01 11:44:53 jperkin Exp $
DISTNAME= redis-6.2.1
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
@@ -25,8 +26,6 @@ DOCDIR= share/doc/redis
DOCFILES+= 00-RELEASENOTES BUGS COPYING README.md
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
INSTALLATION_DIRS+= bin ${DOCDIR} ${EGDIR} ${EGDIR}/utils ${EGDIR}/tests
-CONF_FILES= ${EGDIR}/redis.conf.example ${PKG_SYSCONFDIR}/redis.conf
-CONF_FILES_MODE= 0640
BUILD_DEFS+= VARBASE REDIS_USER REDIS_GROUP REDIS_DATADIR
BUILD_DEFS+= REDIS_LOGDIR REDIS_PIDDIR PKG_SYSCONFDIR
@@ -40,6 +39,9 @@ REDIS_PIDDIR?= ${VARBASE}/run
OWN_DIRS_PERMS+= ${REDIS_DATADIR} ${REDIS_USER} ${REDIS_GROUP} 0770
OWN_DIRS_PERMS+= ${REDIS_LOGDIR} ${REDIS_USER} ${REDIS_GROUP} 0770
+CONF_FILES_PERMS+= ${EGDIR}/redis.conf.example ${PKG_SYSCONFDIR}/redis.conf \
+ ${REAL_ROOT_USER} ${REDIS_GROUP} 0640
+
PKG_GROUPS+= ${REDIS_GROUP}
PKG_USERS+= ${REDIS_USER}:${REDIS_GROUP}
PKG_GECOS.${REDIS_USER}= Redis daemon user