From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 5 22:40:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23D6A16A4DF for ; Tue, 5 Sep 2006 22:40:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA93A43D49 for ; Tue, 5 Sep 2006 22:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k85MeKHU009369 for ; Tue, 5 Sep 2006 22:40:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k85MeKWG009368; Tue, 5 Sep 2006 22:40:20 GMT (envelope-from gnats) Resent-Date: Tue, 5 Sep 2006 22:40:20 GMT Resent-Message-Id: <200609052240.k85MeKWG009368@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, Konstantin Saurbier Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CBD716A4E0 for ; Tue, 5 Sep 2006 22:36:18 +0000 (UTC) (envelope-from saurbier@math.uni-bielefeld.de) Received: from mail1.math.uni-bielefeld.de (mail1.math.uni-bielefeld.de [129.70.14.32]) by mx1.FreeBSD.org (Postfix) with ESMTP id 454E043D55 for ; Tue, 5 Sep 2006 22:36:07 +0000 (GMT) (envelope-from saurbier@math.uni-bielefeld.de) Received: from fuji11.math.uni-bielefeld.de (fuji11.math.uni-bielefeld.de [129.70.15.131]) by mail1.math.uni-bielefeld.de (Postfix) with ESMTP id D465E958E0; Wed, 6 Sep 2006 00:36:05 +0200 (CEST) Received: by fuji11.math.uni-bielefeld.de (Postfix, from userid 4079) id CD68BB849; Wed, 6 Sep 2006 00:36:05 +0200 (CEST) Message-Id: <20060905223605.CD68BB849@fuji11.math.uni-bielefeld.de> Date: Wed, 6 Sep 2006 00:36:05 +0200 (CEST) From: Konstantin Saurbier To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: oli@isnic.is Subject: ports/102924: [PATCH] dns/nsd: update to 3.0.0 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: Tue, 05 Sep 2006 22:40:22 -0000 >Number: 102924 >Category: ports >Synopsis: [PATCH] dns/nsd: update to 3.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Sep 05 22:40:19 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Konstantin Saurbier >Release: FreeBSD 6.1-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD fuji11.math.uni-bielefeld.de 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #1: Wed Aug 23 15:11:01 CEST 2006 >Description: - Update to 3.0.0 - Changed from cuscom script to OPTIONS - Added new configure-options of NSD 3.0.0 Removed file(s): - scripts/configure.nsd Port maintainer (oli@isnic.is) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- nsd-3.0.0.patch begins here --- --- dns/nsd/Makefile Sat Jun 3 05:05:35 2006 +++ dns/nsd/Makefile Wed Sep 6 00:26:21 2006 @@ -5,15 +5,8 @@ # $FreeBSD: ports/dns/nsd/Makefile,v 1.28 2006/06/03 03:05:35 mnag Exp $ # -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH NSD_OPTIONS="ROOT_SERVER BIND8_STATS" -# -# the options are the same names as in the scripts/configure.nsd file. -# NSD_OPTIONS can be set in /etc/make.conf also. - PORTNAME= nsd -PORTVERSION= 2.3.5 +PORTVERSION= 3.0.0 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ @@ -40,42 +33,78 @@ -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%RC_SUBR%%,${RC_SUBR},g' -MAN8= nsd.8 zonec.8 nsdc.8 nsd-notify.8 nsd-xfer.8 +MAN5= nsd.conf.5 +MAN8= nsd.8 nsdc.8 zonec.8 nsd-checkconf.8 nsd-notify.8 nsd-patch.8 \ + nsd-xfer.8 + +PORTDOCS= CREDITS README RELNOTES REQUIREMENTS UPGRADING + +OPTIONS= ROOT_SERVER "Configure NSD as a root server" Off \ + LARGEFILE "Enable support for large files" Off \ + IPV6 "Enable IPv6 support" On \ + DNSSEC "Enable DNSSEC" On \ + 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 -PORTDOCS= README RELNOTES CREDITS DIFFERENCES REQUIREMENTS +.include -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - NSD_OPTIONS="${NSD_OPTIONS}" +.if defined(WITHOUT_LARGEFILE) +CONFIGURE_ARGS+= --disable-largefile +.endif -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.nsd +.if defined(WITH_ROOT_SERVER) +CONFIGURE_ARGS+= --enable-root-server +.endif -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" +.if defined(WITHOUT_IPV6) +CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(NOPORTDOCS) -READMEDIR=no -.else +.if defined(WITHOUT_DNSSEC) +CONFIGURE_ARGS+= --disable-dnssec +.endif + +.if defined(WITH_BIND8_STATS) +CONFIGURE_ARGS+= --enable-bind8-stats +.endif + +.if defined(WITH_CHECKING) +CONFIGURE_ARGS+= --enable-checking +.endif + +.if defined(WITHOUT_TSIG) +CONFIGURE_ARGS+= --disable-tsig +.endif + +.if defined(WITH_NSEC3) +CONFIGURE_ARGS+= --enable-nsec3 +.endif + +.if defined(WITH_NSID) +CONFIGURE_ARGS+= --enable-nsid +.endif + +.if defined(WITH_DOCFILES) READMEDIR=${PREFIX}/share/doc/nsd +.else +READMEDIR=no .endif post-install: ${SED} ${SED_SCRIPT} < ${FILESDIR}/nsd.sh.tmpl >${WRKDIR}/nsd.sh -.if !defined(NOPORTDOCS) + ${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \ + ${NSDDIR}/nsd.conf.sample + ${INSTALL_SCRIPT} ${WRKDIR}/nsd.sh ${PREFIX}/etc/rc.d/ +.if defined(WITH_DOCFILES) @${MKDIR} ${DOCSDIR} .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/${f} .endfor .endif - ${INSTALL_DATA} ${WRKSRC}/nsd.zones.sample \ - ${PREFIX}/etc/nsd/nsd.zones.sample - ${INSTALL_SCRIPT} ${WRKDIR}/nsd.sh ${PREFIX}/etc/rc.d/ @${CAT} ${PKGMESSAGE} -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include +.include --- dns/nsd/distinfo Sat Jun 3 05:05:35 2006 +++ dns/nsd/distinfo Tue Sep 5 23:27:58 2006 @@ -1,3 +1,3 @@ -MD5 (nsd-2.3.5.tar.gz) = e9dfb18d544cd37c57b05a91384037e9 -SHA256 (nsd-2.3.5.tar.gz) = cd16d3bbce2be200fb9fdbde20753642fe4f318b16e15528e953038a787fc6e2 -SIZE (nsd-2.3.5.tar.gz) = 239147 +MD5 (nsd-3.0.0.tar.gz) = a747125fededf816c09ec2e84118a440 +SHA256 (nsd-3.0.0.tar.gz) = 077ea705893b5c399e303878fbe664f46a36a2b3c442186c5249567a3fcd98a5 +SIZE (nsd-3.0.0.tar.gz) = 406822 --- dns/nsd/pkg-plist Mon Feb 7 22:51:13 2005 +++ dns/nsd/pkg-plist Tue Sep 5 23:32:35 2006 @@ -1,10 +1,11 @@ @comment $FreeBSD: ports/dns/nsd/pkg-plist,v 1.4 2005/02/07 21:51:13 edwin Exp $ etc/rc.d/nsd.sh -etc/nsd/nsd.zones.sample -etc/nsd/nsdc.conf.sample +etc/nsd/nsd.conf.sample sbin/nsd sbin/zonec sbin/nsdc sbin/nsd-notify +sbin/nsd-checkconf +sbin/nsd-patch sbin/nsd-xfer @dirrm etc/nsd --- dns/nsd/scripts/configure.nsd Fri May 6 13:50:25 2005 +++ dns/nsd/scripts/configure.nsd Thu Jan 1 01:00:00 1970 @@ -1,86 +0,0 @@ -#!/bin/sh -# $FreeBSD: ports/dns/nsd/scripts/configure.nsd,v 1.2 2005/05/06 11:50:25 novel Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`mktemp -t checklist` - -if [ "${NSD_OPTIONS}" ]; then - set ${NSD_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "NSD configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -ROOT_SERVER "Configure NSD as a root server" "$status_ROOT_SERVER" \ -NOIPv6 "Disable IPv6 support" "$status_NOIPv6" \ -NODNSSEC "Disable DNSSEC" "$status_NODNSSEC" \ -NOAXFR "Disable AXFR" "$status_NOAXFR" \ -BIND8_STATS "Enable BIND8 like NSTATS & XSTATS" "$status_BIND8_STATS" \ -PLUGINS "Enable plugin support" "$status_PLUGINS" \ -NOTSIG "Disable TSIG support" "$status_NOTSIG" \ -MMAP "Configure NSD to load the database using mmap(2)" "$status_MMAP" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -while [ "$1" ]; do - case $1 in - ROOT_SERVER) - echo "CONFIGURE_ARGS+= --enable-root-server" - ;; - NOIPv6) - echo "CONFIGURE_ARGS+= --disable-ipv6" - ;; - NODNSSEC) - echo "CONFIGURE_ARGS+= --disable-dnssec" - ;; - NOAXFR) - echo "CONFIGURE_ARGS+= --disable-axfr" - ;; - BIND8_STATS) - echo "CONFIGURE_ARGS+= --enable-bind8-stats" - ;; - PLUGINS) - echo "CONFIGURE_ARGS+= --enable-plugins" - ;; - NOTSIG) - echo "CONFIGURE_ARGS+= --disable-tsig" - ;; - MMAP) - echo "CONFIGURE_ARGS+= --enable-mmap" - ;; - *) - echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done --- nsd-3.0.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: