Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1712514128259170"
MIME-Version: 1.0
Date: Sun, 7 Apr 2024 18:22:08 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/mail/dkimproxy
To: pkgsrc-changes@NetBSD.org
Reply-To: ryoon@netbsd.org
Message-Id: <20240407182208.9D625FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Sun Apr  7 18:22:08 UTC 2024

Modified Files:
	pkgsrc/mail/dkimproxy: Makefile
Added Files:
	pkgsrc/mail/dkimproxy/files: dkimproxy_in.sh dkimproxy_out.sh

Log Message:
mail/dkimproxy: Add rc.d scripts

* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/dkimproxy/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/dkimproxy/files/dkimproxy_in.sh \
    pkgsrc/mail/dkimproxy/files/dkimproxy_out.sh

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


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

Modified files:

Index: pkgsrc/mail/dkimproxy/Makefile
diff -u pkgsrc/mail/dkimproxy/Makefile:1.1 pkgsrc/mail/dkimproxy/Makefile:1.2
--- pkgsrc/mail/dkimproxy/Makefile:1.1	Mon Jan 29 15:54:02 2024
+++ pkgsrc/mail/dkimproxy/Makefile	Sun Apr  7 18:22:08 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2024/01/29 15:54:02 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/07 18:22:08 ryoon Exp $
 
 DISTNAME=		dkimproxy-1.4.1
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dkimproxy/}
 
@@ -14,6 +15,19 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSC
 USE_LANGUAGES=		# none
 USE_TOOLS+=		perl:run
 
+DKIMPROXY_USER?=	dkimproxy
+DKIMPROXY_GROUP?=	dkimproxy
+PKG_USERS_VARS+=	DKIMPROXY_USER
+PKG_GROUPS_VARS+=	DKIMPROXY_GROUP
+PKG_GROUPS=		${DKIMPROXY_GROUP}
+PKG_USERS=		${DKIMPROXY_USER}:${DKIMPROXY_GROUP}
+
+FILES_SUBST+=		DKIMPROXY_USER=${DKIMPROXY_USER}
+FILES_SUBST+=		DKIMPROXY_GROUP=${DKIMPROXY_GROUP}
+
+RCD_SCRIPTS+=		dkimproxy_in
+RCD_SCRIPTS+=		dkimproxy_out
+
 EGDIR=			share/examples/${PKGBASE}
 CONF_FILES=		${PREFIX}/${EGDIR}/dkimproxy_in.conf.example \
 			${PKG_SYSCONFDIR}/dkimproxy_in.conf

Added files:

Index: pkgsrc/mail/dkimproxy/files/dkimproxy_in.sh
diff -u /dev/null pkgsrc/mail/dkimproxy/files/dkimproxy_in.sh:1.1
--- /dev/null	Sun Apr  7 18:22:08 2024
+++ pkgsrc/mail/dkimproxy/files/dkimproxy_in.sh	Sun Apr  7 18:22:08 2024
@@ -0,0 +1,41 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dkimproxy_in.sh,v 1.1 2024/04/07 18:22:08 ryoon Exp $
+#
+# PROVIDE: dkimproxy_in
+# REQUIRE: DAEMON
+# BEFORE: mail
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="dkimproxy_in"
+rcvar=$name
+command="@PREFIX@/bin/dkimproxy.in"
+command_interpreter="@PERL5@"
+pidfile="@VARBASE@/run/dkimproxy/${name}.pid"
+command_args="--pidfile=${pidfile} --daemonize --conf_file=@PKG_SYSCONFDIR@/dkimproxy_in.conf --user=@DKIMPROXY_USER@ --group=@DKIMPROXY_GROUP@"
+required_files="@PKG_SYSCONFDIR@/dkimproxy_in.conf"
+start_precmd="dkimproxy_precmd"
+
+dkimproxy_precmd()
+{
+	if [ ! -d @VARBASE@/run/dkimproxy ]; then
+		@MKDIR@ @VARBASE@/run/dkimproxy
+		@CHMOD@ 0750 @VARBASE@/run/dkimproxy
+		@CHOWN@ @DKIMPROXY_USER@:@DKIMPROXY_GROUP@ @VARBASE@/run/dkimproxy
+	fi
+
+	if [ -f @VARBASE@/run/dkimproxy/${name}.sock ]; then
+		@RM@ -f @VARBASE@/run/dkimproxy/${name}.sock
+	fi
+}
+
+if [ -f /etc/rc.subr ]; then
+        load_rc_config $name
+	run_rc_command "$1"
+else
+	echo -n " ${name}"
+	${command} ${dkimproxy_flags} ${command_args}
+fi
Index: pkgsrc/mail/dkimproxy/files/dkimproxy_out.sh
diff -u /dev/null pkgsrc/mail/dkimproxy/files/dkimproxy_out.sh:1.1
--- /dev/null	Sun Apr  7 18:22:08 2024
+++ pkgsrc/mail/dkimproxy/files/dkimproxy_out.sh	Sun Apr  7 18:22:08 2024
@@ -0,0 +1,41 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dkimproxy_out.sh,v 1.1 2024/04/07 18:22:08 ryoon Exp $
+#
+# PROVIDE: dkimproxy_out
+# REQUIRE: DAEMON
+# BEFORE: mail
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="dkimproxy_out"
+rcvar=$name
+command="@PREFIX@/bin/dkimproxy.out"
+command_interpreter="@PERL5@"
+pidfile="@VARBASE@/run/dkimproxy/${name}.pid"
+command_args="--pidfile=${pidfile} --daemonize --conf_file=@PKG_SYSCONFDIR@/dkimproxy_out.conf --user=@DKIMPROXY_USER@ --group=@DKIMPROXY_GROUP@"
+required_files="@PKG_SYSCONFDIR@/dkimproxy_out.conf"
+start_precmd="dkimproxy_precmd"
+
+dkimproxy_precmd()
+{
+	if [ ! -d @VARBASE@/run/dkimproxy ]; then
+		@MKDIR@ @VARBASE@/run/dkimproxy
+		@CHMOD@ 0750 @VARBASE@/run/dkimproxy
+		@CHOWN@ @DKIMPROXY_USER@:@DKIMPROXY_GROUP@ @VARBASE@/run/dkimproxy
+	fi
+
+	if [ -f @VARBASE@/run/dkimproxy/${name}.sock ]; then
+		@RM@ -f @VARBASE@/run/dkimproxy/${name}.sock
+	fi
+}
+
+if [ -f /etc/rc.subr ]; then
+        load_rc_config $name
+	run_rc_command "$1"
+else
+	echo -n " ${name}"
+	${command} ${dkimproxy_flags} ${command_args}
+fi


--_----------=_1712514128259170--