Wed Mar 11 15:18:51 2015 UTC ()
Add SMF manifest and ssl/tls support (new gnutls option, enabled by default)


(wiedi)
diff -r1.36 -r1.37 pkgsrc/mail/nullmailer/Makefile
diff -r0 -r1.1 pkgsrc/mail/nullmailer/options.mk
diff -r0 -r1.1 pkgsrc/mail/nullmailer/files/smf/manifest.xml

cvs diff -r1.36 -r1.37 pkgsrc/mail/nullmailer/Makefile (expand / switch to context diff)
--- pkgsrc/mail/nullmailer/Makefile 2013/09/03 17:50:27 1.36
+++ pkgsrc/mail/nullmailer/Makefile 2015/03/11 15:18:51 1.37
@@ -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}
@@ -58,6 +59,8 @@
 
 INSTALLATION_DIRS=	share/doc/${PKGBASE} share/examples/${PKGBASE}
 BUILD_DEFS+=		VARBASE
+
+.include "options.mk"
 
 post-extract:
 	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf

File Added: pkgsrc/mail/nullmailer/options.mk
# $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


File Added: pkgsrc/mail/nullmailer/files/smf/manifest.xml
<?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>