diff options
author | dougb <dougb@FreeBSD.org> | 2011-07-16 11:20:54 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2011-07-16 11:20:54 +0000 |
commit | 264979c9d1dc6f5cacff8dc9ec89d787dfa80612 (patch) | |
tree | 3215a62144f0dff34bb0f666e3526778f7f62937 /usr.sbin | |
parent | f4894c219c9f0fee1e1d5d793748161bba7d4111 (diff) | |
download | FreeBSD-src-264979c9d1dc6f5cacff8dc9ec89d787dfa80612.zip FreeBSD-src-264979c9d1dc6f5cacff8dc9ec89d787dfa80612.tar.gz |
bmake and other updates necessary for the BIND 9.8.x upgrade.
This includes a structural change regarding atomic ops. Previously they
were enabled on all platforms unless we had knowledge that they did not
work. However both work performed by marius@ on sparc64 and the fact that
the 9.8.x branch is fussier in this area has demonstrated that this is
not a safe approach. So I've modified a patch provided by marius to
enable them for i386, amd64, and ia64 only.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 8 | ||||
-rw-r--r-- | usr.sbin/arpaname/Makefile | 24 | ||||
-rw-r--r-- | usr.sbin/ddns-confgen/Makefile | 31 | ||||
-rw-r--r-- | usr.sbin/dnssec-revoke/Makefile | 24 | ||||
-rw-r--r-- | usr.sbin/dnssec-settime/Makefile | 24 | ||||
-rw-r--r-- | usr.sbin/dnssec-signzone/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/genrandom/Makefile | 24 | ||||
-rw-r--r-- | usr.sbin/isc-hmac-fixup/Makefile | 24 | ||||
-rw-r--r-- | usr.sbin/named-checkconf/Makefile | 1 | ||||
-rw-r--r-- | usr.sbin/named-journalprint/Makefile | 24 | ||||
-rw-r--r-- | usr.sbin/named/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/nsec3hash/Makefile | 24 | ||||
-rw-r--r-- | usr.sbin/rndc-confgen/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/rndc/Makefile | 6 |
14 files changed, 215 insertions, 10 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index f448f03..ec69f60 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -120,13 +120,21 @@ SUBDIR+= authpf SUBDIR+= dnssec-dsfromkey SUBDIR+= dnssec-keyfromlabel SUBDIR+= dnssec-keygen +SUBDIR+= dnssec-revoke +SUBDIR+= dnssec-settime SUBDIR+= dnssec-signzone .endif .if ${MK_BIND_NAMED} != "no" +SUBDIR+= arpaname +SUBDIR+= ddns-confgen +SUBDIR+= genrandom +SUBDIR+= isc-hmac-fixup SUBDIR+= named SUBDIR+= named-checkconf SUBDIR+= named-checkzone +SUBDIR+= named-journalprint SUBDIR+= named.reload +SUBDIR+= nsec3hash SUBDIR+= rndc SUBDIR+= rndc-confgen .endif diff --git a/usr.sbin/arpaname/Makefile b/usr.sbin/arpaname/Makefile new file mode 100644 index 0000000..145d18a --- /dev/null +++ b/usr.sbin/arpaname/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/tools + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= arpaname + +.PATH: ${SRCDIR} +SRCS+= arpaname.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +WARNS?= 3 + +MAN= arpaname.1 + +.include <bsd.prog.mk> diff --git a/usr.sbin/ddns-confgen/Makefile b/usr.sbin/ddns-confgen/Makefile new file mode 100644 index 0000000..a33bea3 --- /dev/null +++ b/usr.sbin/ddns-confgen/Makefile @@ -0,0 +1,31 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/confgen + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= ddns-confgen + +.PATH: ${SRCDIR}/unix +SRCS+= os.c + +.PATH: ${SRCDIR} +SRCS+= ddns-confgen.c keygen.c util.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} + +WARNS?= 3 + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +MAN= ddns-confgen.8 + +MANFILTER= sed -e 's@fI/etc\\fR.*@fI/etc/namedb\\fR@' \ + -e '/^sysconfdir$$/d' \ + -e '/was specified as when BIND was built)/d' + +.include <bsd.prog.mk> diff --git a/usr.sbin/dnssec-revoke/Makefile b/usr.sbin/dnssec-revoke/Makefile new file mode 100644 index 0000000..7889d96 --- /dev/null +++ b/usr.sbin/dnssec-revoke/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/dnssec + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= dnssec-revoke + +.PATH: ${SRCDIR} +SRCS+= dnssec-revoke.c dnssectool.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +WARNS?= 3 + +MAN= dnssec-revoke.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/dnssec-settime/Makefile b/usr.sbin/dnssec-settime/Makefile new file mode 100644 index 0000000..4ab7fb5 --- /dev/null +++ b/usr.sbin/dnssec-settime/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/dnssec + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= dnssec-settime + +.PATH: ${SRCDIR} +SRCS+= dnssec-settime.c dnssectool.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +WARNS?= 3 + +MAN= dnssec-settime.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile index 70ddc3e..7f56b8d 100644 --- a/usr.sbin/dnssec-signzone/Makefile +++ b/usr.sbin/dnssec-signzone/Makefile @@ -17,7 +17,7 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} -WARNS?= 3 +WARNS?= 2 MAN= dnssec-signzone.8 diff --git a/usr.sbin/genrandom/Makefile b/usr.sbin/genrandom/Makefile new file mode 100644 index 0000000..975d84b --- /dev/null +++ b/usr.sbin/genrandom/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/tools + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= genrandom + +.PATH: ${SRCDIR} +SRCS+= genrandom.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +WARNS?= 3 + +MAN= genrandom.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/isc-hmac-fixup/Makefile b/usr.sbin/isc-hmac-fixup/Makefile new file mode 100644 index 0000000..1313855 --- /dev/null +++ b/usr.sbin/isc-hmac-fixup/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/tools + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= isc-hmac-fixup + +.PATH: ${SRCDIR} +SRCS+= isc-hmac-fixup.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +WARNS?= 3 + +MAN= isc-hmac-fixup.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/named-checkconf/Makefile b/usr.sbin/named-checkconf/Makefile index 618cc13..abee068 100644 --- a/usr.sbin/named-checkconf/Makefile +++ b/usr.sbin/named-checkconf/Makefile @@ -13,6 +13,7 @@ PROG= named-checkconf SRCS+= named-checkconf.c check-tool.c CFLAGS+= -I${LIB_BIND_DIR} +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include WARNS?= 3 diff --git a/usr.sbin/named-journalprint/Makefile b/usr.sbin/named-journalprint/Makefile new file mode 100644 index 0000000..cdf4016 --- /dev/null +++ b/usr.sbin/named-journalprint/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/tools + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= named-journalprint + +.PATH: ${SRCDIR} +SRCS+= named-journalprint.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +WARNS?= 3 + +MAN= named-journalprint.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index adeb3da..561060b 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -36,12 +36,11 @@ SRCS+= os.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 \ + query.c server.c sortlist.c statschannel.c \ tkeyconf.c tsigconf.c update.c xfrout.c \ zoneconf.c \ lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ - lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \ - statschannel.c + lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c CFLAGS+= -DCONFIGARGS="\"${CONFIGARGS}\"" diff --git a/usr.sbin/nsec3hash/Makefile b/usr.sbin/nsec3hash/Makefile new file mode 100644 index 0000000..6dbea09 --- /dev/null +++ b/usr.sbin/nsec3hash/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_REL= ../../lib/bind +LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} +SRCDIR= ${BIND_DIR}/bin/tools + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= nsec3hash + +.PATH: ${SRCDIR} +SRCS+= nsec3hash.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include + +DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} +LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} + +WARNS?= 2 + +MAN= nsec3hash.8 + +.include <bsd.prog.mk> diff --git a/usr.sbin/rndc-confgen/Makefile b/usr.sbin/rndc-confgen/Makefile index 08f2d7e..2474920 100644 --- a/usr.sbin/rndc-confgen/Makefile +++ b/usr.sbin/rndc-confgen/Makefile @@ -3,7 +3,7 @@ BIND_DIR= ${.CURDIR}/../../contrib/bind9 LIB_BIND_REL= ../../lib/bind LIB_BIND_DIR= ${.CURDIR}/${LIB_BIND_REL} -SRCDIR= ${BIND_DIR}/bin/rndc +SRCDIR= ${BIND_DIR}/bin/confgen .include "${LIB_BIND_DIR}/config.mk" @@ -13,7 +13,7 @@ PROG= rndc-confgen SRCS+= os.c .PATH: ${SRCDIR} -SRCS+= rndc-confgen.c util.c +SRCS+= rndc-confgen.c keygen.c util.c CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} diff --git a/usr.sbin/rndc/Makefile b/usr.sbin/rndc/Makefile index 9cd356f..66d8452 100644 --- a/usr.sbin/rndc/Makefile +++ b/usr.sbin/rndc/Makefile @@ -9,13 +9,11 @@ SRCDIR= ${BIND_DIR}/bin/rndc PROG= rndc -.PATH: ${SRCDIR}/unix -SRCS+= os.c - .PATH: ${SRCDIR} SRCS+= rndc.c util.c -CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} +CFLAGS+= -I${SRCDIR}/include -I${LIB_BIND_DIR} +CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include WARNS?= 3 |