CVS commit: pkgsrc/sysutils/dbus

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sun Nov  7 19:14:16 UTC 2021

Modified Files:
        pkgsrc/sysutils/dbus: MESSAGE.rcd Makefile
        pkgsrc/sysutils/dbus/files: dbus.sh

Log Message:
dbus: 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.1 -r1.2 pkgsrc/sysutils/dbus/MESSAGE.rcd
cvs rdiff -u -r1.125 -r1.126 pkgsrc/sysutils/dbus/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/dbus/files/dbus.sh

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

Modified files:

Index: pkgsrc/sysutils/dbus/MESSAGE.rcd
diff -u pkgsrc/sysutils/dbus/MESSAGE.rcd:1.1 pkgsrc/sysutils/dbus/MESSAGE.rcd:1.2
--- pkgsrc/sysutils/dbus/MESSAGE.rcd:1.1        Sun Mar 14 08:31:17 2021
+++ pkgsrc/sysutils/dbus/MESSAGE.rcd    Sun Nov  7 19:14:15 2021
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE.rcd,v 1.1 2021/03/14 08:31:17 nia Exp $
+$NetBSD: MESSAGE.rcd,v 1.2 2021/11/07 19:14:15 khorben Exp $
 
 You should enable the dbus system-wide daemon for correct operation. Use:
 
-$ cp ${PREFIX}/share/examples/rc.d/dbus /etc/rc.d/dbus
+$ cp ${PREFIX}/share/examples/rc.d/dbus ${SYSCONFBASE}/rc.d/dbus
 
-Edit /etc/rc.conf to set dbus=YES.
+Edit ${SYSCONFBASE}/rc.conf to set dbus=YES.
 
 ===========================================================================

Index: pkgsrc/sysutils/dbus/Makefile
diff -u pkgsrc/sysutils/dbus/Makefile:1.125 pkgsrc/sysutils/dbus/Makefile:1.126
--- pkgsrc/sysutils/dbus/Makefile:1.125 Tue Mar 30 16:16:03 2021
+++ pkgsrc/sysutils/dbus/Makefile       Sun Nov  7 19:14:15 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.125 2021/03/30 16:16:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.126 2021/11/07 19:14:15 khorben Exp $
 
 DISTNAME=      dbus-1.12.20
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  http://dbus.freedesktop.org/releases/dbus/
 

Index: pkgsrc/sysutils/dbus/files/dbus.sh
diff -u pkgsrc/sysutils/dbus/files/dbus.sh:1.10 pkgsrc/sysutils/dbus/files/dbus.sh:1.11
--- pkgsrc/sysutils/dbus/files/dbus.sh:1.10     Sun May 22 23:02:24 2016
+++ pkgsrc/sysutils/dbus/files/dbus.sh  Sun Nov  7 19:14:16 2021
@@ -1,12 +1,16 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbus.sh,v 1.10 2016/05/22 23:02:24 youri Exp $
+# $NetBSD: dbus.sh,v 1.11 2021/11/07 19:14:16 khorben Exp $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
+#
+# You will need to set some variables in @SYSCONFBASE@/rc.conf to start dbus:
+#
+# dbus=YES
 
-. /etc/rc.subr
+$_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 
 name="dbus"
 rcvar=$name