CVS commit: pkgsrc/security/cyrus-saslauthd

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

Module Name:    pkgsrc
Committed By:   khorben
Date:           Tue May 10 03:34:16 UTC 2022

Modified Files:
        pkgsrc/security/cyrus-saslauthd: Makefile
        pkgsrc/security/cyrus-saslauthd/files: saslauthd.sh

Log Message:
cyrus-saslauthd: let the RC script work unprivileged

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

Bumps PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/security/cyrus-saslauthd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/cyrus-saslauthd/files/saslauthd.sh

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

Modified files:

Index: pkgsrc/security/cyrus-saslauthd/Makefile
diff -u pkgsrc/security/cyrus-saslauthd/Makefile:1.57 pkgsrc/security/cyrus-saslauthd/Makefile:1.58
--- pkgsrc/security/cyrus-saslauthd/Makefile:1.57       Thu Feb 24 11:00:04 2022
+++ pkgsrc/security/cyrus-saslauthd/Makefile    Tue May 10 03:34:16 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2022/02/24 11:00:04 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2022/05/10 03:34:16 khorben Exp $
 
 PKGNAME=       ${DISTNAME:S/sasl/saslauthd/}
+PKGREVISION=   1
 CONFLICTS+=    cyrus-sasl<2.1.15nb2
 
 .include "../../security/cyrus-sasl/Makefile.common"

Index: pkgsrc/security/cyrus-saslauthd/files/saslauthd.sh
diff -u pkgsrc/security/cyrus-saslauthd/files/saslauthd.sh:1.3 pkgsrc/security/cyrus-saslauthd/files/saslauthd.sh:1.4
--- pkgsrc/security/cyrus-saslauthd/files/saslauthd.sh:1.3      Wed Aug  4 20:08:38 2004
+++ pkgsrc/security/cyrus-saslauthd/files/saslauthd.sh  Tue May 10 03:34:16 2022
@@ -1,16 +1,18 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: saslauthd.sh,v 1.3 2004/08/04 20:08:38 jlam Exp $
+# $NetBSD: saslauthd.sh,v 1.4 2022/05/10 03:34:16 khorben Exp $
 #
 # The saslauthd daemon allows cleartext UNIX password authentication via
 # several authentication mechanisms with Cyrus SASL.
 #
 # PROVIDE: saslauthd
 # REQUIRE: DAEMON
+#
+# You will need to set some variables in @SYSCONFBASE@/rc.conf to start saslauthd:
+#
+# saslauthd=YES
 
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
+$_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 
 name="saslauthd"
 rcvar="${name}"
@@ -30,7 +32,7 @@ saslauthd_precmd()
         fi
 }
 
-if [ -f /etc/rc.subr ]; then
+if [ -f @SYSCONFBASE@/rc.subr ]; then
        load_rc_config $name
        run_rc_command "$1"
 else