Pullup ticket #4844 - requested by joerg net/unbound: SMF support Revisions pulled up: - net/unbound/Makefile 1.38 - net/unbound/files/smf/manifest.xml 1.1 - net/unbound/files/smf/unbound.sh 1.1 --- Module Name: pkgsrc Committed By: joerg Date: Wed Oct 21 21:30:14 UTC 2015 Modified Files: pkgsrc/net/unbound: Makefile Added Files: pkgsrc/net/unbound/files/smf: manifest.xml unbound.sh Log Message: Add SMF support. Bump revision.diff -r1.37 -r1.37.2.1 pkgsrc/net/unbound/Makefile
(bsiegert)
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.37 2015/07/15 18:09:05 pettai Exp $ | 1 | # $NetBSD: Makefile,v 1.37.2.1 2015/10/26 20:12:11 bsiegert Exp $ | |
2 | 2 | |||
3 | DISTNAME= unbound-1.5.4 | 3 | DISTNAME= unbound-1.5.4 | |
4 | PKGREVISION= 1 | |||
4 | CATEGORIES= net | 5 | CATEGORIES= net | |
5 | MASTER_SITES= http://www.unbound.net/downloads/ | 6 | MASTER_SITES= http://www.unbound.net/downloads/ | |
6 | 7 | |||
7 | MAINTAINER= pettai@NetBSD.org | 8 | MAINTAINER= pettai@NetBSD.org | |
8 | HOMEPAGE= http://www.unbound.net/ | 9 | HOMEPAGE= http://www.unbound.net/ | |
9 | COMMENT= DNS resolver and recursive server | 10 | COMMENT= DNS resolver and recursive server | |
10 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
11 | 12 | |||
12 | BUILD_DEFS+= VARBASE UNBOUND_USER UNBOUND_GROUP | 13 | BUILD_DEFS+= VARBASE UNBOUND_USER UNBOUND_GROUP | |
13 | FILES_SUBST+= UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP} | 14 | FILES_SUBST+= UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP} | |
14 | 15 | |||
15 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
16 | USE_LIBTOOL= yes | 17 | USE_LIBTOOL= yes | |
@@ -70,24 +71,26 @@ SUBST_STAGE.paths= post-configure | @@ -70,24 +71,26 @@ SUBST_STAGE.paths= post-configure | |||
70 | SUBST_MESSAGE.paths= Fixing path names | 71 | SUBST_MESSAGE.paths= Fixing path names | |
71 | SUBST_FILES.paths= doc/example.conf doc/*.5 doc/*.8 | 72 | SUBST_FILES.paths= doc/example.conf doc/*.5 doc/*.8 | |
72 | SUBST_SED.paths= -e "s|/usr/local|${PREFIX}|" | 73 | SUBST_SED.paths= -e "s|/usr/local|${PREFIX}|" | |
73 | 74 | |||
74 | INSTALL_MAKE_FLAGS+= \ | 75 | INSTALL_MAKE_FLAGS+= \ | |
75 | configfile=${PREFIX}/share/examples/unbound/unbound.conf | 76 | configfile=${PREFIX}/share/examples/unbound/unbound.conf | |
76 | 77 | |||
77 | PKG_SYSCONFSUBDIR= unbound | 78 | PKG_SYSCONFSUBDIR= unbound | |
78 | 79 | |||
79 | CONF_FILES+= share/examples/unbound/unbound.conf \ | 80 | CONF_FILES+= share/examples/unbound/unbound.conf \ | |
80 | ${PKG_SYSCONFDIR}/unbound.conf | 81 | ${PKG_SYSCONFDIR}/unbound.conf | |
81 | 82 | |||
82 | RCD_SCRIPTS= unbound | 83 | RCD_SCRIPTS= unbound | |
84 | SMF_METHODS= unbound | |||
85 | SMF_NAME= unbound | |||
83 | 86 | |||
84 | UNBOUND_USER?= unbound | 87 | UNBOUND_USER?= unbound | |
85 | UNBOUND_GROUP?= unbound | 88 | UNBOUND_GROUP?= unbound | |
86 | 89 | |||
87 | PKG_GROUPS= ${UNBOUND_GROUP} | 90 | PKG_GROUPS= ${UNBOUND_GROUP} | |
88 | PKG_USERS= ${UNBOUND_USER}:${UNBOUND_GROUP} | 91 | PKG_USERS= ${UNBOUND_USER}:${UNBOUND_GROUP} | |
89 | 92 | |||
90 | .include "options.mk" | 93 | .include "options.mk" | |
91 | 94 | |||
92 | .include "../../textproc/expat/buildlink3.mk" | 95 | .include "../../textproc/expat/buildlink3.mk" | |
93 | .include "../../mk/bsd.pkg.mk" | 96 | .include "../../mk/bsd.pkg.mk" |
<?xml version="1.0"?>
<!-- $NetBSD: manifest.xml,v 1.1.2.2 2015/10/26 20:12:12 bsiegert Exp $ -->
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<service_bundle type="manifest" name="@SMF_NAME@">
<service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
<create_default_instance enabled="false" />
<single_instance />
<dependency name='network' grouping='require_all' restart_on='error' type='service'>
<service_fmri value='svc:/milestone/network:default' />
</dependency>
<dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local:default' />
</dependency>
<method_context>
<method_environment>
<envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" />
</method_environment>
</method_context>
<exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.unbound@ %{config_file}' timeout_seconds='60' />
<exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
<exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
<property_group name="startd" type="framework">
<propval name="duration" type="astring" value="contract" />
<propval name="ignore_error" type="astring" value="core,signal" />
</property_group>
<property_group name="application" type="application">
<propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/unbound.conf" />
</property_group>
<stability value="Evolving" />
<template>
<common_name>
<loctext xml:lang="C">unbound DNS cache</loctext>
</common_name>
</template>
</service>
</service_bundle>
#!/sbin/sh
# $NetBSD: unbound.sh,v 1.1.2.2 2015/10/26 20:12:12 bsiegert Exp $
. /lib/svc/share/smf_include.sh
if [ ! -d @VARBASE@/run/unbound ]; then
@MKDIR@ @VARBASE@/run/unbound
@CHMOD@ 0750 @VARBASE@/run/unbound
@CHOWN@ @UNBOUND_USER@:@UNBOUND_GROUP@ @VARBASE@/run/unbound
fi
@PREFIX@/sbin/unbound -c "$1"