CVS commit: pkgsrc/databases/redis

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Apr  1 11:44:53 UTC 2021

Modified Files:
        pkgsrc/databases/redis: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/databases/redis/Makefile

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

Modified files:

Index: pkgsrc/databases/redis/Makefile
diff -u pkgsrc/databases/redis/Makefile:1.66 pkgsrc/databases/redis/Makefile:1.67
--- pkgsrc/databases/redis/Makefile:1.66        Tue Mar  2 11:56:53 2021
+++ pkgsrc/databases/redis/Makefile     Thu Apr  1 11:44:53 2021
@@ -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