CVS commit: pkgsrc/net/miredo

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jan  6 00:12:39 UTC 2019

Modified Files:
        pkgsrc/net/miredo: Makefile
        pkgsrc/net/miredo/files: miredo.sh

Log Message:
Fix PKG_SYSCONFDIR support. Run as a particular unprivileged user. Fix
non-"/usr/pkg" PREFIX and non-"/var" VARBASE in rc script. Bump
PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/miredo/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/miredo/files/miredo.sh

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

Modified files:

Index: pkgsrc/net/miredo/Makefile
diff -u pkgsrc/net/miredo/Makefile:1.25 pkgsrc/net/miredo/Makefile:1.26
--- pkgsrc/net/miredo/Makefile:1.25     Sat Jan  5 21:46:05 2019
+++ pkgsrc/net/miredo/Makefile  Sun Jan  6 00:12:39 2019
@@ -1,35 +1,44 @@
-# $NetBSD: Makefile,v 1.25 2019/01/05 21:46:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2019/01/06 00:12:39 schmonz Exp $
 
-DISTNAME=      miredo-1.2.6
-CATEGORIES=    net
-MASTER_SITES=  http://www.remlab.net/files/miredo/
-EXTRACT_SUFX=  .tar.xz
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.remlab.net/miredo/
-COMMENT=       Teredo IPv6 tunneling
-LICENSE=       gnu-gpl-v2
+DISTNAME=              miredo-1.2.6
+PKGREVISION=           1
+CATEGORIES=            net
+MASTER_SITES=          http://www.remlab.net/files/miredo/
+EXTRACT_SUFX=          .tar.xz
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              https://www.remlab.net/miredo/
+COMMENT=               Teredo IPv6 tunneling
+LICENSE=               gnu-gpl-v2
 
 NOT_FOR_PLATFORM=      Interix-*-* NetBSD-[0-3].*-* SunOS-*-*
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=       --enable-examplesdir=${EGDIR}
 CONFIGURE_ARGS+=       --disable-sample-conf
+CONFIGURE_ARGS+=       --enable-miredo-user=${MIREDO_USER}
 
-USE_LANGUAGES= c c++
-USE_LIBTOOL=   yes
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
 
 PKG_SYSCONFSUBDIR?=    miredo
-EGDIR=         ${PREFIX}/share/examples/miredo
-CONF_FILES=    ${EGDIR}/miredo.conf ${PKG_SYSCONFDIR}/miredo.conf
-CONF_FILES+=   ${EGDIR}/miredo-server.conf \
-               ${PKG_SYSCONFDIR}/miredo-server.conf
-CONF_FILES+=   ${EGDIR}/client-hook ${PKG_SYSCONFDIR}/client-hook
+EGDIR=                 ${PREFIX}/share/examples/miredo
+CONF_FILES=            ${EGDIR}/miredo.conf ${PKG_SYSCONFDIR}/miredo.conf
+CONF_FILES+=           ${EGDIR}/miredo-server.conf \
+                       ${PKG_SYSCONFDIR}/miredo-server.conf
+CONF_FILES+=           ${EGDIR}/client-hook ${PKG_SYSCONFDIR}/client-hook
+
+RCD_SCRIPTS=           miredo
+FILES_SUBST+=          MIREDO_USER=${MIREDO_USER:Q}
+
+PKG_USERS_VARS+=       MIREDO_USER
+PKG_GROUPS_VARS+=      MIREDO_GROUP
+PKG_GROUPS+=           ${MIREDO_GROUP}
+PKG_USERS+=            ${MIREDO_USER}:${MIREDO_GROUP}
 
-RCD_SCRIPTS=   miredo
-
-BUILD_DEFS+=   VARBASE
+BUILD_DEFS+=           VARBASE PKG_SYSCONFBASE
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libjudy/buildlink3.mk"

Index: pkgsrc/net/miredo/files/miredo.sh
diff -u pkgsrc/net/miredo/files/miredo.sh:1.1 pkgsrc/net/miredo/files/miredo.sh:1.2
--- pkgsrc/net/miredo/files/miredo.sh:1.1       Wed Feb  9 22:59:50 2011
+++ pkgsrc/net/miredo/files/miredo.sh   Sun Jan  6 00:12:39 2019
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: miredo.sh,v 1.1 2011/02/09 22:59:50 pettai Exp $
+# $NetBSD: miredo.sh,v 1.2 2019/01/06 00:12:39 schmonz Exp $
 
 # PROVIDE: miredo
 # REQUIRE: NETWORKING
@@ -8,10 +8,11 @@
 . /etc/rc.subr
 
 name="miredo"
-rcvar=$name
-command="/usr/pkg/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+rcvar=${name}
+command="@PREFIX@/sbin/${name}"
+command_args="-u @MIREDO_USER@"
+required_files="@PKG_SYSCONFDIR@/miredo.conf"
+pidfile="@VARBASE@/run/${name}.pid"
 
 load_rc_config $name
 run_rc_command "$1"
-