Add SMF manifest and ssl/tls support (new gnutls option, enabled by default)

3 files changed, 52 insertions, 1 deletions

diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index feedc4ef3ee..a50127fa104 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2013/09/03 17:50:27 shattered Exp $
+# $NetBSD: Makefile,v 1.37 2015/03/11 15:18:51 wiedi Exp $
 
 DISTNAME=		nullmailer-1.13
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE:Q}
 DIST_SUBDIR=		${PKGNAME_NOREV}
@@ -59,6 +60,8 @@ SUBST_STAGE.paths=	post-configure
 INSTALLATION_DIRS=	share/doc/${PKGBASE} share/examples/${PKGBASE}
 BUILD_DEFS+=		VARBASE
 
+.include "options.mk"
+
 post-extract:
 	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
 	${CP} ${FILESDIR}/nullmailer-daemon ${WRKDIR}/nullmailer-daemon
diff --git a/mail/nullmailer/files/smf/manifest.xml b/mail/nullmailer/files/smf/manifest.xml
new file mode 100644
index 00000000000..4ba9997da46
--- /dev/null
+++ b/mail/nullmailer/files/smf/manifest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!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"/>
+	<dependency name='fs-root' grouping='require_all' restart_on='none' type='service'>
+		<service_fmri value='svc:/system/filesystem/root' />
+	</dependency>
+	<dependency name='network-service' grouping='require_all' restart_on='none' type='service'>
+		<service_fmri value='svc:/network/service'/>
+	</dependency>
+	<method_context working_directory='/tmp'>
+		<method_credential user="@NULLMAILER_USER@" group="@NULLMAILER_GROUP@"/>
+	</method_context>
+
+	<exec_method name='start' type='method' exec='@PREFIX@/libexec/nullmailer/nullmailer-send' timeout_seconds='20'/>
+	<exec_method name='stop'  type='method' exec=':kill' timeout_seconds='60'/>
+
+	<property_group name="startd" type="framework">
+		<propval name="duration" type="astring" value="child" />
+		<propval name="ignore_error" type="astring" value="core,signal" />
+	</property_group>
+
+	<stability value='Unstable'/>
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>Simple relay-only mail transport agent</loctext>
+		</common_name>
+		<documentation>
+			<manpage title='nullmailer' section='7' manpath='@PREFIX@/@PKGMANDIR@' />
+		</documentation>
+	</template>
+</service>
+</service_bundle>
+
diff --git a/mail/nullmailer/options.mk b/mail/nullmailer/options.mk
new file mode 100644
index 00000000000..e83af9ec7c9
--- /dev/null
+++ b/mail/nullmailer/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2015/03/11 15:18:51 wiedi Exp $
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.nullmailer
+PKG_SUPPORTED_OPTIONS=  gnutls
+PKG_SUGGESTED_OPTIONS=  gnutls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-tls
+.endif # option gnutls
+