CVS commit: pkgsrc/sysutils

["Frank Kardel" <kardel%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kardel
Date:           Wed Feb 10 11:27:19 UTC 2021

Modified Files:
        pkgsrc/sysutils/bareos: Makefile Makefile.common
        pkgsrc/sysutils/bareos-clientonly: Makefile

Log Message:
sysutils/bareos{,-clientonly}: rework config file permissions and users

bareos-clientonly does not need to install the bareosdir and bareossd users.
avoid installing config files twice

adjust sysutils/bareos/Makefile{,.common} for the above.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/bareos/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/bareos/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/bareos-clientonly/Makefile

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

Modified files:

Index: pkgsrc/sysutils/bareos/Makefile
diff -u pkgsrc/sysutils/bareos/Makefile:1.4 pkgsrc/sysutils/bareos/Makefile:1.5
--- pkgsrc/sysutils/bareos/Makefile:1.4 Mon Feb  1 09:08:43 2021
+++ pkgsrc/sysutils/bareos/Makefile     Wed Feb 10 11:27:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/02/01 09:08:43 kardel Exp $
+# $NetBSD: Makefile,v 1.5 2021/02/10 11:27:19 kardel Exp $
 
 CONFLICTS=             bareos-clientonly-[0-9]* bacula-clientonly-[0-9]* bacula-[0-9]*
 
@@ -11,6 +11,18 @@ USE_TOOLS+=          perl:run
 # strange: pkglint complains about VARBASE not defined in BUILD_DEFS, but it is defined in Makefile.common
 BUILD_DEFS+=           VARBASE
 
+BAREOS_SD_USER?=               bareossd
+PKG_GECOS.${BAREOS_SD_USER}=   Bareos Storage User
+PKG_HOME.${BAREOS_SD_USER}=    ${BAREOS_WORKINGDIR}
+PKG_SHELL.${BAREOS_SD_USER}=   /bin/sh
+
+BAREOS_DIR_USER?=              bareosdir
+PKG_GECOS.${BAREOS_DIR_USER}=  Bareos Director User
+PKG_HOME.${BAREOS_DIR_USER}=   ${BAREOS_WORKINGDIR}
+PKG_SHELL.${BAREOS_DIR_USER}=  /bin/sh
+
+PKG_USERS=             ${BAREOS_DIR_USER}:${BAREOS_GROUP} ${BAREOS_SD_USER}:${BAREOS_GROUP}
+
 .include "options.mk"
 .include "Makefile.common"
 

Index: pkgsrc/sysutils/bareos/Makefile.common
diff -u pkgsrc/sysutils/bareos/Makefile.common:1.2 pkgsrc/sysutils/bareos/Makefile.common:1.3
--- pkgsrc/sysutils/bareos/Makefile.common:1.2  Mon Feb  1 09:08:43 2021
+++ pkgsrc/sysutils/bareos/Makefile.common      Wed Feb 10 11:27:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2021/02/01 09:08:43 kardel Exp $
+# $NetBSD: Makefile.common,v 1.3 2021/02/10 11:27:19 kardel Exp $
 # used by sysutils/bareos-clientonly/Makefile
 
 GITHUB_PROJECT=        bareos
@@ -52,18 +52,7 @@ BUILD_DEFS+=         BAREOS_PIDDIR BAREOS_WORKI
 # user/group information
 BAREOS_GROUP?=         bareos
 
-BAREOS_SD_USER?=               bareossd
-PKG_GECOS.${BAREOS_SD_USER}=   Bareos Storage User
-PKG_HOME.${BAREOS_SD_USER}=    ${BAREOS_WORKINGDIR}
-PKG_SHELL.${BAREOS_SD_USER}=   /bin/sh
-
-BAREOS_DIR_USER?=              bareosdir
-PKG_GECOS.${BAREOS_DIR_USER}=  Bareos Director User
-PKG_HOME.${BAREOS_DIR_USER}=   ${BAREOS_WORKINGDIR}
-PKG_SHELL.${BAREOS_DIR_USER}=  /bin/sh
-
 PKG_GROUPS=            ${BAREOS_GROUP}
-PKG_USERS=             ${BAREOS_DIR_USER}:${BAREOS_GROUP} ${BAREOS_SD_USER}:${BAREOS_GROUP}
 
 CONFIG_TEMPLATE_PATH=  share/examples/${PKG_SYSCONFSUBDIR}/configtemplates
 

Index: pkgsrc/sysutils/bareos-clientonly/Makefile
diff -u pkgsrc/sysutils/bareos-clientonly/Makefile:1.2 pkgsrc/sysutils/bareos-clientonly/Makefile:1.3
--- pkgsrc/sysutils/bareos-clientonly/Makefile:1.2      Mon Feb  1 09:08:44 2021
+++ pkgsrc/sysutils/bareos-clientonly/Makefile  Wed Feb 10 11:27:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/02/01 09:08:44 kardel Exp $
+# $NetBSD: Makefile,v 1.3 2021/02/10 11:27:19 kardel Exp $
 
 COMMENT=               Backup Archiving REcovery Open Sourced - client
 
@@ -21,11 +21,6 @@ DISTINFO_FILE=               ${.CURDIR}/../../sysutil
 .include "../../mk/bsd.pkg.mk"
 
 CONFIG_TEMPLATES!=     ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null | sed -e 's/ /\\ /g'
-CONF_FILES?=
-
-.for l in ${CONFIG_TEMPLATES}
-CONF_FILES+=   ${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
-.endfor
 
 BUILD_DEFS+=   VARBASE # to keep pkglint happy