[Midnightbsd-cvs] src: usr.sbin/named: Update to bind 9.4.2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Apr 27 23:44:20 EDT 2008 

Log Message:
-----------
Update to bind 9.4.2

Modified Files:
--------------
    src/usr.sbin/dnssec-signzone:
        Makefile (r1.1.1.1 -> r1.2)
    src/usr.sbin/named:
        Makefile (r1.2 -> r1.3)
    src/usr.sbin/named-checkconf:
        Makefile (r1.1.1.1 -> r1.2)
    src/usr.sbin/named-checkzone:
        Makefile (r1.1.1.1 -> r1.2)
    src/usr.sbin/named.reload:
        Makefile (r1.1.1.1 -> r1.2)
        named.reload.8 (r1.1.1.1 -> r1.2)
        named.reload.sh (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.sbin/named/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.sbin/named/Makefile -L usr.sbin/named/Makefile -u -r1.2 -r1.3
--- usr.sbin/named/Makefile
+++ usr.sbin/named/Makefile
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.sbin/named/Makefile,v 1.40.2.1 2005/07/30 07:56:27 des Exp $
+# $MidnightBSD$
+# $FreeBSD: src/usr.sbin/named/Makefile,v 1.43 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
@@ -13,7 +14,7 @@
 SRCS+=		os.c
 
 .PATH: ${SRCDIR}
-SRCS+=		aclconf.c builtin.c client.c config.c control.c \
+SRCS+=		builtin.c client.c config.c control.c \
 		controlconf.c interfacemgr.c \
 		listenlist.c log.c logconf.c main.c notify.c \
 		query.c server.c sortlist.c \
@@ -23,12 +24,13 @@
 		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c
 
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR}
+CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 
 # Remove the date stamp to make it more obvious when real changes happen
 CFLAGS+=	-U__DATE__
 
-DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
-LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
 MAN=		named.8 lwresd.8 named.conf.5
 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.sbin/named-checkconf/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.sbin/named-checkconf/Makefile -L usr.sbin/named-checkconf/Makefile -u -r1.1.1.1 -r1.2
--- usr.sbin/named-checkconf/Makefile
+++ usr.sbin/named-checkconf/Makefile
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.sbin/named-checkconf/Makefile,v 1.4.2.1 2005/07/30 07:56:28 des Exp $
+# $MidnightBSD$
+# $FreeBSD: src/usr.sbin/named-checkconf/Makefile,v 1.6 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
@@ -14,8 +15,8 @@
 
 CFLAGS+=	-I${LIB_BIND_DIR}
 
-DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
-LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
 MAN=		named-checkconf.8
 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.sbin/named-checkzone/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.sbin/named-checkzone/Makefile -L usr.sbin/named-checkzone/Makefile -u -r1.1.1.1 -r1.2
--- usr.sbin/named-checkzone/Makefile
+++ usr.sbin/named-checkzone/Makefile
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.sbin/named-checkzone/Makefile,v 1.3.4.1 2005/07/30 07:56:28 des Exp $
+# $MidnightBSD$
+# $FreeBSD: src/usr.sbin/named-checkzone/Makefile,v 1.5 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
@@ -14,9 +15,13 @@
 
 CFLAGS+=	-I${LIB_BIND_DIR}
 
-DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
-LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
+
+LINKS=		${BINDIR}/named-checkzone ${BINDIR}/named-compilezone
 
 MAN=		named-checkzone.8
 
+MLINKS=		named-checkzone.8 named-compilezone.8
+
 .include <bsd.prog.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.sbin/dnssec-signzone/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.sbin/dnssec-signzone/Makefile -L usr.sbin/dnssec-signzone/Makefile -u -r1.1.1.1 -r1.2
--- usr.sbin/dnssec-signzone/Makefile
+++ usr.sbin/dnssec-signzone/Makefile
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.sbin/dnssec-signzone/Makefile,v 1.2.4.1 2005/07/30 07:56:27 des Exp $
+# $MidnightBSD$
+# $FreeBSD: src/usr.sbin/dnssec-signzone/Makefile,v 1.4 2007/06/02 23:19:58 dougb Exp $
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
@@ -14,8 +15,8 @@
 
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 
-DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD}
-LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD}
+DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
+LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
 MAN=		dnssec-signzone.8
 
Index: named.reload.sh
===================================================================
RCS file: /home/cvs/src/usr.sbin/named.reload/named.reload.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.sbin/named.reload/named.reload.sh -L usr.sbin/named.reload/named.reload.sh -u -r1.1.1.1 -r1.2
--- usr.sbin/named.reload/named.reload.sh
+++ usr.sbin/named.reload/named.reload.sh
@@ -24,6 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+# $MidnightBSD$
 # $FreeBSD: src/usr.sbin/named.reload/named.reload.sh,v 1.3 2004/09/21 19:01:47 des Exp $
 #
 
Index: named.reload.8
===================================================================
RCS file: /home/cvs/src/usr.sbin/named.reload/named.reload.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.sbin/named.reload/named.reload.8 -L usr.sbin/named.reload/named.reload.8 -u -r1.1.1.1 -r1.2
--- usr.sbin/named.reload/named.reload.8
+++ usr.sbin/named.reload/named.reload.8
@@ -23,6 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" $MidnightBSD$
 .\" $FreeBSD: src/usr.sbin/named.reload/named.reload.8,v 1.8 2004/09/21 19:01:47 des Exp $
 .\"
 .Dd September 21, 2004
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.sbin/named.reload/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.sbin/named.reload/Makefile -L usr.sbin/named.reload/Makefile -u -r1.1.1.1 -r1.2
--- usr.sbin/named.reload/Makefile
+++ usr.sbin/named.reload/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/usr.sbin/named.reload/Makefile,v 1.9 2004/09/21 19:01:47 des Exp $
 
 SCRIPTS=	named.reload.sh

More information about the Midnightbsd-cvs mailing list