Upgrade to 8.3.3, the latest from ISC. This release fixes the

libbind bug, and adds logging for people who attempt to exploit
it to named. Also improves logging for named-xfer, and adds
features to ndc to attempt to preserve command line arguments
that named was started with.

All users of BIND 8 are HIGHLY encouraged to upgrade to this version.

6 files changed, 22 insertions, 22 deletions

diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile
index 9d0ecb193109..3221c410c700 100644
--- a/dns/bind8/Makefile
+++ b/dns/bind8/Makefile
@@ -11,7 +11,7 @@
 # you can generally build it cleanly from the source. - Doug
 
 PORTNAME=	bind
-PORTVERSION=	8.3.2
+PORTVERSION=	8.3.3
 CATEGORIES?=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${PORTVERSION}/ \
 		ftp://ftp.epix.net/pub/isc/bind/src/${PORTVERSION}/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	bind-${PORTVERSION}
 
 MAINTAINER=	DougB@FreeBSD.org
 
-.if defined(REPLACE_SYSTEM_BIND)
+.if defined(PORT_REPLACES_BASE_BIND8)
 PREFIX=		/usr
 .endif
 
@@ -42,7 +42,7 @@ PATCH_ARGS=	-s -d ${WRKDIR}
 PATCH_DIST_ARGS=	-s -d ${WRKDIR}
 
 post-patch:
-.if defined(REPLACE_SYSTEM_BIND)
+.if defined(PORT_REPLACES_BASE_BIND8)
 	@${SED} -e "s#\'DESTETC=.*#'DESTETC=/etc/namedb'#" \
 		${WRKSRC}/port/freebsd/Makefile.set > \
 		${WRKSRC}/port/freebsd/Makefile.set.sed
diff --git a/dns/bind8/distinfo b/dns/bind8/distinfo
index 94983afc328b..a588e5bdbde1 100644
--- a/dns/bind8/distinfo
+++ b/dns/bind8/distinfo
@@ -1,2 +1,2 @@
-MD5 (bind-8.3.2/bind-src.tar.gz) = 054ae0236322f1783d80350e7e63a4e8
-MD5 (bind-8.3.2/bind-doc.tar.gz) = eee00785019f507b5d15a3a4287ef53b
+MD5 (bind-8.3.3/bind-src.tar.gz) = 4e904fdc3d908294147054276eba4064
+MD5 (bind-8.3.3/bind-doc.tar.gz) = b5b09e7c00709ee4cd550aff3a21e958
diff --git a/dns/bind8/files/patch-aa b/dns/bind8/files/patch-aa
index 431a7b682a27..1ca8d1e4343f 100644
--- a/dns/bind8/files/patch-aa
+++ b/dns/bind8/files/patch-aa
@@ -1,15 +1,15 @@
---- src/port/freebsd/Makefile.set.orig	Mon Feb 25 18:56:32 2002
-+++ src/port/freebsd/Makefile.set	Sat Jun 22 13:29:41 2002
+--- src/port/freebsd/Makefile.set.orig	Sun Jun 23 17:32:49 2002
++++ src/port/freebsd/Makefile.set	Fri Jun 28 16:55:49 2002
 @@ -1,12 +1,14 @@
  'CC=cc'
--'CDEBUG=-O2 -g -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -DMEMCLUSTER_RECORD=1'
+-'CDEBUG=-O2 -g -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat'
 -'DESTBIN=/usr/bin'
 -'DESTSBIN=/usr/sbin'
 -'DESTEXEC=/usr/libexec'
 -'DESTMAN=/usr/share/man'
 -'DESTHELP=/usr/share/misc'
 -'DESTETC=/etc'
-+'CDEBUG=${CFLAGS} -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -DMEMCLUSTER_RECORD=1'
++'CDEBUG=${CFLAGS} -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat'
 +'DESTBIN=${PREFIX}/bin'
 +'DESTSBIN=${PREFIX}/sbin'
 +'DESTEXEC=${PREFIX}/libexec'
@@ -21,8 +21,8 @@
 +'DESTLIB=${PREFIX}/lib'
  'LEX=lex -I'
  'YACC=yacc -d'
