CVS commit: pkgsrc

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Mar 13 09:44:38 UTC 2025

Modified Files:
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/net/nsd: Makefile
        pkgsrc/net/unbound: Makefile

Log Message:
Set default user, group and syslog facility for nsd and unbound in
mk/defaults/mk.conf for documentation.

Thanks, wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.347 -r1.348 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.130 -r1.131 pkgsrc/net/nsd/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/net/unbound/Makefile

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

Modified files:

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.347 pkgsrc/mk/defaults/mk.conf:1.348
--- pkgsrc/mk/defaults/mk.conf:1.347    Fri Oct 11 08:24:48 2024
+++ pkgsrc/mk/defaults/mk.conf  Thu Mar 13 09:44:38 2025
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.347 2024/10/11 08:24:48 jperkin Exp $
+# $NetBSD: mk.conf,v 1.348 2025/03/13 09:44:38 hauke Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1541,6 +1541,23 @@ NMH_PAGER?= more
 # Possible: not defined, communicator, navigator, mozilla
 # Default: not defined, which implies communicator
 
+NSD_USER?=             nsd
+# Used in the screws package to specify the user under which the server
+# should be run.
+# Possible: any user name
+# Default: screws
+
+NSD_GROUP?=            nsd
+# Used in the nsd package to specify the NSD_USER group.
+# Possible: any group name
+# Default: nsd
+
+NSD_LOG_FACILITY?=     LOG_DAEMON
+# Used by the nsd package to choose the log facility used
+# by nsd for its syslogd(8) messages.
+# Possible: see "facility codes" in /usr/include/syslog.h
+# Default: LOG_DAEMON
+
 NULLMAILER_USER?=      nullmail
 # System user for nullmailer.
 # Possible: any user name
@@ -1838,6 +1855,23 @@ UCSPI_SSL_GROUP?= ucspissl
 # Possible: any group name
 # Default: ucspissl
 
+UNBOUND_USER?=         unbound
+# Used in the screws package to specify the user under which the server
+# should be run.
+# Possible: any user name
+# Default: screws
+
+UNBOUND_GROUP?=                unbound
+# Used in the unbound package to specify the UNBOUND_USER group.
+# Possible: any group name
+# Default: unbound
+
+UNBOUND_LOG_FACILITY?= LOG_DAEMON
+# Used by the unbound package to choose the log facility used
+# by unbound for its syslogd(8) messages.
+# Possible: see "facility codes" in /usr/include/syslog.h
+# Default: LOG_DAEMON
+
 UNPRIVILEGED?= NO
 # Set this to YES to enable unprivileged support (see mk/unprivileged.mk).
 # Possible: YES, NO

Index: pkgsrc/net/nsd/Makefile
diff -u pkgsrc/net/nsd/Makefile:1.130 pkgsrc/net/nsd/Makefile:1.131
--- pkgsrc/net/nsd/Makefile:1.130       Wed Mar 12 22:08:55 2025
+++ pkgsrc/net/nsd/Makefile     Thu Mar 13 09:44:37 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2025/03/12 22:08:55 hauke Exp $
+# $NetBSD: Makefile,v 1.131 2025/03/13 09:44:37 hauke Exp $
 
 DISTNAME=      nsd-4.11.1
 PKGREVISION=   1
@@ -17,8 +17,6 @@ PKG_OPTIONS_VAR=      PKG_OPTIONS.nsd
 PKG_SUPPORTED_OPTIONS= inet6 rrl
 PKG_SUGGESTED_OPTIONS= inet6
 
-NSD_LOG_FACILITY?=     LOG_DAEMON
-
 .include "../../mk/bsd.options.mk"
 
 USE_LANGUAGES= c c++
@@ -58,9 +56,6 @@ CONFIGURE_ARGS+=      --with-ssl=${BUILDLINK_
 
 RCD_SCRIPTS=   nlnsd
 
-NSD_USER?=     nsd
-NSD_GROUP?=    nsd
-
 PKG_GROUPS=    ${NSD_GROUP}
 PKG_USERS=     ${NSD_USER}:${NSD_GROUP}
 

Index: pkgsrc/net/unbound/Makefile
diff -u pkgsrc/net/unbound/Makefile:1.121 pkgsrc/net/unbound/Makefile:1.122
--- pkgsrc/net/unbound/Makefile:1.121   Wed Mar 12 23:02:16 2025
+++ pkgsrc/net/unbound/Makefile Thu Mar 13 09:44:37 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2025/03/12 23:02:16 hauke Exp $
+# $NetBSD: Makefile,v 1.122 2025/03/13 09:44:37 hauke Exp $
 
 DISTNAME=      unbound-1.22.0
 PKGREVISION=   6
@@ -14,8 +14,6 @@ BUILD_DEFS+=  PKG_SYSCONFBASE VARBASE
 BUILD_DEFS+=   UNBOUND_USER UNBOUND_GROUP UNBOUND_LOG_FACILITY
 FILES_SUBST+=  UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP}
 
-UNBOUND_LOG_FACILITY?= LOG_DAEMON
-
 USE_LIBTOOL=           yes
 CONFIGURE_ARGS+=       --enable-allsymbols
 CONFIGURE_ARGS+=       --with-libexpat=${BUILDLINK_PREFIX.expat}
@@ -94,9 +92,6 @@ RCD_SCRIPTS=  unbound
 SMF_METHODS=   unbound
 SMF_NAME=      unbound
 
-UNBOUND_USER?= unbound
-UNBOUND_GROUP?=        unbound
-
 PKG_GROUPS=    ${UNBOUND_GROUP}
 PKG_USERS=     ${UNBOUND_USER}:${UNBOUND_GROUP}