[pkgsrc/trunk]: pkgsrc/databases/redis redis: Fix config file permissions.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa2e53163c32
branches:  trunk
changeset: 449535:fa2e53163c32
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Apr 01 11:44:53 2021 +0000

description:
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:

 databases/redis/Makefile |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 5751bf1b864e -r fa2e53163c32 databases/redis/Makefile
--- a/databases/redis/Makefile  Thu Apr 01 10:22:23 2021 +0000
+++ b/databases/redis/Makefile  Thu Apr 01 11:44:53 2021 +0000
@@ -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 @@
 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 @@
 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