Date: Mon, 7 Feb 2005 12:36:57 +0000 From: Olafur Osvaldsson <oli@isnic.is> To: freebsd-ports-bugs@FreeBSD.org Cc: freebsd-ports@freebsd.org Subject: Re: ports/76412: [MAINTAINER] dns/nsd: update to 2.2.0 Message-ID: <20050207123657.GB24850@isnic.is> In-Reply-To: <20050131093341.GL35200@isnic.is> References: <200501191116.j0JBGh7r099484@freefall.freebsd.org> <20050119120238.GA35200@isnic.is> <20050119120524.GK1033@k7.mavetju> <20050119131223.GC35200@isnic.is> <20050124091127.GJ35200@isnic.is> <20050131093341.GL35200@isnic.is>
next in thread | previous in thread | raw e-mail | index | archive | help
If there is no way to get this port updated I would like to be removed
as maintainer as I have no intention on maintaining something when
my changes take a month or more to be committed.
/Oli
On Mon, 31 Jan 2005, Olafur Osvaldsson wrote:
> Since I get no response from Edwin I ask that someone else please
> takes care of this.
>=20
> /Oli
>=20
> On Mon, 24 Jan 2005, Olafur Osvaldsson wrote:
>=20
> > Edwin,
> > Is there any chance to get this submitted any time soon?
> > I'm getting queries from users wondering why the port hasn't been
> > updated.
> >=20
> > /Oli
> >=20
> > On Wed, 19 Jan 2005, Olafur Osvaldsson wrote:
> >=20
> > > Edwin,
> > >=20
> > > On Wed, 19 Jan 2005, Edwin Groothuis wrote:
> > >=20
> > > > 5.8.2.3 Example
> > > >=20
> > > > OPTIONS=3D foo "Enable option foo" On \
> > > > bar "Support feature bar" Off
> > > >=20
> > > > .include <bsd.port.pre.mk>
> > > >=20
> > > > .if defined(WITH_FOO)
> > > > CONFIGURE_ARGS+=3D --with-foo
> > > > .else
> > > > CONFIGURE_ARGS+=3D --without-foo
> > > > .endif
> > > >=20
> > > > .if defined(WITH_BAR)
> > > > RUN_DEPENDS+=3D bar:${PORTSDIR}/bar/bar
> > > > .endif
> > > >=20
> > > > .include <bsd.port.post.mk>
> > >=20
> > > This example does not work, in OPTIONS foo is used but WITH_FOO
> > > is checked below, this seems to be case sensetive and when I tried
> > > it like in the example then it didn't work.
> > >=20
> > >=20
> > > I've made a patch with the options you requested but I decided
> > > to send you a fixed version of my previous patch as it was not
> > > working due to lines being to long.
> > >=20
> > > The reason I would rather like to use my previous method is that
> > > it makes it possible for people to put the options in /etc/make.conf
> > >=20
> > > If this is not acceptable the other method is attached in nsd-options=
.diff
> > >=20
> > > /Oli
> > >=20
> > > --=20
> > > Olafur Osvaldsson
> > > Systems Administrator
> > > Internet a Islandi hf.
> > > Tel: +354 525-5291
> > > Email: oli@isnic.is
> >=20
> > > diff -ruN nsd.orig/Makefile nsd/Makefile
> > > --- nsd.orig/Makefile Tue Jan 18 14:43:31 2005
> > > +++ nsd/Makefile Wed Jan 19 12:54:09 2005
> > > @@ -5,8 +5,15 @@
> > > # $FreeBSD: ports/dns/nsd/Makefile,v 1.20 2004/11/30 12:58:19 sem Ex=
p $
> > > #
> > > =20
> > > +# To pre-select options in batch mode, run make like this:
> > > +#
> > > +# make -DBATCH NSD_OPTIONS=3D"ROOT_SERVER BIND8_STATS"
> > > +#
> > > +# the options are the same names as in the scripts/configure.nsd fil=
e.
> > > +# NSD_OPTIONS can be set in /etc/make.conf also.
> > > +
> > > PORTNAME=3D nsd
> > > -PORTVERSION=3D 2.1.5
> > > +PORTVERSION=3D 2.2.0
> > > CATEGORIES=3D dns ipv6
> > > MASTER_SITES=3D http://www.nlnetlabs.nl/downloads/nsd/ \
> > > ftp://ftp.rhnet.is/pub/nsd/
> > > @@ -19,70 +26,41 @@
> > > NSDUSER?=3D bind
> > > NSDDIR?=3D ${PREFIX}/etc/nsd
> > > NSDDBFILE?=3D /var/db/nsd.database
> > > -NSDXFER?=3D /usr/libexec/named-xfer
> > > =20
> > > GNU_CONFIGURE=3D yes
> > > CONFIGURE_ARGS=3D --with-user=3D${NSDUSER} \
> > > --with-configdir=3D${NSDDIR} \
> > > --with-pidfile=3D/var/run/nsd.pid \
> > > --with-dbfile=3D${NSDDBFILE} \
> > > - --with-namedxfer=3D${NSDXFER} \
> > > --with-libwrap
> > > CONFIGURE_TARGET=3D --build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
> > > =20
> > > -.if defined(WITHOUT_IPV6)
> > > -CONFIGURE_ARGS+=3D --disable-ipv6
> > > -.endif
> > > -
> > > -.if defined(WITHOUT_AXFR)
> > > -CONFIGURE_ARGS+=3D --disable-axfr
> > > -.endif
> > > -
> > > -.if defined(WITH_PLUGINS)
> > > -CONFIGURE_ARGS+=3D --enable-plugins
> > > -.endif
> > > -
> > > -.if defined(WITH_BIND8_STATS)
> > > -CONFIGURE_ARGS+=3D --enable-bind8-stats
> > > -.endif
> > > -
> > > -.if defined(WITH_DNSSEC)
> > > -CONFIGURE_ARGS+=3D --enable-dnssec
> > > -.endif
> > > -
> > > -.if defined(WITH_ROOT_SERVER)
> > > -CONFIGURE_ARGS+=3D --enable-root-server
> > > -.endif
> > > -
> > > -.if defined(WITH_MMAP)
> > > -CONFIGURE_ARGS+=3D --enable-mmap
> > > -.endif
> > > -
> > > SED_SCRIPT=3D -e 's,%%NSDUSER%%,${NSDUSER},g' \
> > > -e 's,%%NSDDIR%%,${NSDDIR},g' \
> > > -e 's,%%PREFIX%%,${PREFIX},g' \
> > > -e 's,%%RC_SUBR%%,${RC_SUBR},g'
> > > =20
> > > -MAN8=3D nsd.8 zonec.8 nsdc.8 nsd-notify.8
> > > +MAN8=3D nsd.8 zonec.8 nsdc.8 nsd-notify.8 nsd-xfer.8
> > > =20
> > > PORTDOCS=3D README RELNOTES CREDITS DIFFERENCES REQUIREMENTS
> > > =20
> > > -pre-everything::
> > > - @${ECHO_MSG} ""
> > > - @${ECHO_MSG} "nsd has the following tunables:"
> > > - @${ECHO_MSG} ""
> > > - @${ECHO_MSG} " WITHOUT_IPV6 Disables IPv6 support"
> > > - @${ECHO_MSG} " WITHOUT_AXFR Disables AXFR"
> > > - @${ECHO_MSG} ""
> > > - @${ECHO_MSG} " WITH_PLUGINS Enable plugin support"
> > > - @${ECHO_MSG} " WITH_BIND8_STATS Enables BIND8 like NSTATS & XSTATS"
> > > - @${ECHO_MSG} " WITH_DNSSEC Enable experimental DNSSEC support"
> > > - @${ECHO_MSG} " according to the latest drafts"
> > > - @${ECHO_MSG} " WITH_ROOT_SERVER Configure NSD as a root server"
> > > - @${ECHO_MSG} " WITH_MMAP Configure NSD to load the database using=
mmap(2)"
> > > - @${ECHO_MSG} ""
> > > -
> > > -pre-build:
> > > +SCRIPTS_ENV=3D WRKDIRPREFIX=3D"${WRKDIRPREFIX}" \
> > > + TOUCH=3D"${TOUCH}" \
> > > + MKDIR=3D"${MKDIR}" \
> > > + NSD_OPTIONS=3D"${NSD_OPTIONS}"
> > > +
> > > +pre-fetch:
> > > + @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.nsd
> > > +
> > > +.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
> > > +.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
> > > +.endif
> > > +
> > > +.if defined(NOPORTDOCS)
> > > +READMEDIR=3Dno
> > > +.else
> > > +READMEDIR=3D${PREFIX}/share/doc/nsd
> > > +.endif
> > > =20
> > > post-install:
> > > ${SED} ${SED_SCRIPT} < ${FILESDIR}/nsd.sh.tmpl >${WRKDIR}/nsd.sh
> > > @@ -96,5 +74,8 @@
> > > ${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
> > > =20
> > > .include <bsd.port.mk>
> > > diff -ruN nsd.orig/distinfo nsd/distinfo
> > > --- nsd.orig/distinfo Tue Jan 18 14:43:31 2005
> > > +++ nsd/distinfo Wed Jan 19 12:54:09 2005
> > > @@ -1,2 +1,2 @@
> > > -MD5 (nsd-2.1.5.tar.gz) =3D 24e81b2bb25f0663e153e174bb585f04
> > > -SIZE (nsd-2.1.5.tar.gz) =3D 225543
> > > +MD5 (nsd-2.2.0.tar.gz) =3D e84b8e9d03062710ea847ea146ccb5d5
> > > +SIZE (nsd-2.2.0.tar.gz) =3D 230431
> > > diff -ruN nsd.orig/pkg-plist nsd/pkg-plist
> > > --- nsd.orig/pkg-plist Tue Jan 18 14:43:31 2005
> > > +++ nsd/pkg-plist Wed Jan 19 12:54:09 2005
> > > @@ -3,7 +3,8 @@
> > > etc/nsd/nsd.zones.sample
> > > etc/nsd/nsdc.conf.sample
> > > sbin/nsd
> > > -sbin/nsd-notify
> > > -sbin/nsdc
> > > sbin/zonec
> > > +sbin/nsdc
> > > +sbin/nsd-notify
> > > +sbin/nsd-xfer
> > > @dirrm etc/nsd
> > > diff -ruN nsd.orig/scripts/configure.nsd nsd/scripts/configure.nsd
> > > --- nsd.orig/scripts/configure.nsd Thu Jan 1 00:00:00 1970
> > > +++ nsd/scripts/configure.nsd Wed Jan 19 12:54:25 2005
> > > @@ -0,0 +1,86 @@
> > > +#!/bin/sh
> > > +# $FreeBSD$
> > > +
> > > +if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
> > > + exit
> > > +fi
> > > +
> > > +tempfile=3D`mktemp -t checklist`
> > > +
> > > +if [ "${NSD_OPTIONS}" ]; then
> > > + set ${NSD_OPTIONS}
> > > +fi
> > > +
> > > +for i; do
> > > + eval status_$i=3DON
> > > +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" \
> > > +DNSSEC "Enable experimental DNSSEC support" "$status_DNSSEC" \
> > > +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 db using mmap(2)" "$status_MMAP" \
> > > +2> $tempfile
> > > +
> > > + retval=3D$?
> > > +
> > > + 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+=3D --enable-root-server"
> > > + ;;
> > > + NOIPv6)
> > > + echo "CONFIGURE_ARGS+=3D --disable-ipv6"
> > > + ;;
> > > + DNSSEC)
> > > + echo "CONFIGURE_ARGS+=3D --enable-dnssec"
> > > + ;;
> > > + NOAXFR)
> > > + echo "CONFIGURE_ARGS+=3D --disable-axfr"
> > > + ;;
> > > + BIND8_STATS)
> > > + echo "CONFIGURE_ARGS+=3D --enable-bind8-stats"
> > > + ;;
> > > + PLUGINS)
> > > + echo "CONFIGURE_ARGS+=3D --enable-plugins"
> > > + ;;
> > > + NOTSIG)
> > > + echo "CONFIGURE_ARGS+=3D --disable-tsig"
> > > + ;;
> > > + MMAP)
> > > + echo "CONFIGURE_ARGS+=3D --enable-mmap"
> > > + ;;
> > > + *)
> > > + echo "Unknown option(s): $*" > /dev/stderr
> > > + rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
> > > + exit 1
> > > + ;;
> > > + esac
> > > + shift
> > > +done
> >=20
> > > diff -ruN nsd.orig/Makefile nsd/Makefile
> > > --- nsd.orig/Makefile Tue Jan 18 14:43:31 2005
> > > +++ nsd/Makefile Wed Jan 19 12:47:02 2005
> > > @@ -6,7 +6,7 @@
> > > #
> > > =20
> > > PORTNAME=3D nsd
> > > -PORTVERSION=3D 2.1.5
> > > +PORTVERSION=3D 2.2.0
> > > CATEGORIES=3D dns ipv6
> > > MASTER_SITES=3D http://www.nlnetlabs.nl/downloads/nsd/ \
> > > ftp://ftp.rhnet.is/pub/nsd/
> > > @@ -14,44 +14,57 @@
> > > MAINTAINER=3D oli@isnic.is
> > > COMMENT=3D An authoritative only non-recursive name server
> > > =20
> > > +OPTIONS=3D ROOT_SERVER "Configure NSD as a root server" Off \
> > > + IPV6 "Enable IPv6 support" On \
> > > + DNSSEC "Enable experimental DNSSEC support" Off \
> > > + AXFR "Enable AXFR" On \
> > > + BIND8_STATS "Enable BIND8 like NSTATS & XSTATS" Off \
> > > + PLUGINS "Enable plugin support" Off \
> > > + TSIG "Enable TSIG support" On \
> > > + MMAP "Configure NSD to load the db using mmap(2)" Off
> > > +
> > > +.include <bsd.port.pre.mk>
> > > +
> > > USE_RC_SUBR=3D yes
> > > =20
> > > NSDUSER?=3D bind
> > > NSDDIR?=3D ${PREFIX}/etc/nsd
> > > NSDDBFILE?=3D /var/db/nsd.database
> > > -NSDXFER?=3D /usr/libexec/named-xfer
> > > =20
> > > GNU_CONFIGURE=3D yes
> > > CONFIGURE_ARGS=3D --with-user=3D${NSDUSER} \
> > > --with-configdir=3D${NSDDIR} \
> > > --with-pidfile=3D/var/run/nsd.pid \
> > > --with-dbfile=3D${NSDDBFILE} \
> > > - --with-namedxfer=3D${NSDXFER} \
> > > --with-libwrap
> > > CONFIGURE_TARGET=3D --build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
> > > =20
> > > +.if defined(WITH_ROOT_SERVER)
> > > +CONFIGURE_ARGS+=3D --enable-root-server
> > > +.endif
> > > +
> > > .if defined(WITHOUT_IPV6)
> > > CONFIGURE_ARGS+=3D --disable-ipv6
> > > .endif
> > > =20
> > > -.if defined(WITHOUT_AXFR)
> > > -CONFIGURE_ARGS+=3D --disable-axfr
> > > +.if defined(WITH_DNSSEC)
> > > +CONFIGURE_ARGS+=3D --enable-dnssec
> > > .endif
> > > =20
> > > -.if defined(WITH_PLUGINS)
> > > -CONFIGURE_ARGS+=3D --enable-plugins
> > > +.if defined(WITHOUT_AXFR)
> > > +CONFIGURE_ARGS+=3D --disable-axfr
> > > .endif
> > > =20
> > > .if defined(WITH_BIND8_STATS)
> > > CONFIGURE_ARGS+=3D --enable-bind8-stats
> > > .endif
> > > =20
> > > -.if defined(WITH_DNSSEC)
> > > -CONFIGURE_ARGS+=3D --enable-dnssec
> > > +.if defined(WITH_PLUGINS)
> > > +CONFIGURE_ARGS+=3D --enable-plugins
> > > .endif
> > > =20
> > > -.if defined(WITH_ROOT_SERVER)
> > > -CONFIGURE_ARGS+=3D --enable-root-server
> > > +.if defined(WITHOUT_TSIG)
> > > +CONFIGURE_ARGS+=3D --disable-tsig
> > > .endif
> > > =20
> > > .if defined(WITH_MMAP)
> > > @@ -63,23 +76,29 @@
> > > -e 's,%%PREFIX%%,${PREFIX},g' \
> > > -e 's,%%RC_SUBR%%,${RC_SUBR},g'
> > > =20
> > > -MAN8=3D nsd.8 zonec.8 nsdc.8 nsd-notify.8
> > > +MAN8=3D nsd.8 zonec.8 nsdc.8 nsd-notify.8 nsd-xfer.8
> > > =20
> > > PORTDOCS=3D README RELNOTES CREDITS DIFFERENCES REQUIREMENTS
> > > =20
> > > +.if defined(NOPORTDOCS)
> > > +READMEDIR=3Dno
> > > +.else
> > > +READMEDIR=3D${PREFIX}/share/doc/nsd
> > > +.endif
> > > +
> > > pre-everything::
> > > @${ECHO_MSG} ""
> > > @${ECHO_MSG} "nsd has the following tunables:"
> > > @${ECHO_MSG} ""
> > > + @${ECHO_MSG} " WITH_ROOT_SERVER Configure NSD as a root server"
> > > @${ECHO_MSG} " WITHOUT_IPV6 Disables IPv6 support"
> > > + @${ECHO_MSG} " WITH_DNSSEC Enable experimental DNSSEC support"
> > > @${ECHO_MSG} " WITHOUT_AXFR Disables AXFR"
> > > - @${ECHO_MSG} ""
> > > @${ECHO_MSG} " WITH_PLUGINS Enable plugin support"
> > > @${ECHO_MSG} " WITH_BIND8_STATS Enables BIND8 like NSTATS & XSTATS"
> > > - @${ECHO_MSG} " WITH_DNSSEC Enable experimental DNSSEC support"
> > > @${ECHO_MSG} " according to the latest drafts"
> > > - @${ECHO_MSG} " WITH_ROOT_SERVER Configure NSD as a root server"
> > > - @${ECHO_MSG} " WITH_MMAP Configure NSD to load the database using=
mmap(2)"
> > > + @${ECHO_MSG} " WITHOUT_TSIG Disable TSIG support"
> > > + @${ECHO_MSG} " WITH_MMAP Configure NSD to load the db using mmap(=
2)"
> > > @${ECHO_MSG} ""
> > > =20
> > > pre-build:
> > > @@ -97,4 +116,4 @@
> > > ${INSTALL_SCRIPT} ${WRKDIR}/nsd.sh ${PREFIX}/etc/rc.d/
> > > @${CAT} ${PKGMESSAGE}
> > > =20
> > > -.include <bsd.port.mk>
> > > +.include <bsd.port.post.mk>
> > > diff -ruN nsd.orig/distinfo nsd/distinfo
> > > --- nsd.orig/distinfo Tue Jan 18 14:43:31 2005
> > > +++ nsd/distinfo Tue Jan 18 14:44:17 2005
> > > @@ -1,2 +1,2 @@
> > > -MD5 (nsd-2.1.5.tar.gz) =3D 24e81b2bb25f0663e153e174bb585f04
> > > -SIZE (nsd-2.1.5.tar.gz) =3D 225543
> > > +MD5 (nsd-2.2.0.tar.gz) =3D e84b8e9d03062710ea847ea146ccb5d5
> > > +SIZE (nsd-2.2.0.tar.gz) =3D 230431
> > > diff -ruN nsd.orig/pkg-plist nsd/pkg-plist
> > > --- nsd.orig/pkg-plist Tue Jan 18 14:43:31 2005
> > > +++ nsd/pkg-plist Tue Jan 18 15:12:46 2005
> > > @@ -3,7 +3,8 @@
> > > etc/nsd/nsd.zones.sample
> > > etc/nsd/nsdc.conf.sample
> > > sbin/nsd
> > > -sbin/nsd-notify
> > > -sbin/nsdc
> > > sbin/zonec
> > > +sbin/nsdc
> > > +sbin/nsd-notify
> > > +sbin/nsd-xfer
> > > @dirrm etc/nsd
> >=20
> >=20
> > --=20
> > Olafur Osvaldsson
> > Systems Administrator
> > Internet a Islandi hf.
> > Tel: +354 525-5291
> > Email: oli@isnic.is
>=20
> --=20
> Olafur Osvaldsson
> Systems Administrator
> Internet a Islandi hf.
> Tel: +354 525-5291
> Email: oli@isnic.is
--=20
Olafur Osvaldsson
Systems Administrator
Internet a Islandi hf.
Tel: +354 525-5291
Email: oli@isnic.is
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050207123657.GB24850>