Wed Oct 21 21:30:14 2015 UTC ()
Add SMF support. Bump revision.


(joerg)
diff -r1.37 -r1.38 pkgsrc/net/unbound/Makefile
diff -r0 -r1.1 pkgsrc/net/unbound/files/smf/manifest.xml
diff -r0 -r1.1 pkgsrc/net/unbound/files/smf/unbound.sh
cvs diff -r1.37 -r1.38 pkgsrc/net/unbound/Makefile (switch to unified diff)

--- pkgsrc/net/unbound/Makefile 2015/07/15 18:09:05 1.37
+++ pkgsrc/net/unbound/Makefile 2015/10/21 21:30:14 1.38
@@ -1,93 +1,96 @@ @@ -1,93 +1,96 @@
1# $NetBSD: Makefile,v 1.37 2015/07/15 18:09:05 pettai Exp $ 1# $NetBSD: Makefile,v 1.38 2015/10/21 21:30:14 joerg Exp $
2 2
3DISTNAME= unbound-1.5.4 3DISTNAME= unbound-1.5.4
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://www.unbound.net/downloads/ 6MASTER_SITES= http://www.unbound.net/downloads/
6 7
7MAINTAINER= pettai@NetBSD.org 8MAINTAINER= pettai@NetBSD.org
8HOMEPAGE= http://www.unbound.net/ 9HOMEPAGE= http://www.unbound.net/
9COMMENT= DNS resolver and recursive server 10COMMENT= DNS resolver and recursive server
10LICENSE= modified-bsd 11LICENSE= modified-bsd
11 12
12BUILD_DEFS+= VARBASE UNBOUND_USER UNBOUND_GROUP 13BUILD_DEFS+= VARBASE UNBOUND_USER UNBOUND_GROUP
13FILES_SUBST+= UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP} 14FILES_SUBST+= UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP}
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17 18
18CONFIGURE_ARGS+= --with-libexpat=${BUILDLINK_PREFIX.expat} 19CONFIGURE_ARGS+= --with-libexpat=${BUILDLINK_PREFIX.expat}
19CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/unbound/unbound.pid 20CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/unbound/unbound.pid
20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
21CONFIGURE_ARGS+= --enable-allsymbols 22CONFIGURE_ARGS+= --enable-allsymbols
22 23
23# Add the same logic as for ldns, so sha2/gost is configured automatically 24# Add the same logic as for ldns, so sha2/gost is configured automatically
24CHECK_BUILTIN.openssl= yes 25CHECK_BUILTIN.openssl= yes
25.include "../../security/openssl/builtin.mk" 26.include "../../security/openssl/builtin.mk"
26CHECK_BUILTIN.openssl= no 27CHECK_BUILTIN.openssl= no
27.include "../../security/openssl/buildlink3.mk" 28.include "../../security/openssl/buildlink3.mk"
28 29
29PLIST_VARS+= sha2 gost 30PLIST_VARS+= sha2 gost
30.if defined(USE_BUILTIN.openssl) && !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) 31.if defined(USE_BUILTIN.openssl) && !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
31PLIST_VARS.gost!= \ 32PLIST_VARS.gost!= \
32 if ${PKG_ADMIN} pmatch 'openssl>=1.0.0' ${BUILTIN_PKG.openssl:Q}; then \ 33 if ${PKG_ADMIN} pmatch 'openssl>=1.0.0' ${BUILTIN_PKG.openssl:Q}; then \
33 ${ECHO} "yes"; \ 34 ${ECHO} "yes"; \
34 else \ 35 else \
35 ${ECHO} "no"; \ 36 ${ECHO} "no"; \
36 fi 37 fi
37PLIST_VARS.sha2!= \ 38PLIST_VARS.sha2!= \
38 if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl:Q}; then \ 39 if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl:Q}; then \
39 ${ECHO} "yes"; \ 40 ${ECHO} "yes"; \
40 else \ 41 else \
41 ${ECHO} "no"; \ 42 ${ECHO} "no"; \
42 fi 43 fi
43.else 44.else
44PLIST_VARS.gost!= \ 45PLIST_VARS.gost!= \
45 if ${PKG_INFO} -qe 'openssl>=1.0.0'; then \ 46 if ${PKG_INFO} -qe 'openssl>=1.0.0'; then \
46 ${ECHO} yes; \ 47 ${ECHO} yes; \
47 else \ 48 else \
48 ${ECHO} no; \ 49 ${ECHO} no; \
49 fi 50 fi
50PLIST_VARS.sha2!= \ 51PLIST_VARS.sha2!= \
51 if ${PKG_INFO} -qe 'openssl>=0.9.8'; then \ 52 if ${PKG_INFO} -qe 'openssl>=0.9.8'; then \
52 ${ECHO} yes; \ 53 ${ECHO} yes; \
53 else \ 54 else \
54 ${ECHO} no; \ 55 ${ECHO} no; \
55 fi 56 fi
56.endif 57.endif
57.if ${PLIST_VARS.gost} == "yes" 58.if ${PLIST_VARS.gost} == "yes"
58CONFIGURE_ARGS+= --enable-gost 59CONFIGURE_ARGS+= --enable-gost
59.else 60.else
60CONFIGURE_ARGS+= --disable-gost 61CONFIGURE_ARGS+= --disable-gost
61.endif 62.endif
62.if ${PLIST_VARS.sha2} == "yes" 63.if ${PLIST_VARS.sha2} == "yes"
63CONFIGURE_ARGS+= --enable-sha2 64CONFIGURE_ARGS+= --enable-sha2
64.else 65.else
65CONFIGURE_ARGS+= --disable-sha2 66CONFIGURE_ARGS+= --disable-sha2
66.endif 67.endif
67 68
68SUBST_CLASSES+= paths 69SUBST_CLASSES+= paths
69SUBST_STAGE.paths= post-configure 70SUBST_STAGE.paths= post-configure
70SUBST_MESSAGE.paths= Fixing path names 71SUBST_MESSAGE.paths= Fixing path names
71SUBST_FILES.paths= doc/example.conf doc/*.5 doc/*.8 72SUBST_FILES.paths= doc/example.conf doc/*.5 doc/*.8
72SUBST_SED.paths= -e "s|/usr/local|${PREFIX}|" 73SUBST_SED.paths= -e "s|/usr/local|${PREFIX}|"
73 74
74INSTALL_MAKE_FLAGS+= \ 75INSTALL_MAKE_FLAGS+= \
75 configfile=${PREFIX}/share/examples/unbound/unbound.conf 76 configfile=${PREFIX}/share/examples/unbound/unbound.conf
76 77
77PKG_SYSCONFSUBDIR= unbound 78PKG_SYSCONFSUBDIR= unbound
78 79
79CONF_FILES+= share/examples/unbound/unbound.conf \ 80CONF_FILES+= share/examples/unbound/unbound.conf \
80 ${PKG_SYSCONFDIR}/unbound.conf 81 ${PKG_SYSCONFDIR}/unbound.conf
81 82
82RCD_SCRIPTS= unbound 83RCD_SCRIPTS= unbound
 84SMF_METHODS= unbound
 85SMF_NAME= unbound
83 86
84UNBOUND_USER?= unbound 87UNBOUND_USER?= unbound
85UNBOUND_GROUP?= unbound 88UNBOUND_GROUP?= unbound
86 89
87PKG_GROUPS= ${UNBOUND_GROUP} 90PKG_GROUPS= ${UNBOUND_GROUP}
88PKG_USERS= ${UNBOUND_USER}:${UNBOUND_GROUP} 91PKG_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"
File Added: pkgsrc/net/unbound/files/smf/manifest.xml
<?xml version="1.0"?>
<!-- $NetBSD: manifest.xml,v 1.1 2015/10/21 21:30:14 joerg 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>
File Added: pkgsrc/net/unbound/files/smf/unbound.sh
#!/sbin/sh
# $NetBSD: unbound.sh,v 1.1 2015/10/21 21:30:14 joerg 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"