- 'SYSLIBS=-ll -lutil'
-@@ -16,3 +18,4 @@
+ 'SYSLIBS=-lutil'
+@@ -17,3 +19,4 @@
  'CATEXT=0'
  'PS=ps'
  'RANLIB=ranlib'
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 9d0ecb193109..3221c410c700 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -11,7 +11,7 @@
 # you can generally build it cleanly from the source. - Doug
 
 PORTNAME=	bind
-PORTVERSION=	8.3.2
+PORTVERSION=	8.3.3
 CATEGORIES?=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${PORTVERSION}/ \
 		ftp://ftp.epix.net/pub/isc/bind/src/${PORTVERSION}/ \
@@ -23,7 +23,7 @@ DIST_SUBDIR=	bind-${PORTVERSION}
 
 MAINTAINER=	DougB@FreeBSD.org
 
-.if defined(REPLACE_SYSTEM_BIND)
+.if defined(PORT_REPLACES_BASE_BIND8)
 PREFIX=		/usr
 .endif
 
@@ -42,7 +42,7 @@ PATCH_ARGS=	-s -d ${WRKDIR}
 PATCH_DIST_ARGS=	-s -d ${WRKDIR}
 
 post-patch:
-.if defined(REPLACE_SYSTEM_BIND)
+.if defined(PORT_REPLACES_BASE_BIND8)
 	@${SED} -e "s#\'DESTETC=.*#'DESTETC=/etc/namedb'#" \
 		${WRKSRC}/port/freebsd/Makefile.set > \
 		${WRKSRC}/port/freebsd/Makefile.set.sed
diff --git a/net/bind8/distinfo b/net/bind8/distinfo
index 94983afc328b..a588e5bdbde1 100644
--- a/net/bind8/distinfo
+++ b/net/bind8/distinfo
@@ -1,2 +1,2 @@
-MD5 (bind-8.3.2/bind-src.tar.gz) = 054ae0236322f1783d80350e7e63a4e8
-MD5 (bind-8.3.2/bind-doc.tar.gz) = eee00785019f507b5d15a3a4287ef53b
+MD5 (bind-8.3.3/bind-src.tar.gz) = 4e904fdc3d908294147054276eba4064
+MD5 (bind-8.3.3/bind-doc.tar.gz) = b5b09e7c00709ee4cd550aff3a21e958
diff --git a/net/bind8/files/patch-aa b/net/bind8/files/patch-aa
index 431a7b682a27..1ca8d1e4343f 100644
--- a/net/bind8/files/patch-aa
+++ b/net/bind8/files/patch-aa
@@ -1,15 +1,15 @@
---- src/port/freebsd/Makefile.set.orig	Mon Feb 25 18:56:32 2002
-+++ src/port/freebsd/Makefile.set	Sat Jun 22 13:29:41 2002
+--- src/port/freebsd/Makefile.set.orig	Sun Jun 23 17:32:49 2002
++++ src/port/freebsd/Makefile.set	Fri Jun 28 16:55:49 2002
 @@ -1,12 +1,14 @@
  'CC=cc'
--'CDEBUG=-O2 -g -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -DMEMCLUSTER_RECORD=1'
+-'CDEBUG=-O2 -g -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat'
 -'DESTBIN=/usr/bin'
 -'DESTSBIN=/usr/sbin'
 -'DESTEXEC=/usr/libexec'
 -'DESTMAN=/usr/share/man'
 -'DESTHELP=/usr/share/misc'
 -'DESTETC=/etc'
-+'CDEBUG=${CFLAGS} -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat -DMEMCLUSTER_RECORD=1'
++'CDEBUG=${CFLAGS} -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat'
 +'DESTBIN=${PREFIX}/bin'
 +'DESTSBIN=${PREFIX}/sbin'
 +'DESTEXEC=${PREFIX}/libexec'
@@ -21,8 +21,8 @@
 +'DESTLIB=${PREFIX}/lib'
  'LEX=lex -I'
  'YACC=yacc -d'
- 'SYSLIBS=-ll -lutil'
-@@ -16,3 +18,4 @@
+ 'SYSLIBS=-lutil'
+@@ -17,3 +19,4 @@
  'CATEXT=0'
  'PS=ps'
  'RANLIB=ranlib'