Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1636332995241430"
MIME-Version: 1.0
Date: Mon, 8 Nov 2021 00:56:35 +0000
From: "Pierre Pronchery" <khorben@netbsd.org>
Subject: CVS commit: pkgsrc/print/cups-base
To: pkgsrc-changes@NetBSD.org
Reply-To: khorben@netbsd.org
Message-Id: <20211108005635.E1C8EFAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1636332995241430
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	khorben
Date:		Mon Nov  8 00:56:35 UTC 2021

Modified Files:
	pkgsrc/print/cups-base: Makefile
	pkgsrc/print/cups-base/files: cupsd.sh

Log Message:
cups-base: let the RC script work unprivileged

This takes advantage of the introduction of the SYSCONFBASE variable.
Tested on NetBSD/amd64.

Bumps PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/print/cups-base/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/cups-base/files/cupsd.sh

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


--_----------=_1636332995241430
Content-Disposition: inline
Content-Length: 1728
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/cups-base/Makefile
diff -u pkgsrc/print/cups-base/Makefile:1.44 pkgsrc/print/cups-base/Makefile:1.45
--- pkgsrc/print/cups-base/Makefile:1.44	Thu Oct 21 07:46:32 2021
+++ pkgsrc/print/cups-base/Makefile	Mon Nov  8 00:56:35 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2021/10/21 07:46:32 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2021/11/08 00:56:35 khorben Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=	cups-base-${CUPS_VERS}

Index: pkgsrc/print/cups-base/files/cupsd.sh
diff -u pkgsrc/print/cups-base/files/cupsd.sh:1.1 pkgsrc/print/cups-base/files/cupsd.sh:1.2
--- pkgsrc/print/cups-base/files/cupsd.sh:1.1	Sun Nov 12 14:10:15 2017
+++ pkgsrc/print/cups-base/files/cupsd.sh	Mon Nov  8 00:56:35 2021
@@ -1,13 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cupsd.sh,v 1.1 2017/11/12 14:10:15 khorben Exp $
+# $NetBSD: cupsd.sh,v 1.2 2021/11/08 00:56:35 khorben Exp $
 #
 # Common UNIX Printing System daemon
 #
 # PROVIDE: cups
 # REQUIRE: DAEMON
 #
-# You will need to set some variables in /etc/rc.conf to start cupsd:
+# You will need to set some variables in @SYSCONFBASE@/rc.conf to start cupsd:
 #
 # cupsd=YES
 # cupsd_wait=YES	# set to "YES" to wait for cupsd to detect printers;
@@ -16,8 +16,8 @@
 #			#   to respond before we declare it not responding;
 #			#   this variable is optional and defaults to "60".
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+	. @SYSCONFBASE@/rc.subr
 fi
 
 name="cupsd"
@@ -63,7 +63,7 @@ cupsd_waitcmd()
 	fi
 }
 
-if [ -f /etc/rc.subr ]; then
+if [ -f @SYSCONFBASE@/rc.subr ]; then
 	load_rc_config $name
 	: ${cupsd_wait:=NO}
 	: ${cupsd_timeout:=60}


--_----------=_1636332995241430--