Attachment 140136 Details for Bug 186631 – nsd-4.0.1_1.patch

[patch] nsd-4.0.1_1.patch

nsd-4.0.1_1.patch (text/plain), 2.72 KB, created by Jaap Akkerhuis on 2014-02-10 15:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jaap Akkerhuis

Created: 2014-02-10 15:00:00 UTC

Size: 2.72 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 343641)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	nsd
> PORTVERSION=	4.0.1
>+PORTREVISION=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
> 		ftp://ftp.rhnet.is/pub/nsd/
>@@ -10,8 +11,10 @@
> MAINTAINER=	jaap@NLnetLabs.nl
> COMMENT=	An authoritative only non-recursive name server
> 
>-CONFLICTS=	nsd-[0-]* nsd3-*
>+LICENSE=	BSD3CLAUSE
> 
>+CONFLICTS=	nsd-[0-3]* nsd3-[0-9]*
>+
> USE_RC_SUBR=	nsd
> 
> NSDUSER?=	bind
>@@ -46,7 +49,7 @@
> 		differences.tex
> 
> OPTIONS_DEFINE=		ROOT_SERVER LARGEFILE IPV6 BIND8_STATS CHECKING \
>-		MINRESPSIZE NSEC3 NSEC3PREHASH MMAP MAXIPS DOCS EUI_RRTYPES
>+		MINRESPSIZE NSEC3 NSEC3PREHASH MMAP MAXIPS DOCS RRL EUI_RRTYPES
> OPTIONS_DEFAULT=	LARGEFILE IPV6 NSEC3 NSEC3PREHASH MINRESPSIZE RRL \
> 		 EUI_RRTYPES
> 
>@@ -62,7 +65,6 @@
> RRL_DESC=		Response Rate Limiting
> EUI_RRTYPES_DESC=	EUI48 and EUI64 RRtypes support
> 
>-NO_STAGE=		yes
> .include <bsd.port.options.mk>
> 
> LIB_DEPENDS+=	event-1:${PORTSDIR}/devel/libevent
>@@ -132,11 +134,11 @@
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \
>-		${PREFIX}/etc/nsd/nsd.conf.sample
>+		${STAGEDIR}${PREFIX}/etc/nsd/nsd.conf.sample
> .if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for f in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f}
>+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/${f}
> .endfor
> .endif
> 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>Index: files/nsd.in
>===================================================================
>--- files/nsd.in	(revision 343641)
>+++ files/nsd.in	(working copy)
>@@ -12,21 +12,22 @@
> # nsd_enable="YES"
> #
> 
>+: ${nsd_enable="NO"}
>+
> . /etc/rc.subr
> 
> name=nsd
>-rcvar=${name}_enable
>+rcvar=nsd_enable
> 
> config=${nsd_config:=%%PREFIX%%/etc/nsd/nsd.conf}
> required_files=${config}
>-
>-command=%%PREFIX%%/sbin/nsd-control
>-command_args="start"
> pidfile=`%%PREFIX%%/sbin/nsd-checkconf -o pidfile ${config}`
> 
>-procname=%%PREFIX%%/sbin/${name}
>-
>+command="%%PREFIX%%/sbin/${name}"
>+command_args="-c ${required_files}"
> extra_commands="reload"
> 
>+load_rc_config $name
>+
> run_rc_command "$1"
> 
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 343641)
>+++ pkg-message	(working copy)
>@@ -1,6 +1,6 @@
> **************************************************************************
> *
>-*   To run nsd from startup, add nsd_enable="YES" to your /etc/rc.conf
>+*   To run nsd from startup, add nsd_enable="YES" to your etc/rc.conf
> *
> *   Starting with nsd version 4 the old nsdc control program has been
> *   replaced by nsd-control. This requires some manual setup with

Actions: View | Diff

Attachments on bug 186631: 140136