From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 23 13:50:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C801065760 for ; Wed, 23 Jul 2008 13:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C66E78FC17 for ; Wed, 23 Jul 2008 13:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m6NDo1vU078168 for ; Wed, 23 Jul 2008 13:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m6NDo1oL078167; Wed, 23 Jul 2008 13:50:01 GMT (envelope-from gnats) Resent-Date: Wed, 23 Jul 2008 13:50:01 GMT Resent-Message-Id: <200807231350.m6NDo1oL078167@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Olafur Osvaldsson Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC4701065676 for ; Wed, 23 Jul 2008 13:40:47 +0000 (UTC) (envelope-from osvaldsson@icelandic.net) Received: from home.icelandic.net (home.icelandic.net [213.181.99.32]) by mx1.freebsd.org (Postfix) with ESMTP id 523BF8FC23 for ; Wed, 23 Jul 2008 13:40:46 +0000 (UTC) (envelope-from osvaldsson@icelandic.net) Received: from localhost (localhost.icelandic.net [127.0.0.1]) by home.icelandic.net (Postfix) with ESMTP id 4816315EC43 for ; Wed, 23 Jul 2008 13:19:18 +0000 (GMT) Received: from home.icelandic.net ([127.0.0.1]) by localhost (home.icelandic.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 63bk7fhWP2lY for ; Wed, 23 Jul 2008 13:18:56 +0000 (GMT) Received: from portbuild.icelandic.net (alftaholar.icelandic.net [81.15.120.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by home.icelandic.net (Postfix) with ESMTP id 50EB615EC28 for ; Wed, 23 Jul 2008 13:18:56 +0000 (GMT) Received: from portbuild.icelandic.net (localhost [127.0.0.1]) by portbuild.icelandic.net (8.14.2/8.14.2) with ESMTP id m6N4leUY064141 for ; Wed, 23 Jul 2008 04:47:40 GMT (envelope-from osvaldsson@portbuild.icelandic.net) Received: (from osvaldsson@localhost) by portbuild.icelandic.net (8.14.2/8.14.2/Submit) id m6N4leov064140; Wed, 23 Jul 2008 04:47:40 GMT (envelope-from osvaldsson) Message-Id: <200807230447.m6N4leov064140@portbuild.icelandic.net> Date: Wed, 23 Jul 2008 04:47:40 GMT From: Olafur Osvaldsson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/125898: [MAINTAINER] dns/nsd: update to 3.1.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2008 13:50:02 -0000 >Number: 125898 >Category: ports >Synopsis: [MAINTAINER] dns/nsd: update to 3.1.1 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 23 13:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Olafur Osvaldsson >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: System: FreeBSD portbuild.icelandic.net 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Jul 17 10:22:27 GMT 2008 >Description: - Update to 3.1.1 - Respect NOPORTDOCS Added file(s): - files/nsd.in Removed file(s): - files/nsd.sh.tmpl Patch partly based on changes submitted in PR#125625 by pgollucci http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/125625 >How-To-Repeat: >Fix: --- nsd-3.1.1.patch begins here --- diff -ruN nsd.orig/Makefile nsd/Makefile --- nsd.orig/Makefile 2008-07-23 03:43:07.000000000 +0000 +++ nsd/Makefile 2008-07-23 03:44:11.000000000 +0000 @@ -6,7 +6,7 @@ # PORTNAME= nsd -PORTVERSION= 3.0.7 +PORTVERSION= 3.1.1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ @@ -16,33 +16,34 @@ CONFLICTS= nsd-[0-2]* -USE_RC_SUBR= yes +USE_RC_SUBR= nsd NSDUSER?= bind -NSDDIR?= ${PREFIX}/etc/nsd -NSDDBFILE?= /var/db/nsd.database +NSDDBDIR?= /var/db/nsd +NSDDBFILE?= ${NSDDBDIR}/nsd.db +NSDDIFFFILE?= ${NSDDBDIR}/ixfr.db +NSDXFRDFILE?= ${NSDDBDIR}/xfrd.state GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-user=${NSDUSER} \ - --with-configdir=${NSDDIR} \ + --with-configdir=${PREFIX}/etc/nsd \ --with-pidfile=/var/run/nsd.pid \ --with-dbfile=${NSDDBFILE} \ + --with-difffile=${NSDDIFFFILE} \ + --with-xfrdfile=${NSDXFRDFILE} \ --with-libwrap CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -SED_SCRIPT= -e 's,%%NSDUSER%%,${NSDUSER},g' \ - -e 's,%%NSDDIR%%,${NSDDIR},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' - MAN5= nsd.conf.5 MAN8= nsd.8 nsdc.8 zonec.8 nsd-checkconf.8 nsd-notify.8 nsd-patch.8 \ nsd-xfer.8 +.if !defined (NOPORTDOCS) PORTDOCS= CREDITS ChangeLog LICENSE NSD-DATABASE NSD-DIFFFILE \ NSD-FOR-BIND-USERS README README.icc RELNOTES \ REQUIREMENTS TESTPLAN TODO UPGRADING coding-style \ differences.tex +.endif OPTIONS= ROOT_SERVER "Configure NSD as a root server" Off \ LARGEFILE "Enable support for large files" On \ @@ -51,9 +52,8 @@ BIND8_STATS "Enable BIND8 like NSTATS & XSTATS" Off \ CHECKING "Enable internal runtime checks" Off \ TSIG "Enable TSIG support" On \ - NSEC3 "Enable NSEC3 support" Off \ - NSID "Enable NSID support" Off \ - DOCFILES "Enable PORTDOCS" On + NSEC3 "Enable NSEC3 support" On \ + NSID "Enable NSID support" Off .include @@ -85,8 +85,8 @@ CONFIGURE_ARGS+= --disable-tsig .endif -.if defined(WITH_NSEC3) -CONFIGURE_ARGS+= --enable-nsec3 +.if defined(WITHOUT_NSEC3) +CONFIGURE_ARGS+= --disable-nsec3 .endif .if defined(WITH_NSID) @@ -109,11 +109,11 @@ .endif post-install: - ${SED} ${SED_SCRIPT} < ${FILESDIR}/nsd.sh.tmpl >${WRKDIR}/nsd.sh ${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \ - ${NSDDIR}/nsd.conf.sample - ${INSTALL_SCRIPT} ${WRKDIR}/nsd.sh ${PREFIX}/etc/rc.d/ -.if !defined(WITHOUT_DOCFILES) + ${PREFIX}/etc/nsd/nsd.conf.sample + @${MKDIR} ${NSDDBDIR} + @${CHOWN} -R ${NSDUSER} ${NSDDBDIR} +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f} diff -ruN nsd.orig/distinfo nsd/distinfo --- nsd.orig/distinfo 2008-07-23 03:43:07.000000000 +0000 +++ nsd/distinfo 2008-07-20 20:34:37.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (nsd-3.0.7.tar.gz) = 37558edef2fe9d9052aafeb73effd4ac -SHA256 (nsd-3.0.7.tar.gz) = 73c54aeaf8b302624dca7c570cc0c29b1610ef90b1b2159cb63b01044fdf6bd4 -SIZE (nsd-3.0.7.tar.gz) = 818770 +MD5 (nsd-3.1.1.tar.gz) = 93cb2d0fa005ab46f81ef00e4951a804 +SHA256 (nsd-3.1.1.tar.gz) = aba5777672b7a2be1d61c6a8cb3346f7115f5d1dc3ae0ea94a55ef948aa3ff39 +SIZE (nsd-3.1.1.tar.gz) = 829140 diff -ruN nsd.orig/files/nsd.in nsd/files/nsd.in --- nsd.orig/files/nsd.in 1970-01-01 00:00:00.000000000 +0000 +++ nsd/files/nsd.in 2008-07-17 09:31:18.000000000 +0000 @@ -0,0 +1,31 @@ +#!/bin/sh +# +# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.3 2006/09/23 08:07:48 rafan Exp $ +# +# PROVIDE: nsd +# REQUIRE: DAEMON +# +# Add the following line to /etc/rc.conf to enable nsd: +# +# nsd_enable="YES" +# + +. %%RC_SUBR%% + +name=nsd +rcvar=`set_rcvar` + +prefix=%%PREFIX%% + +required_files=%%PREFIX%%/etc/nsd/nsd.conf + +command=/usr/local/sbin/${name} +pidfile=/var/run/${name}.pid + +load_rc_config ${name} + +nsd_enable=${nsd_enable:-"NO"} +nsd_flags=${nsd_flags:-""} + +run_rc_command "$1" + diff -ruN nsd.orig/files/nsd.sh.tmpl nsd/files/nsd.sh.tmpl --- nsd.orig/files/nsd.sh.tmpl 2008-07-23 03:43:07.000000000 +0000 +++ nsd/files/nsd.sh.tmpl 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/dns/nsd/files/nsd.sh.tmpl,v 1.3 2006/09/23 08:07:48 rafan Exp $ -# -# PROVIDE: nsd -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable nsd: -# -# nsd_enable="YES" -# - -. %%RC_SUBR%% - -name=nsd -rcvar=`set_rcvar` - -prefix=%%PREFIX%% - -required_files=%%NSDDIR%%/nsd.conf - -command=/usr/local/sbin/${name} -pidfile=/var/run/${name}.pid - -# set defaults - -nsd_enable=${nsd_enable:-"NO"} -nsd_flags=${nsd_flags:-""} - -load_rc_config ${name} -run_rc_command "$1" - diff -ruN nsd.orig/pkg-plist nsd/pkg-plist --- nsd.orig/pkg-plist 2008-07-23 03:43:07.000000000 +0000 +++ nsd/pkg-plist 2008-07-23 03:06:06.000000000 +0000 @@ -1,11 +1,12 @@ -@comment $FreeBSD: ports/dns/nsd/pkg-plist,v 1.5 2006/09/12 20:17:15 miwi Exp $ -etc/rc.d/nsd.sh +@comment $FreeBSD$ etc/nsd/nsd.conf.sample sbin/nsd -sbin/zonec -sbin/nsdc -sbin/nsd-notify sbin/nsd-checkconf +sbin/nsd-notify sbin/nsd-patch sbin/nsd-xfer +sbin/nsdc +sbin/zonec @dirrm etc/nsd +@cwd / +@dirrm var/db/nsd --- nsd-3.1.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: