diff options
author | taca <taca@pkgsrc.org> | 2019-04-30 03:55:09 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2019-04-30 03:55:09 +0000 |
commit | a39c1d54bdfbd501246feacaa98eb1a4130c558a (patch) | |
tree | 14c549ffb0ec8b293ccc89ab79a4146e57496ceb | |
parent | f561981f0e3448cc448e47c4644fa3d9a32fa2a6 (diff) | |
download | pkgsrc-a39c1d54bdfbd501246feacaa98eb1a4130c558a.tar.gz |
net/bind910: remove bind910
Remove bind910 EOL since July 2018.
25 files changed, 0 insertions, 1971 deletions
diff --git a/net/bind910/DESCR b/net/bind910/DESCR deleted file mode 100644 index 5cc99b19b7a..00000000000 --- a/net/bind910/DESCR +++ /dev/null @@ -1,15 +0,0 @@ -BIND, the Berkeley Internet Name Daemon, version 9 is a major rewrite -of nearly all aspects of the underlying BIND architecture. Some -of the important features of BIND-9 are: - - - DNS Security - - IP version 6 - - DNS Protocol Enhancements - - Views - - Multiprocessor Support - - Improved Portability Architecture - - Full NSEC3 support - - Automatic zone re-signing - - New update-policy methods tcp-self and 6to4-self - -This package contains the BIND 9.10 release. diff --git a/net/bind910/MESSAGE b/net/bind910/MESSAGE deleted file mode 100644 index c4f9973e690..00000000000 --- a/net/bind910/MESSAGE +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2014/07/02 02:42:57 jnemeth Exp $ - -Please consider running BIND under the pseudo user account "${BIND_USER}" -in a chroot environment for security reasons. - -To achieve this, set the variable "named_chrootdir" in /etc/rc.conf to -the directory with the chroot environment e.g. "${BIND_DIR}". - -=========================================================================== diff --git a/net/bind910/Makefile b/net/bind910/Makefile deleted file mode 100644 index 10fbfb1f0b9..00000000000 --- a/net/bind910/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# $NetBSD: Makefile,v 1.47 2018/09/23 14:27:07 taca Exp $ - -DISTNAME= bind-${BIND_VERSION} -PKGNAME= ${DISTNAME:S/-P/pl/} -PKGREVISION= 3 -CATEGORIES= net -MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.isc.org/software/bind/ -COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.10 -LICENSE= mpl-2.0 - -CONFLICTS+= host-[0-9]* - -MAKE_JOBS_SAFE= no - -BIND_VERSION= 9.10.8-P1 - -.include "../../mk/bsd.prefs.mk" - -BUILD_DEFS+= BIND_DIR VARBASE - -.include "options.mk" - -USE_TOOLS+= pax perl pkg-config -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -#CONFIG_SHELL= sh -x - -CONFIGURE_ARGS+= --with-libtool -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --disable-openssl-version-check -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-python=no -.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-vax) -CONFIGURE_ARGS+= --disable-atomic -.endif -.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" -CONFIGURE_ARGS+= --disable-threads -.endif -CONFIGURE_ARGS.DragonFly+= --disable-kqueue - -PKG_GROUPS_VARS+= BIND_GROUP -PKG_USERS_VARS= BIND_USER - -PKG_GROUPS= ${BIND_GROUP} -PKG_USERS= ${BIND_USER}:${BIND_GROUP} - -PKG_GECOS.${BIND_USER}= Named pseudo-user -PKG_HOME.${BIND_USER}= ${BIND_DIR} - -DOCS= CHANGES FAQ.xml README - -FILES_SUBST+= BIND_GROUP=${BIND_GROUP} \ - BIND_USER=${BIND_USER} PAX=${PAX:Q} \ - SSLBASE=${SSLBASE} -MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} - -DOCDIR= share/doc/bind9 - -RCD_SCRIPTS= lwresd named9 -SMF_METHODS= named - -INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bind9 -CONF_FILES+= share/examples/bind9/bind.keys \ - ${PKG_SYSCONFDIR}/bind.keys - -INSTALLATION_DIRS+= ${DOCDIR} ${DOCDIR}/arm - -post-install: -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR} -.endfor - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm - -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/bind910/PLIST b/net/bind910/PLIST deleted file mode 100644 index 627534ab82a..00000000000 --- a/net/bind910/PLIST +++ /dev/null @@ -1,460 +0,0 @@ -@comment $NetBSD: PLIST,v 1.12 2018/03/24 15:02:32 taca Exp $ -bin/arpaname -bin/bind9-config -bin/delv -bin/dig -bin/host -bin/isc-config.sh -bin/named-rrchecker -bin/nslookup -bin/nsupdate -include/bind9/check.h -include/bind9/getaddresses.h -include/bind9/version.h -include/dns/acache.h -include/dns/acl.h -include/dns/adb.h -include/dns/bit.h -include/dns/byaddr.h -include/dns/cache.h -include/dns/callbacks.h -include/dns/cert.h -include/dns/client.h -include/dns/clientinfo.h -include/dns/compress.h -include/dns/db.h -include/dns/dbiterator.h -include/dns/dbtable.h -include/dns/diff.h -include/dns/dispatch.h -include/dns/dlz.h -include/dns/dlz_dlopen.h -include/dns/dns64.h -include/dns/dnssec.h -include/dns/ds.h -include/dns/dsdigest.h -include/dns/ecdb.h -include/dns/enumclass.h -include/dns/enumtype.h -include/dns/events.h -include/dns/fixedname.h -include/dns/forward.h -include/dns/geoip.h -include/dns/iptable.h -include/dns/journal.h -include/dns/keydata.h -include/dns/keyflags.h -include/dns/keytable.h -include/dns/keyvalues.h -include/dns/lib.h -include/dns/log.h -include/dns/lookup.h -include/dns/master.h -include/dns/masterdump.h -include/dns/message.h -include/dns/name.h -include/dns/ncache.h -include/dns/nsec.h -include/dns/nsec3.h -include/dns/opcode.h -include/dns/order.h -include/dns/peer.h -include/dns/portlist.h -include/dns/private.h -include/dns/rbt.h -include/dns/rcode.h -include/dns/rdata.h -include/dns/rdataclass.h -include/dns/rdatalist.h -include/dns/rdataset.h -include/dns/rdatasetiter.h -include/dns/rdataslab.h -include/dns/rdatastruct.h -include/dns/rdatatype.h -include/dns/request.h -include/dns/resolver.h -include/dns/result.h -include/dns/rootns.h -include/dns/rpz.h -include/dns/rriterator.h -include/dns/rrl.h -include/dns/sdb.h -include/dns/sdlz.h -include/dns/secalg.h -include/dns/secproto.h -include/dns/soa.h -include/dns/ssu.h -include/dns/stats.h -include/dns/tcpmsg.h -include/dns/time.h -include/dns/timer.h -include/dns/tkey.h -include/dns/tsec.h -include/dns/tsig.h -include/dns/ttl.h -include/dns/types.h -include/dns/update.h -include/dns/validator.h -include/dns/version.h -include/dns/view.h -include/dns/xfrin.h -include/dns/zone.h -include/dns/zonekey.h -include/dns/zt.h -include/dst/dst.h -include/dst/gssapi.h -include/dst/lib.h -include/dst/result.h -include/irs/context.h -include/irs/dnsconf.h -include/irs/netdb.h -include/irs/platform.h -include/irs/resconf.h -include/irs/types.h -include/irs/version.h -include/isc/aes.h -include/isc/app.h -include/isc/assertions.h -include/isc/atomic.h -include/isc/backtrace.h -include/isc/base32.h -include/isc/base64.h -include/isc/bind9.h -include/isc/boolean.h -include/isc/buffer.h -include/isc/bufferlist.h -include/isc/commandline.h -include/isc/condition.h -include/isc/counter.h -include/isc/crc64.h -include/isc/dir.h -include/isc/entropy.h -include/isc/errno.h -include/isc/error.h -include/isc/event.h -include/isc/eventclass.h -include/isc/file.h -include/isc/formatcheck.h -include/isc/fsaccess.h -include/isc/hash.h -include/isc/heap.h -include/isc/hex.h -include/isc/hmacmd5.h -include/isc/hmacsha.h -include/isc/httpd.h -include/isc/int.h -include/isc/interfaceiter.h -${PLIST.inet6}include/isc/ipv6.h -include/isc/iterated_hash.h -include/isc/json.h -include/isc/keyboard.h -include/isc/lang.h -include/isc/lex.h -include/isc/lfsr.h -include/isc/lib.h -include/isc/likely.h -include/isc/list.h -include/isc/log.h -include/isc/magic.h -include/isc/md5.h -include/isc/mem.h -include/isc/msgcat.h -include/isc/msgs.h -include/isc/mutex.h -include/isc/mutexblock.h -include/isc/net.h -include/isc/netaddr.h -include/isc/netdb.h -include/isc/netscope.h -include/isc/offset.h -include/isc/once.h -include/isc/ondestroy.h -include/isc/os.h -include/isc/parseint.h -include/isc/platform.h -include/isc/pool.h -include/isc/portset.h -include/isc/print.h -include/isc/queue.h -include/isc/quota.h -include/isc/radix.h -include/isc/random.h -include/isc/ratelimiter.h -include/isc/refcount.h -include/isc/regex.h -include/isc/region.h -include/isc/resource.h -include/isc/result.h -include/isc/resultclass.h -include/isc/rwlock.h -include/isc/safe.h -include/isc/serial.h -include/isc/sha1.h -include/isc/sha2.h -include/isc/sockaddr.h -include/isc/socket.h -include/isc/stat.h -include/isc/stats.h -include/isc/stdio.h -include/isc/stdlib.h -include/isc/stdtime.h -include/isc/strerror.h -include/isc/string.h -include/isc/symtab.h -include/isc/syslog.h -include/isc/task.h -include/isc/taskpool.h -include/isc/thread.h -include/isc/time.h -include/isc/timer.h -include/isc/tm.h -include/isc/types.h -include/isc/util.h -include/isc/version.h -include/isc/xml.h -include/isccc/alist.h -include/isccc/base64.h -include/isccc/cc.h -include/isccc/ccmsg.h -include/isccc/events.h -include/isccc/lib.h -include/isccc/result.h -include/isccc/sexpr.h -include/isccc/symtab.h -include/isccc/symtype.h -include/isccc/types.h -include/isccc/util.h -include/isccc/version.h -include/isccfg/aclconf.h -include/isccfg/cfg.h -include/isccfg/dnsconf.h -include/isccfg/grammar.h -include/isccfg/log.h -include/isccfg/namedconf.h -include/isccfg/version.h -include/lwres/context.h -include/lwres/int.h -include/lwres/ipv6.h -include/lwres/lang.h -include/lwres/list.h -include/lwres/lwbuffer.h -include/lwres/lwpacket.h -include/lwres/lwres.h -include/lwres/net.h -include/lwres/netdb.h -include/lwres/platform.h -include/lwres/result.h -include/lwres/stdlib.h -include/lwres/string.h -include/lwres/version.h -include/pk11/constants.h -include/pk11/internal.h -include/pk11/pk11.h -include/pk11/result.h -include/pk11/site.h -include/pkcs11/cryptoki.h -include/pkcs11/eddsa.h -include/pkcs11/pkcs11.h -include/pkcs11/pkcs11f.h -include/pkcs11/pkcs11t.h -lib/libbind9.la -lib/libdns.la -lib/libirs.la -lib/libisc.la -lib/libisccc.la -lib/libisccfg.la -lib/liblwres.la -man/man1/arpaname.1 -man/man1/bind9-config.1 -man/man1/delv.1 -man/man1/dig.1 -man/man1/host.1 -man/man1/isc-config.sh.1 -man/man1/named-rrchecker.1 -man/man1/nslookup.1 -man/man1/nsupdate.1 -man/man3/lwres.3 -man/man3/lwres_addr_parse.3 -man/man3/lwres_buffer.3 -man/man3/lwres_buffer_add.3 -man/man3/lwres_buffer_back.3 -man/man3/lwres_buffer_clear.3 -man/man3/lwres_buffer_first.3 -man/man3/lwres_buffer_forward.3 -man/man3/lwres_buffer_getmem.3 -man/man3/lwres_buffer_getuint16.3 -man/man3/lwres_buffer_getuint32.3 -man/man3/lwres_buffer_getuint8.3 -man/man3/lwres_buffer_init.3 -man/man3/lwres_buffer_invalidate.3 -man/man3/lwres_buffer_putmem.3 -man/man3/lwres_buffer_putuint16.3 -man/man3/lwres_buffer_putuint32.3 -man/man3/lwres_buffer_putuint8.3 -man/man3/lwres_buffer_subtract.3 -man/man3/lwres_conf_clear.3 -man/man3/lwres_conf_get.3 -man/man3/lwres_conf_init.3 -man/man3/lwres_conf_parse.3 -man/man3/lwres_conf_print.3 -man/man3/lwres_config.3 -man/man3/lwres_context.3 -man/man3/lwres_context_allocmem.3 -man/man3/lwres_context_create.3 -man/man3/lwres_context_destroy.3 -man/man3/lwres_context_freemem.3 -man/man3/lwres_context_initserial.3 -man/man3/lwres_context_nextserial.3 -man/man3/lwres_context_sendrecv.3 -man/man3/lwres_endhostent.3 -man/man3/lwres_endhostent_r.3 -man/man3/lwres_freeaddrinfo.3 -man/man3/lwres_freehostent.3 -man/man3/lwres_gabn.3 -man/man3/lwres_gabnrequest_free.3 -man/man3/lwres_gabnrequest_parse.3 -man/man3/lwres_gabnrequest_render.3 -man/man3/lwres_gabnresponse_free.3 -man/man3/lwres_gabnresponse_parse.3 -man/man3/lwres_gabnresponse_render.3 -man/man3/lwres_gai_strerror.3 -man/man3/lwres_getaddrinfo.3 -man/man3/lwres_getaddrsbyname.3 -man/man3/lwres_gethostbyaddr.3 -man/man3/lwres_gethostbyaddr_r.3 -man/man3/lwres_gethostbyname.3 -man/man3/lwres_gethostbyname2.3 -man/man3/lwres_gethostbyname_r.3 -man/man3/lwres_gethostent.3 -man/man3/lwres_gethostent_r.3 -man/man3/lwres_getipnode.3 -man/man3/lwres_getipnodebyaddr.3 -man/man3/lwres_getipnodebyname.3 -man/man3/lwres_getnamebyaddr.3 -man/man3/lwres_getnameinfo.3 -man/man3/lwres_getrrsetbyname.3 -man/man3/lwres_gnba.3 -man/man3/lwres_gnbarequest_free.3 -man/man3/lwres_gnbarequest_parse.3 -man/man3/lwres_gnbarequest_render.3 -man/man3/lwres_gnbaresponse_free.3 -man/man3/lwres_gnbaresponse_parse.3 -man/man3/lwres_gnbaresponse_render.3 -man/man3/lwres_herror.3 -man/man3/lwres_hstrerror.3 -man/man3/lwres_inetntop.3 -man/man3/lwres_lwpacket_parseheader.3 -man/man3/lwres_lwpacket_renderheader.3 -man/man3/lwres_net_ntop.3 -man/man3/lwres_noop.3 -man/man3/lwres_nooprequest_free.3 -man/man3/lwres_nooprequest_parse.3 -man/man3/lwres_nooprequest_render.3 -man/man3/lwres_noopresponse_free.3 -man/man3/lwres_noopresponse_parse.3 -man/man3/lwres_noopresponse_render.3 -man/man3/lwres_packet.3 -man/man3/lwres_resutil.3 -man/man3/lwres_sethostent.3 -man/man3/lwres_sethostent_r.3 -man/man3/lwres_string_parse.3 -man/man5/named.conf.5 -man/man5/rndc.conf.5 -man/man8/ddns-confgen.8 -man/man8/dnssec-dsfromkey.8 -man/man8/dnssec-importkey.8 -man/man8/dnssec-keyfromlabel.8 -man/man8/dnssec-keygen.8 -man/man8/dnssec-revoke.8 -man/man8/dnssec-settime.8 -man/man8/dnssec-signzone.8 -man/man8/dnssec-verify.8 -man/man8/genrandom.8 -man/man8/isc-hmac-fixup.8 -man/man8/lwresd.8 -man/man8/named-checkconf.8 -man/man8/named-checkzone.8 -man/man8/named-compilezone.8 -man/man8/named-journalprint.8 -man/man8/named.8 -man/man8/nsec3hash.8 -${PLIST.pkcs11}man/man8/pkcs11-destroy.8 -${PLIST.pkcs11}man/man8/pkcs11-keygen.8 -${PLIST.pkcs11}man/man8/pkcs11-list.8 -${PLIST.pkcs11}man/man8/pkcs11-tokens.8 -man/man8/rndc-confgen.8 -man/man8/rndc.8 -man/man8/tsig-keygen.8 -sbin/ddns-confgen -sbin/dnssec-dsfromkey -sbin/dnssec-importkey -sbin/dnssec-keyfromlabel -sbin/dnssec-keygen -sbin/dnssec-revoke -sbin/dnssec-settime -sbin/dnssec-signzone -sbin/dnssec-verify -sbin/genrandom -sbin/isc-hmac-fixup -sbin/lwresd -sbin/named -sbin/named-checkconf -sbin/named-checkzone -sbin/named-compilezone -sbin/named-journalprint -sbin/nsec3hash -${PLIST.pkcs11}sbin/pkcs11-destroy -${PLIST.pkcs11}sbin/pkcs11-keygen -${PLIST.pkcs11}sbin/pkcs11-list -${PLIST.pkcs11}sbin/pkcs11-tokens -sbin/rndc -sbin/rndc-confgen -sbin/tsig-keygen -share/doc/bind9/CHANGES -share/doc/bind9/FAQ.xml -share/doc/bind9/README -share/doc/bind9/arm/Bv9ARM.ch01.html -share/doc/bind9/arm/Bv9ARM.ch02.html -share/doc/bind9/arm/Bv9ARM.ch03.html -share/doc/bind9/arm/Bv9ARM.ch04.html -share/doc/bind9/arm/Bv9ARM.ch05.html -share/doc/bind9/arm/Bv9ARM.ch06.html -share/doc/bind9/arm/Bv9ARM.ch07.html -share/doc/bind9/arm/Bv9ARM.ch08.html -share/doc/bind9/arm/Bv9ARM.ch09.html -share/doc/bind9/arm/Bv9ARM.ch10.html -share/doc/bind9/arm/Bv9ARM.ch11.html -share/doc/bind9/arm/Bv9ARM.ch12.html -share/doc/bind9/arm/Bv9ARM.ch13.html -share/doc/bind9/arm/Bv9ARM.html -share/doc/bind9/arm/man.arpaname.html -share/doc/bind9/arm/man.ddns-confgen.html -share/doc/bind9/arm/man.delv.html -share/doc/bind9/arm/man.dig.html -share/doc/bind9/arm/man.dnssec-checkds.html -share/doc/bind9/arm/man.dnssec-coverage.html -share/doc/bind9/arm/man.dnssec-dsfromkey.html -share/doc/bind9/arm/man.dnssec-importkey.html -share/doc/bind9/arm/man.dnssec-keyfromlabel.html -share/doc/bind9/arm/man.dnssec-keygen.html -share/doc/bind9/arm/man.dnssec-revoke.html -share/doc/bind9/arm/man.dnssec-settime.html -share/doc/bind9/arm/man.dnssec-signzone.html -share/doc/bind9/arm/man.dnssec-verify.html -share/doc/bind9/arm/man.genrandom.html -share/doc/bind9/arm/man.host.html -share/doc/bind9/arm/man.isc-hmac-fixup.html -share/doc/bind9/arm/man.lwresd.html -share/doc/bind9/arm/man.named-checkconf.html -share/doc/bind9/arm/man.named-checkzone.html -share/doc/bind9/arm/man.named-journalprint.html -share/doc/bind9/arm/man.named-rrchecker.html -share/doc/bind9/arm/man.named.conf.html -share/doc/bind9/arm/man.named.html -share/doc/bind9/arm/man.nsec3hash.html -share/doc/bind9/arm/man.nsupdate.html -share/doc/bind9/arm/man.rndc-confgen.html -share/doc/bind9/arm/man.rndc.conf.html -share/doc/bind9/arm/man.rndc.html -share/doc/bind9/arm/notes.html -share/examples/bind9/bind.keys diff --git a/net/bind910/buildlink3.mk b/net/bind910/buildlink3.mk deleted file mode 100644 index 7afff8facd2..00000000000 --- a/net/bind910/buildlink3.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $ - -BUILDLINK_TREE+= bind - -.if !defined(BIND_BUILDLINK3_MK) -BIND_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.bind+= bind>=9.10.0 -BUILDLINK_PKGSRCDIR.bind?= ../../net/bind910 -.endif # BIND_BUILDLINK3_MK - -BUILDLINK_TREE+= -bind diff --git a/net/bind910/builtin.mk b/net/bind910/builtin.mk deleted file mode 100644 index d778703f715..00000000000 --- a/net/bind910/builtin.mk +++ /dev/null @@ -1,92 +0,0 @@ -# $NetBSD: builtin.mk,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $ - -BUILTIN_PKG:= bind - -BUILTIN_FIND_FILES_VAR:= EXE_NAMED -BUILTIN_FIND_FILES.EXE_NAMED= /usr/sbin/named -BUILTIN_FIND_LIBS:= bind - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Figure out the version of BIND if an ISC BIND named exists on the -### system. -### -.if !defined(BUILTIN_VERSION.bind) && \ - empty(EXE_NAMED:M__nonexistent__) && \ - empty(EXE_NAMED:M${LOCALBASE}/*) -BUILTIN_VERSION.bind!= \ - ${EXE_NAMED} -v 2>/dev/null | ${HEAD} -1 | \ - ${AWK} 'BEGIN { v = "4.9.11"; } \ - /^BIND / { v = $$2; sub("-.*", "", v); } \ - /^named / { v = $$2; sub("-.*", "", v); } \ - END { print v; }' -.endif -MAKEVARS+= BUILTIN_VERSION.bind - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if !defined(IS_BUILTIN.bind) -IS_BUILTIN.bind= no -. if defined(BUILTIN_VERSION.bind) -IS_BUILTIN.bind= yes -. endif -.endif -MAKEVARS+= IS_BUILTIN.bind - -### -### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to -### a package name to represent the built-in package. -### -.if !defined(BUILTIN_PKG.bind) && \ - !empty(IS_BUILTIN.bind:M[yY][eE][sS]) && \ - defined(BUILTIN_VERSION.bind) -BUILTIN_PKG.bind= bind-${BUILTIN_VERSION.bind} -.endif -MAKEVARS+= BUILTIN_PKG.bind - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.bind) -. if ${PREFER.bind} == "pkgsrc" -USE_BUILTIN.bind= no -. else -USE_BUILTIN.bind= ${IS_BUILTIN.bind} -. if defined(BUILTIN_PKG.bind) && \ - !empty(IS_BUILTIN.bind:M[yY][eE][sS]) -USE_BUILTIN.bind= yes -. for dep in ${BUILDLINK_API_DEPENDS.bind} -. if !empty(USE_BUILTIN.bind:M[yY][eE][sS]) -USE_BUILTIN.bind!= \ - if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.bind:Q}; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -. endif -. endfor -. endif -. endif # PREFER.bind -.endif -MAKEVARS+= USE_BUILTIN.bind - -### -### The section below only applies if we are not including this file -### solely to determine whether a built-in implementation exists. -### -CHECK_BUILTIN.bind?= no -.if !empty(CHECK_BUILTIN.bind:M[nN][oO]) - -. if !empty(USE_BUILTIN.bind:M[yY][eE][sS]) -. if !empty(BUILTIN_LIB_FOUND.bind:M[yY][eE][sS]) -BUILDLINK_LDADD.bind?= -lbind -. endif -. elif !empty(USE_BUILTIN.bind:M[nN][oO]) -BUILDLINK_LDADD.bind?= -lbind -. endif - -.endif # CHECK_BUILTIN.bind diff --git a/net/bind910/distinfo b/net/bind910/distinfo deleted file mode 100644 index 286b0838c88..00000000000 --- a/net/bind910/distinfo +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: distinfo,v 1.37 2018/09/23 14:27:07 taca Exp $ - -SHA1 (bind-9.10.8-P1.tar.gz) = 70505825897b78868eb5f38ebf1a7b9fd3a7b588 -RMD160 (bind-9.10.8-P1.tar.gz) = 6cea25616dc1e0a280db3ea9784afe109f68db5c -SHA512 (bind-9.10.8-P1.tar.gz) = 1b4d871b7baddf0552b56f1f667974f29684b1a85e1cf7cbe9c62c72f113337bf3cf4c4d806b565b551c8eca45bbc8290b173de6b0188b7e17f648e2a0986ce8 -Size (bind-9.10.8-P1.tar.gz) = 9247135 bytes -SHA1 (patch-bin_dig_dighost.c) = 983e23a30d519982cbe88ed2277fcffc9cad616e -SHA1 (patch-bin_named_server.c) = ee015eb38c174e0f559218b4435a9925b7474d77 -SHA1 (patch-bin_named_zoneconf.c) = b1a5510a5ef80187103a43b1236663e840d21371 -SHA1 (patch-bin_tests_system_Makefile.in) = ba368204f8eeaa12be366a532c75a2e3cc8fae98 -SHA1 (patch-bin_tests_system_metadata_tests.sh) = f18aa93a93cadd5d9da4bba75a512b5c599fb4dd -SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2 -SHA1 (patch-configure) = ac796249d34884e87d51602762df1f29cd1fe0bd -SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f -SHA1 (patch-lib_dns_rbt.c) = 7e37f411d084e5363c6a5023e1915d224321c3e3 -SHA1 (patch-lib_dns_zone.c) = d876680089f6ebedf2c9af96057088fc1c37c378 -SHA1 (patch-lib_isc_unix_socket.c) = b2ab2d914c6be15639ca4fc63255f928d318704c -SHA1 (patch-lib_lwres_getaddrinfo.c) = 69e9c8049fedcb93bd219c6053163f21ce3b2535 -SHA1 (patch-lib_lwres_getnameinfo.c) = 418ad349cf52925c9e8051b5c71d9d51ea8d2fb1 diff --git a/net/bind910/files/lwresd.sh b/net/bind910/files/lwresd.sh deleted file mode 100644 index 1f5b2f56b99..00000000000 --- a/net/bind910/files/lwresd.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: lwresd.sh,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $ -# -# PROVIDE: lwresd -# REQUIRE: SERVERS - -. /etc/rc.subr - -name="lwresd" -rcvar=${name} -command="@PREFIX@/sbin/${name}" -pidfile="@VARBASE@/run/lwresd/${name}.pid" -extra_commands="reload" -start_precmd="lwresd_precmd" - -lwresd_precmd() -{ - if [ ! -d @VARBASE@/run/lwresd ]; then - @MKDIR@ @VARBASE@/run/lwresd - fi -} - -load_rc_config ${name} # check /etc/rc.conf.d/named9 -run_rc_command "$1" diff --git a/net/bind910/files/named9.sh b/net/bind910/files/named9.sh deleted file mode 100644 index d1d88581ffe..00000000000 --- a/net/bind910/files/named9.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: named9.sh,v 1.2 2014/12/12 07:47:40 obache Exp $ -# - -# PROVIDE: named -# REQUIRE: NETWORKING mountcritremote syslogd -# BEFORE: DAEMON -# KEYWORD: chrootdir - -. /etc/rc.subr - -name="named" -rcvar="${name}9" -command="@PREFIX@/sbin/${name}" -pidfile="@VARBASE@/run/named/${name}.pid" -start_precmd="named_precmd" -extra_commands="reload" -required_dirs="$named_chrootdir" # if it is set, it must exist - -named_precmd() -{ - # Die if $named is also set (i.e. the system's named is not disabled - if checkyesno named ; then - warn \ - "disable 'named' when setting 'named9'!" - return 1 - fi - - if [ ! -d @VARBASE@/run/named ]; then - @MKDIR@ @VARBASE@/run/named - fi - - if [ -z "$named_chrootdir" ]; then - return 0; - fi - - for i in null random - do - if [ ! -c "${named_chrootdir}/dev/$i" ]; then - @RM@ -f "${named_chrootdir}/dev/$i" - (cd /dev && - @PAX@ -rw -pe "$i" "${named_chrootdir}/dev") - fi - done - - if [ -f /etc/localtime ]; then - @CMP@ -s /etc/localtime "${named_chrootdir}/etc/localtime" || \ - @CP@ -p /etc/localtime "${named_chrootdir}/etc/localtime" - fi - - if [ -f @SSLBASE@/lib/engines/libgost.so ]; then - if [ ! -d ${named_chrootdir}@SSLBASE@/lib/engines ]; then - @MKDIR@ ${named_chrootdir}@SSLBASE@/lib/engines - fi - @CMP@ -s @SSLBASE@/lib/engines/libgost.so "${named_chrootdir}@SSLBASE@/lib/engines/libgost.so" || \ - @CP@ -p @SSLBASE@/lib/engines/libgost.so "${named_chrootdir}@SSLBASE@/lib/engines/libgost.so" - fi - - if [ ! -d ${named_chrootdir}@VARBASE@/run/named ]; then - @MKDIR@ ${named_chrootdir}@VARBASE@/run/named - @CHOWN@ @BIND_USER@ ${named_chrootdir}@VARBASE@/run/named - fi - - @RM@ -f ${pidfile} - @LN@ -s "${named_chrootdir}${pidfile}" ${pidfile} - - # Change run_rc_commands()'s internal copy of $named_flags - # - rc_flags="-u @BIND_USER@ -t ${named_chrootdir} $rc_flags" -} - -load_rc_config "$rcvar" -run_rc_command "$1" diff --git a/net/bind910/files/smf/manifest.xml b/net/bind910/files/smf/manifest.xml deleted file mode 100644 index 3b9c5965533..00000000000 --- a/net/bind910/files/smf/manifest.xml +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version="1.0"?> -<!-- -CDDL HEADER START - -The contents of this file are subject to the terms of the -Common Development and Distribution License (the "License"). -You may not use this file except in compliance with the License. - -You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -or http://www.opensolaris.org/os/licensing. -See the License for the specific language governing permissions -and limitations under the License. - -When distributing Covered Code, include this CDDL HEADER in each -file and include the License file at usr/src/OPENSOLARIS.LICENSE. -If applicable, add the following below this CDDL HEADER, with the -fields enclosed by brackets "[]" replaced with your own identifying -information: Portions Copyright [yyyy] [name of copyright owner] - -CDDL HEADER END ---> -<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> -<!-- - Copyright 2007 Sun Microsystems, Inc. All rights reserved. - Use is subject to license terms. - - ident "@(#)server.xml 1.8 07/06/19 SMI" ---> -<!-- Portions Copyright 2007 Vedran Bender --> -<service_bundle type='manifest' name='export'> - <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'> - <dependency name='filesystem_minimal' grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/system/filesystem/local' /> - </dependency> - <dependency name='loopback' grouping='require_any' restart_on='error' type='service'> - <service_fmri value='svc:/network/loopback' /> - </dependency> - <dependency name='network' grouping='optional_all' restart_on='error' type='service'> - <service_fmri value='svc:/milestone/network' /> - </dependency> - <dependency name='config-files' grouping='require_any' restart_on='refresh' type='path'> - <service_fmri value='file://localhost@PKG_SYSCONFDIR@/named.conf' /> - </dependency> - <!-- - In order to run multiple named(1M) processes with their own - configuration file or properties each must have a unique - instance. - --> - <instance name='default' enabled='false'> - <exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.named@ %m %i' timeout_seconds='60'> - <method_context> - <method_credential user='root' group='root' /> - </method_context> - </exec_method> - <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.named@ %m %i %{restarter/contract}' timeout_seconds='60'> - <method_context> - <method_credential user='root' group='root' /> - </method_context> - - </exec_method> - <!-- - SIGHUP causes named to reread its configuration file, but not any - of the properties below. - --> - <exec_method type='method' name='refresh' exec=':kill -HUP' timeout_seconds='60'> - <method_context /> - </exec_method> - <property_group name='general' type='framework'> - <!-- manage DNS server state --> - <propval name='action_authorization' type='astring' value='solaris.smf.manage.bind' /> - <propval name='value_authorization' type='astring' value='solaris.smf.manage.bind' /> - </property_group> - <!-- Default property settings for named(1M) instance. --> - <property_group name='options' type='application'> - <!-- - server: specifies an alternative server command. If - not specified the default /usr/sbin/named is used. - --> - <propval name='server' type='astring' value='' /> - <!-- - configuration_file: specifies an alternative - configuration file to be used. The property is similar - to named(1M) command line option '-c' - --> - <propval name='configuration_file' type='astring' value='' /> - <!-- - ip_interfaces: specifies which IP transport BIND will - transmit on. Possible values are 'IPv4' or 'IPv6'. Any - other setting assumes 'all', the default. - Equivalent command line option '-4' or '-6'. - --> - <propval name='ip_interfaces' type='astring' value='all' /> - <!-- - listen_on_port: Specifies the default UDP and TCP port - which will be used to listen for DNS requests. - Equivalent command line option '-p <integer>'. - --> - <propval name='listen_on_port' type='integer' value='0' /> - <!-- - debug_level: Specifies the default debug level. The - default is 0; no debugging. The Higher the number the - more verbose debug information becomes. - Equivalent command line option '-d <integer>'. - --> - <propval name='debug_level' type='integer' value='0' /> - <!-- - threads: Specifies the number of cpu worker threads to - create. The default of 0 causes named to try and - determine the number of CPUs present and create one - thread per CPU. - Equivalent command line option '-n <integer>'. - --> - <propval name='threads' type='integer' value='0' /> - <!-- - chroot_dir: Change the root directory using chroot(2) - to directory after processing the command line - arguments, but before reading the configuration file. - Equivalent command line option '-t <pathname>'. - --> - <propval name='chroot_dir' type='astring' value='' /> - <!-- - user: Change the user id after processing command line - arguments, but before reading the configuration file. - Equivalent command line option '-u <user>'. - --> - <propval name='user' type='astring' value='named' /> - </property_group> - </instance> - <template> - <common_name> - <loctext xml:lang='C'>BIND DNS server</loctext> - </common_name> - <documentation> - <manpage title='named' section='1M' manpath='@PREFIX@/@PKGMANDIR@' /> - </documentation> - </template> - </service> -</service_bundle> diff --git a/net/bind910/files/smf/named.sh b/net/bind910/files/smf/named.sh deleted file mode 100644 index cd5fa25e5f2..00000000000 --- a/net/bind910/files/smf/named.sh +++ /dev/null @@ -1,262 +0,0 @@ -#!@SMF_METHOD_SHELL@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#pragma ident "@(#)dns-server.sh 1.1 07/03/26 SMI" - -# smf_method(5) start/stop script required for server DNS - -. /lib/svc/share/smf_include.sh - -mount_chroot () -{ - c=$1 - shift - for f in $*; do - if [ -z "${f}" -o ! -f "${f}" -o \ - -z "${c}" -o ! -d "${c}" ]; then - exit ${SMF_EXIT_ERR_CONFIG} - fi - - umount ${c}/${f} >/dev/null 2>&1 - mkdir -p `dirname ${c}/${f}` - touch ${c}/${f} - mount -Flofs ${f} ${c}/${f} - done -} - -umount_chroot () -{ - c=$1 - shift - for f in $*; do - umount ${c}/${f} >/dev/null 2>&1 - done -} - -get_config () -{ - configuration_file=@PKG_SYSCONFDIR@/named.conf - rndc_config_file=@PKG_SYSCONFDIR@/rndc.conf - rndc_key_file=@PKG_SYSCONFDIR@/rndc.key - rndc_cmd_opts="-a" - libraries="/usr/pkg/lib/engines/libgost.so" - cmdopts="" - checkopts="" - properties="debug_level ip_interfaces listen_on_port - threads chroot_dir configuration_file server user" - - for prop in $properties - do - value=`/usr/bin/svcprop -p options/${prop} ${SMF_FMRI}` - if [ -z "${value}" -o "${value}" = '""' ]; then - continue; - fi - - case $prop in - 'debug_level') - if [ ${value} -gt 0 ]; then - cmdopts="${cmdopts} -d ${value}" - fi - ;; - 'ip_interfaces') - case ${value} in - 'IPv4') - cmdopts="${cmdopts} -4";; - 'IPv6') - cmdopts="${cmdopts} -6";; - 'all') - : # Default is all, therefore ignore. - ;; - *) - echo "$I: Unrecognised value in service instance property" >&2 - echo "$I: options/${prop} : ${value}" >&2 - ;; - esac - ;; - 'listen_on_port') - if [ ${value} -gt 0 ]; then - cmdopts="${cmdopts} -p ${value}" - fi - ;; - 'threads') - if [ ${value} -gt 0 ]; then - cmdopts="${cmdopts} -n ${value}" - fi - ;; - 'chroot_dir') - cmdopts="${cmdopts} -t ${value}" - checkopts="${checkopts} -t ${value}" - chroot_dir=${value}; - ;; - 'configuration_file') - cmdopts="${cmdopts} -c ${value}" - checkopts="${checkopts} -t ${value}" - configuration_file=${value}; - ;; - 'server') - set -- `echo ${value} | /usr/bin/sed -e 's/\\\\//g'` - server=$@ - ;; - 'user') - cmdopts="${cmdopts} -u ${value}" - cmduser=${value}; - ;; - esac - done - - configuration_dir=$(sed -n -e 's,^[[:space:]]*directory.*"\(.*\)";,\1,p' \ - ${configuration_file}) - [ "${configuration_dir}" == "" ] && configuration_dir=@PKG_SYSCONFDIR@/namedb - - configuration_files=$(sed -n -e \ - "s,^[[:space:]]*file.*\"\(.*\)\";,${configuration_dir}/\1,p" \ - ${configuration_file} | sort -u) - configuration_files="${configuration_files} ${configuration_file}" -} - -result=${SMF_EXIT_OK} - -# Read command line arguments -method="$1" # %m -instance="$2" # %i -contract="$3" # %{restarter/contract} - -# Set defaults; SMF_FMRI should have been set, but just in case. -if [ -z "$SMF_FMRI" ]; then - SMF_FMRI="svc:/@SMF_PREFIX@/@SMF_NAME@:${instance}" -fi -server="@PREFIX@/sbin/named" -checkconf="@PREFIX@/sbin/named-checkconf" -I=`/usr/bin/basename $0` - -case "$method" in -'start') - get_config - - # If chroot option is set, note zones(5) are preferred, then - # configuration file lives under chroot directory. - if [ "${chroot_dir}" != "" ]; then - if [ "${chroot_dir}" = "/" ]; then - msg="$I: chroot_dir must not be /" - echo ${msg} >&2 - /usr/bin/logger -p daemon.error ${msg} - # dns-server should be placed in maintenance state. - exit ${SMF_EXIT_ERR_CONFIG} - fi - - server="env LD_NOLAZYLOAD=1 ${server}" - checkconf="env LD_NOLAZYLOAD=1 ${checkconf}" - - mkdir -p ${chroot_dir} - - if [ "${SMF_ZONENAME}" = "global" ]; then - for dev in crypto log null poll random urandom; do - rm -f ${chroot_dir}/dev/${dev} - pax -rw -H -pe /dev/${dev} ${chroot_dir} - done - fi - - missing="" - for dev in crypto null poll random urandom; do - if [ ! -e "${chroot_dir}/dev/${dev}" ]; then - missing="${missing} ${dev}" - fi - done - - if [ ! -z "${missing}" ]; then - msg="$I: missing device nodes in ${chroot_dir}: ${missing}" - echo ${msg} >&2 - /usr/bin/logger -p daemon.err ${msg} - # dns-server should be placed in maintenance state. - exit ${SMF_EXIT_ERR_CONFIG} - fi - - mount_chroot ${chroot_dir} ${configuration_files} ${libraries} - - mkdir -p ${chroot_dir}/var/run/named - chown ${cmduser}:${cmduser} ${chroot_dir}/var/run/named - - configuration_file=${chroot_dir}${configuration_file} - rndc_config_file=${chroot_dir}${rndc_config_file} - rndc_key_file=${chroot_dir}${rndc_key_file} - rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}" - else - mkdir -p @VARBASE@/run/named - chown ${cmduser}:${cmduser} @VARBASE@/run/named - fi - - # Check if the rndc config file exists. - if [ ! -f ${rndc_config_file} ]; then - # If not, check if the default rndc key file exists. - if [ ! -f ${rndc_key_file} ]; then - echo "$I: Creating default rndc key file: ${rndc_key_file}." >&2 - @PREFIX@/sbin/rndc-confgen ${rndc_cmd_opts} - if [ $? -ne 0 ]; then - echo "$I : Warning: rndc configuration failed! Use of 'rndc' to" \ - "control 'named' may fail and 'named' may report further error" \ - "messages to the system log. This is not fatal. For more" \ - "information see rndc(1M) and rndc-confgen(1M)." >&2 - fi - fi - fi - - if [ ${result} = ${SMF_EXIT_OK} ]; then - ${checkconf} -z ${checkopts} - result=$? - if [ $result -ne 0 ]; then - msg="$I: named-checkconf failed to verify configuration" - echo ${msg} >&2 - /usr/bin/logger -p daemon.error ${msg} - if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then - umount_chroot ${chroot_dir} ${configuration_files} ${libraries} - fi - # dns-server should be placed in maintenance state. - exit ${SMF_EXIT_ERR_CONFIG} - fi - fi - - if [ ${result} = ${SMF_EXIT_OK} ]; then - echo "$I: Executing: ${server} ${cmdopts}" - # Execute named(1M) with relevant command line options. - ppriv -s A-all -s A+basic,net_privaddr,file_dac_read,file_dac_search,sys_resource,proc_chroot,proc_setid -e ${server} ${cmdopts} - result=$? - fi - ;; -'stop') - get_config - - smf_kill_contract ${contract} TERM 1 - [ $? -ne 0 ] && exit 1 - - if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then - umount_chroot ${chroot_dir} ${configuration_files} ${libraries} - fi - - ;; -*) - echo "Usage: $I [stop|start] <instance>" >&2 - exit 1 - ;; -esac -exit ${result} diff --git a/net/bind910/options.mk b/net/bind910/options.mk deleted file mode 100644 index 4fe8ea1af69..00000000000 --- a/net/bind910/options.mk +++ /dev/null @@ -1,140 +0,0 @@ -# $NetBSD: options.mk,v 1.3 2016/05/02 13:27:57 taca Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.bind910 -PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server -PKG_SUPPORTED_OPTIONS+= bind-json-statistics-server -PKG_SUPPORTED_OPTIONS+= inet6 threads readline mysql pgsql ldap dlz-filesystem -PKG_SUPPORTED_OPTIONS+= fetchlimit geoip pkcs11 sit tuning -PKG_SUGGESTED_OPTIONS+= readline - -PLIST_VARS+= inet6 pkcs11 - -PTHREAD_OPTS+= native -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-vax) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-sparc) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) -# don't touch PKG_SUGGESTED_OPTIONS -.else -PKG_SUGGESTED_OPTIONS+= threads -.endif - -.if empty(MISSING_FEATURES:Minet6) -PKG_SUGGESTED_OPTIONS+= inet6 -.else -PLIST.inet6= yes -.endif - -.include "../../mk/bsd.options.mk" - -### -### The mysql pgsql ldap dlz-filesystem options are all for BIND -### DLZ (Dynamically Loadable Zones) functionality -### -### NOTE: bdb is excluded on purpose as pkgsrc does not contain -### a bdb v4.1 or 4.2 package which is what BIND needs. -### The majority of these are compile tested only -### - -.if !empty(PKG_OPTIONS:Mmysql) -.include "../../mk/mysql.buildlink3.mk" -CONFIGURE_ARGS+= --with-dlz-mysql=${BUILDLINK_PREFIX.mysql-client} -.endif - -.if !empty(PKG_OPTIONS:Mpgsql) -.include "../../mk/pgsql.buildlink3.mk" -CONFIGURE_ARGS+= --with-dlz-postgres=${BUILDLINK_PREFIX.${PGSQL_TYPE}} -CONFIGURE_ENV+= ac_cv_path_PG_CONFIG=${PREFIX}/bin/pg_config -.endif - -.if !empty(PKG_OPTIONS:Mldap) -.include "../../databases/openldap-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-dlz-ldap=${BUILDLINK_PREFIX.openldap-client} -.endif - -.if !empty(PKG_OPTIONS:Mdlz-filesystem) -CONFIGURE_ARGS+= --with-dlz-filesystem -.endif - -.if !empty(PKG_OPTIONS:Mfetchlimit) -CONFIGURE_ARGS+= --enable-fetchlimit -.endif - -.if !empty(PKG_OPTIONS:Mgeoip) -CONFIGURE_ARGS+= --with-geoip=${PREFIX} -.include "../../net/GeoIP/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mpkcs11) -CONFIGURE_ARGS+= --with-pkcs11=yes -PLIST.pkcs11= yes -.endif - -.if !empty(PKG_OPTIONS:Msit) -CONFIGURE_ARGS+= --enable-sit -.endif - -.if !empty(PKG_OPTIONS:Mtuning) -CONFIGURE_ARGS+= --with-tuning=large -.endif - -### -### The statistics server in bind99 and later needs libxml2 -### -.if !empty(PKG_OPTIONS:Mbind-xml-statistics-server) -.include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-libxml2 -.else -CONFIGURE_ARGS+= --without-libxml2 -.endif - -### -### The statistics server in bind910 and later supports json -### -.if !empty(PKG_OPTIONS:Mbind-json-statistics-server) -.include "../../textproc/json-c/buildlink3.mk" -CONFIGURE_ARGS+= --with-libjson -.else -CONFIGURE_ARGS+= --without-libjson -.endif - -### -### IPv6 support -### -.if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -### -### pthreads support (also see magic above) -### -.if !empty(PKG_OPTIONS:Mthreads) -PTHREAD_AUTO_VARS= yes -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - -### -### readline support in dig(1) and nsupdate(1). -### -.if !empty(PKG_OPTIONS:Mreadline) -.include "../../mk/readline.buildlink3.mk" -CONFIGURE_ARGS+= --with-readline -.else -CONFIGURE_ARGS+= --without-readline -.endif - -### -### dig(1) option +sigchase for DNSSEC signature chasing -### -.if !empty(PKG_OPTIONS:Mbind-dig-sigchase) -# If anything else needs to add entries to STD_CDEFINES, this will need -# to be changed so that the two can cooperate. -CONFIGURE_ENV+= STD_CDEFINES=-DDIG_SIGCHASE=1 -.endif diff --git a/net/bind910/patches/patch-bin_dig_dighost.c b/net/bind910/patches/patch-bin_dig_dighost.c deleted file mode 100644 index 4ac423f5f28..00000000000 --- a/net/bind910/patches/patch-bin_dig_dighost.c +++ /dev/null @@ -1,128 +0,0 @@ -$NetBSD: patch-bin_dig_dighost.c,v 1.3 2015/12/13 17:35:22 taca Exp $ - -* Avoid to use true as variable name. - ---- bin/dig/dighost.c.orig 2015-09-09 02:23:40.000000000 +0000 -+++ bin/dig/dighost.c -@@ -4821,7 +4821,7 @@ prepare_lookup(dns_name_t *name) - isc_buffer_t *b = NULL; - isc_region_t r; - dns_rdataset_t *rdataset = NULL; -- isc_boolean_t true = ISC_TRUE; -+ isc_boolean_t isc_true = ISC_TRUE; - #endif - - memset(namestr, 0, DNS_NAME_FORMATSIZE); -@@ -4835,7 +4835,7 @@ prepare_lookup(dns_name_t *name) - - result = advanced_rrsearch(&rdataset, &ns.name, - dns_rdatatype_aaaa, -- dns_rdatatype_any, &true); -+ dns_rdatatype_any, &isc_true); - if (result == ISC_R_SUCCESS) { - for (result = dns_rdataset_first(rdataset); - result == ISC_R_SUCCESS; -@@ -4864,7 +4864,7 @@ prepare_lookup(dns_name_t *name) - - rdataset = NULL; - result = advanced_rrsearch(&rdataset, &ns.name, dns_rdatatype_a, -- dns_rdatatype_any, &true); -+ dns_rdatatype_any, &isc_true); - if (result == ISC_R_SUCCESS) { - for (result = dns_rdataset_first(rdataset); - result == ISC_R_SUCCESS; -@@ -4983,11 +4983,11 @@ isc_result_t - initialization(dns_name_t *name) - { - isc_result_t result; -- isc_boolean_t true = ISC_TRUE; -+ isc_boolean_t isc_true = ISC_TRUE; - - chase_nsrdataset = NULL; - result = advanced_rrsearch(&chase_nsrdataset, name, dns_rdatatype_ns, -- dns_rdatatype_any, &true); -+ dns_rdatatype_any, &isc_true); - if (result != ISC_R_SUCCESS) { - printf("\n;; NS RRset is missing to continue validation:" - " FAILED\n\n"); -@@ -5342,7 +5342,7 @@ sigchase_td(dns_message_t *msg) - isc_result_t result; - dns_name_t *name = NULL; - isc_boolean_t have_answer = ISC_FALSE; -- isc_boolean_t true = ISC_TRUE; -+ isc_boolean_t isc_true = ISC_TRUE; - - if (msg->rcode != dns_rcode_noerror && - msg->rcode != dns_rcode_nxdomain) { -@@ -5365,7 +5365,7 @@ sigchase_td(dns_message_t *msg) - initialization(name); - return; - } -- have_answer = true; -+ have_answer = isc_true; - } else { - if (!current_lookup->trace_root_sigchase) { - result = dns_message_firstname(msg, -@@ -5484,7 +5484,7 @@ sigchase_td(dns_message_t *msg) - dns_rdatatype_rrsig, - current_lookup - ->rdtype_sigchase, -- &true); -+ &isc_true); - if (result == ISC_R_FAILURE) { - printf("\n;; RRset is missing to continue" - " validation SHOULD NOT APPEND:" -@@ -5497,7 +5497,7 @@ sigchase_td(dns_message_t *msg) - &chase_authority_name, - dns_rdatatype_rrsig, - dns_rdatatype_any, -- &true); -+ &isc_true); - if (result == ISC_R_FAILURE) { - printf("\n;; RRSIG is missing to continue" - " validation SHOULD NOT APPEND:" -@@ -5573,7 +5573,7 @@ sigchase_td(dns_message_t *msg) - &chase_authority_name, - dns_rdatatype_rrsig, - dns_rdatatype_ds, -- &true); -+ &isc_true); - if (result != ISC_R_SUCCESS) { - printf("\n;; DSset is missing to continue validation:" - " FAILED\n\n"); -@@ -5660,7 +5660,7 @@ sigchase_td(dns_message_t *msg) - result = advanced_rrsearch(&chase_rdataset, &chase_name, - current_lookup->rdtype_sigchase, - dns_rdatatype_any , -- &true); -+ &isc_true); - if (result == ISC_R_FAILURE) { - printf("\n;; RRsig of RRset is missing to continue validation" - " SHOULD NOT APPEND: FAILED\n\n"); -@@ -5703,7 +5703,7 @@ getneededrr(dns_message_t *msg) - dns_name_t *name = NULL; - dns_rdata_t sigrdata = DNS_RDATA_INIT; - dns_rdata_sig_t siginfo; -- isc_boolean_t true = ISC_TRUE; -+ isc_boolean_t isc_true = ISC_TRUE; - - if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER)) - != ISC_R_SUCCESS) { -@@ -5719,7 +5719,7 @@ getneededrr(dns_message_t *msg) - if (chase_rdataset == NULL) { - result = advanced_rrsearch(&chase_rdataset, name, - dns_rdatatype_any, -- dns_rdatatype_any, &true); -+ dns_rdatatype_any, &isc_true); - if (result != ISC_R_SUCCESS) { - printf("\n;; No Answers: Validation FAILED\n\n"); - return (ISC_R_NOTFOUND); -@@ -5838,7 +5838,7 @@ getneededrr(dns_message_t *msg) - result = advanced_rrsearch(&chase_sigdsrdataset, - &chase_signame, - dns_rdatatype_rrsig, -- dns_rdatatype_ds, &true); -+ dns_rdatatype_ds, &isc_true); - if (result == ISC_R_FAILURE) { - printf(";; WARNING : NO RRSIG DS : RRSIG DS" - " should come with DS\n"); diff --git a/net/bind910/patches/patch-bin_named_server.c b/net/bind910/patches/patch-bin_named_server.c deleted file mode 100644 index ff5a733a7cf..00000000000 --- a/net/bind910/patches/patch-bin_named_server.c +++ /dev/null @@ -1,114 +0,0 @@ -$NetBSD: patch-bin_named_server.c,v 1.1 2018/09/23 14:27:07 taca Exp $ - -* Backport change between BIND 9.11.4-P1 and 9.11.4-P2. - ---- bin/named/server.c.orig 2018-07-24 17:26:47.000000000 +0000 -+++ bin/named/server.c -@@ -9345,7 +9345,7 @@ ns_server_freeze(ns_server_t *server, is - isc_lex_t *lex, isc_buffer_t *text) - { - isc_result_t result, tresult; -- dns_zone_t *zone = NULL, *raw = NULL; -+ dns_zone_t *mayberaw = NULL, *raw = NULL; - dns_zonetype_t type; - char classstr[DNS_RDATACLASS_FORMATSIZE]; - char zonename[DNS_NAME_FORMATSIZE]; -@@ -9354,11 +9354,11 @@ ns_server_freeze(ns_server_t *server, is - isc_boolean_t frozen; - const char *msg = NULL; - -- result = zone_from_args(server, lex, NULL, &zone, NULL, -+ result = zone_from_args(server, lex, NULL, &mayberaw, NULL, - text, ISC_TRUE); - if (result != ISC_R_SUCCESS) - return (result); -- if (zone == NULL) { -+ if (mayberaw == NULL) { - result = isc_task_beginexclusive(server->task); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - tresult = ISC_R_SUCCESS; -@@ -9378,26 +9378,26 @@ ns_server_freeze(ns_server_t *server, is - isc_result_totext(tresult)); - return (tresult); - } -- dns_zone_getraw(zone, &raw); -+ dns_zone_getraw(mayberaw, &raw); - if (raw != NULL) { -- dns_zone_detach(&zone); -- dns_zone_attach(raw, &zone); -+ dns_zone_detach(&mayberaw); -+ dns_zone_attach(raw, &mayberaw); - dns_zone_detach(&raw); - } -- type = dns_zone_gettype(zone); -+ type = dns_zone_gettype(mayberaw); - if (type != dns_zone_master) { -- dns_zone_detach(&zone); -+ dns_zone_detach(&mayberaw); - return (DNS_R_NOTMASTER); - } - -- if (freeze && !dns_zone_isdynamic(zone, ISC_TRUE)) { -- dns_zone_detach(&zone); -+ if (freeze && !dns_zone_isdynamic(mayberaw, ISC_TRUE)) { -+ dns_zone_detach(&mayberaw); - return (DNS_R_NOTDYNAMIC); - } - - result = isc_task_beginexclusive(server->task); - RUNTIME_CHECK(result == ISC_R_SUCCESS); -- frozen = dns_zone_getupdatedisabled(zone); -+ frozen = dns_zone_getupdatedisabled(mayberaw); - if (freeze) { - if (frozen) { - msg = "WARNING: The zone was already frozen.\n" -@@ -9406,16 +9406,16 @@ ns_server_freeze(ns_server_t *server, is - result = DNS_R_FROZEN; - } - if (result == ISC_R_SUCCESS) { -- result = dns_zone_flush(zone); -+ result = dns_zone_flush(mayberaw); - if (result != ISC_R_SUCCESS) - msg = "Flushing the zone updates to " - "disk failed."; - } - if (result == ISC_R_SUCCESS) -- dns_zone_setupdatedisabled(zone, freeze); -+ dns_zone_setupdatedisabled(mayberaw, freeze); - } else { - if (frozen) { -- result = dns_zone_loadandthaw(zone); -+ result = dns_zone_loadandthaw(mayberaw); - switch (result) { - case ISC_R_SUCCESS: - case DNS_R_UPTODATE: -@@ -9437,7 +9437,7 @@ ns_server_freeze(ns_server_t *server, is - isc_buffer_putmem(text, (const unsigned char *)msg, - strlen(msg) + 1); - -- view = dns_zone_getview(zone); -+ view = dns_zone_getview(mayberaw); - if (strcmp(view->name, "_default") == 0 || - strcmp(view->name, "_bind") == 0) - { -@@ -9447,9 +9447,9 @@ ns_server_freeze(ns_server_t *server, is - vname = view->name; - sep = " "; - } -- dns_rdataclass_format(dns_zone_getclass(zone), classstr, -+ dns_rdataclass_format(dns_zone_getclass(mayberaw), classstr, - sizeof(classstr)); -- dns_name_format(dns_zone_getorigin(zone), -+ dns_name_format(dns_zone_getorigin(mayberaw), - zonename, sizeof(zonename)); - isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, - NS_LOGMODULE_SERVER, ISC_LOG_INFO, -@@ -9457,7 +9457,7 @@ ns_server_freeze(ns_server_t *server, is - freeze ? "freezing" : "thawing", - zonename, classstr, sep, vname, - isc_result_totext(result)); -- dns_zone_detach(&zone); -+ dns_zone_detach(&mayberaw); - return (result); - } - diff --git a/net/bind910/patches/patch-bin_named_zoneconf.c b/net/bind910/patches/patch-bin_named_zoneconf.c deleted file mode 100644 index 7a5591a2007..00000000000 --- a/net/bind910/patches/patch-bin_named_zoneconf.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bin_named_zoneconf.c,v 1.1 2018/09/23 14:27:07 taca Exp $ - -* Backport change between BIND 9.11.4-P1 and 9.11.4-P2. - ---- bin/named/zoneconf.c.orig 2018-07-24 17:26:47.000000000 +0000 -+++ bin/named/zoneconf.c -@@ -1214,7 +1214,7 @@ ns_zone_configure(const cfg_obj_t *confi - dns_zone_setoption(raw, DNS_ZONEOPT_IXFRFROMDIFFS, - ISC_TRUE); - dns_zone_setoption(zone, DNS_ZONEOPT_IXFRFROMDIFFS, -- ISC_TRUE); -+ ISC_FALSE); - } else - dns_zone_setoption(zone, DNS_ZONEOPT_IXFRFROMDIFFS, - ixfrdiff); diff --git a/net/bind910/patches/patch-bin_tests_system_Makefile.in b/net/bind910/patches/patch-bin_tests_system_Makefile.in deleted file mode 100644 index 0112ad4a5bd..00000000000 --- a/net/bind910/patches/patch-bin_tests_system_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bin_tests_system_Makefile.in,v 1.4 2017/04/22 16:05:43 taca Exp $ - -Build fix for DragonFly while linking of driver.so. - ---- bin/tests/system/Makefile.in.orig 2017-04-14 03:54:11.000000000 +0000 -+++ bin/tests/system/Makefile.in -@@ -21,7 +21,7 @@ VERSION=@BIND9_VERSION@ - - @BIND9_MAKE_INCLUDES@ - --SUBDIRS = dlzexternal lwresd rsabigexponent tkey -+SUBDIRS = lwresd rsabigexponent tkey - CINCLUDES = ${ISC_INCLUDES} ${DNS_INCLUDES} - - CDEFINES = @USE_GSSAPI@ diff --git a/net/bind910/patches/patch-bin_tests_system_metadata_tests.sh b/net/bind910/patches/patch-bin_tests_system_metadata_tests.sh deleted file mode 100644 index cee375dec5e..00000000000 --- a/net/bind910/patches/patch-bin_tests_system_metadata_tests.sh +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bin_tests_system_metadata_tests.sh,v 1.2 2018/07/14 03:53:42 taca Exp $ - -* Avoid using "==" for argument of test(1). - ---- bin/tests/system/metadata/tests.sh.orig 2018-07-03 06:44:00.000000000 +0000 -+++ bin/tests/system/metadata/tests.sh -@@ -144,7 +144,7 @@ status=`expr $status + $ret` - - echo_i "checking warning about permissions change on key with dnssec-settime ($n)" - uname=`uname -o 2> /dev/null` --if [ Cygwin == "$uname" ]; then -+if [ Cygwin = "$uname" ]; then - echo_i "Cygwin detected, skipping" - else - ret=0 diff --git a/net/bind910/patches/patch-config.threads.in b/net/bind910/patches/patch-config.threads.in deleted file mode 100644 index c5cb3d56776..00000000000 --- a/net/bind910/patches/patch-config.threads.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-config.threads.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $ - -* Add DragonFly support. - ---- config.threads.in.orig 2012-01-30 07:08:34.000000000 +0000 -+++ config.threads.in -@@ -50,6 +50,8 @@ case $host in - use_threads=false ;; - *-freebsd*) - use_threads=true ;; -+*-dragonfly*) -+ use_threads=false ;; - [*-bsdi[234]*]) - # Thread signals do not work reliably on some versions of BSD/OS. - use_threads=false ;; diff --git a/net/bind910/patches/patch-configure b/net/bind910/patches/patch-configure deleted file mode 100644 index 0d6ca9b10c6..00000000000 --- a/net/bind910/patches/patch-configure +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-configure,v 1.6 2018/02/08 14:43:07 fhajny Exp $ - -* Add DragonFly support. -* Link proper postgresql library. -* Avoid using "==" for argument of test(1). - ---- configure.orig 2018-01-04 05:35:08.000000000 +0000 -+++ configure -@@ -14657,6 +14657,8 @@ case $host in - use_threads=false ;; - *-freebsd*) - use_threads=true ;; -+*-dragonfly*) -+ use_threads=false ;; - *-bsdi[234]*) - # Thread signals do not work reliably on some versions of BSD/OS. - use_threads=false ;; -@@ -16956,27 +16958,10 @@ case "$use_libjson" in - libjson_libs="" - ;; - auto|yes) -- for d in /usr /usr/local /opt/local -- do -- if test -f "${d}/include/json/json.h" -- then -- if test ${d} != /usr -- then -- libjson_cflags="-I ${d}/include" -- LIBS="$LIBS -L${d}/lib" -- fi -- have_libjson="yes" -- elif test -f "${d}/include/json-c/json.h" -- then -- if test ${d} != /usr -- then -- libjson_cflags="-I ${d}/include" -- LIBS="$LIBS -L${d}/lib" -- fi -- have_libjson="yes" -- have_libjson_c="yes" -- fi -- done -+ libjson_cflags="`pkg-config --cflags json-c`" -+ LIBS="$LIBS `pkg-config --libs json-c`" -+ have_libjson="yes" -+ have_libjson_c="yes" - ;; - *) - if test -f "${use_libjson}/include/json/json.h" -@@ -21861,7 +21846,7 @@ $as_echo "no" >&6; } - fi - if test -n "-L$use_dlz_postgres_lib -lpq" - then -- DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L$use_dlz_postgres_lib -lpq" -+ DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${PREFIX}/lib -lpq" - fi - - diff --git a/net/bind910/patches/patch-contrib_dlz_config.dlz.in b/net/bind910/patches/patch-contrib_dlz_config.dlz.in deleted file mode 100644 index dd6f1e6fb7c..00000000000 --- a/net/bind910/patches/patch-contrib_dlz_config.dlz.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-contrib_dlz_config.dlz.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $ - -* Link proper postgresql library. - ---- contrib/dlz/config.dlz.in.orig 2012-06-01 15:29:52.000000000 +0000 -+++ contrib/dlz/config.dlz.in -@@ -105,7 +105,7 @@ case "$use_dlz_postgres" in - *) - DLZ_ADD_DRIVER(POSTGRES, dlz_postgres_driver, - [-I$use_dlz_postgres], -- [-L$use_dlz_postgres_lib -lpq]) -+ [-L${PREFIX}/lib -lpq]) - - AC_MSG_RESULT( - [using PostgreSQL from $use_dlz_postgres_lib and $use_dlz_postgres]) diff --git a/net/bind910/patches/patch-lib_dns_rbt.c b/net/bind910/patches/patch-lib_dns_rbt.c deleted file mode 100644 index f9252286497..00000000000 --- a/net/bind910/patches/patch-lib_dns_rbt.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-lib_dns_rbt.c,v 1.5 2016/07/19 01:08:05 taca Exp $ - -* Disable inline on powerpc. - ---- lib/dns/rbt.c.orig 2016-07-13 23:58:03.000000000 +0000 -+++ lib/dns/rbt.c -@@ -348,6 +348,10 @@ hexdump(const char *desc, unsigned char - } - #endif /* DEBUG */ - -+#if !defined(inline) && defined(__powerpc__) -+#define inline /**/ -+#endif -+ - #ifdef DNS_RBT_USEHASH - - /* diff --git a/net/bind910/patches/patch-lib_dns_zone.c b/net/bind910/patches/patch-lib_dns_zone.c deleted file mode 100644 index 10dd77a6469..00000000000 --- a/net/bind910/patches/patch-lib_dns_zone.c +++ /dev/null @@ -1,143 +0,0 @@ -$NetBSD: patch-lib_dns_zone.c,v 1.1 2018/09/23 14:27:07 taca Exp $ - -* Backport change between BIND 9.11.4-P1 and 9.11.4-P2. - ---- lib/dns/zone.c.orig 2018-07-24 17:26:47.000000000 +0000 -+++ lib/dns/zone.c -@@ -1725,6 +1725,10 @@ dns_zone_isdynamic(dns_zone_t *zone, isc - (zone->type == dns_zone_redirect && zone->masters != NULL)) - return (ISC_TRUE); - -+ /* Inline zones are always dynamic. */ -+ if (zone->type == dns_zone_master && zone->raw != NULL) -+ return (ISC_TRUE); -+ - /* If !ignore_freeze, we need check whether updates are disabled. */ - if (zone->type == dns_zone_master && - (!zone->update_disabled || ignore_freeze) && -@@ -1737,6 +1741,11 @@ dns_zone_isdynamic(dns_zone_t *zone, isc - } - - /* -+ * Note: when dealing with inline-signed zones, external callers will always -+ * call zone_load() for the secure zone; zone_load() calls itself recursively -+ * in order to load the raw zone. -+ */ -+/* - * Set the response policy index and information for a zone. - */ - isc_result_t -@@ -1830,6 +1839,28 @@ zone_load(dns_zone_t *zone, unsigned int - INSIST(zone != zone->raw); - hasraw = inline_secure(zone); - if (hasraw) { -+ /* -+ * We are trying to load an inline-signed zone. First call -+ * self recursively to try loading the raw version of the zone. -+ * Assuming the raw zone file is readable, there are two -+ * possibilities: -+ * -+ * a) the raw zone was not yet loaded and thus it will be -+ * loaded now, synchronously; if this succeeds, a -+ * subsequent attempt to load the signed zone file will -+ * take place and thus zone_postload() will be called -+ * twice: first for the raw zone and then for the secure -+ * zone; the latter call will take care of syncing the raw -+ * version with the secure version, -+ * -+ * b) the raw zone was already loaded and we are trying to -+ * reload it, which will happen asynchronously; this means -+ * zone_postload() will only be called for the raw zone -+ * because "result" returned by the zone_load() call below -+ * will not be ISC_R_SUCCESS but rather DNS_R_CONTINUE; -+ * zone_postload() called for the raw zone will take care -+ * of syncing the raw version with the secure version. -+ */ - result = zone_load(zone->raw, flags, ISC_FALSE); - if (result != ISC_R_SUCCESS) { - if (!locked) -@@ -1869,7 +1900,7 @@ zone_load(dns_zone_t *zone, unsigned int - * zone being reloaded. Do nothing - the database - * we already have is guaranteed to be up-to-date. - */ -- if (zone->type == dns_zone_master) -+ if (zone->type == dns_zone_master && !hasraw) - result = DNS_R_DYNAMIC; - else - result = ISC_R_SUCCESS; -@@ -1912,7 +1943,6 @@ zone_load(dns_zone_t *zone, unsigned int - goto cleanup; - } - -- - /* - * If the file modification time is in the past - * set loadtime to that value. -@@ -4401,11 +4431,13 @@ zone_postload(dns_zone_t *zone, dns_db_t - ! DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOMERGE) && - ! DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) - { -- if (zone->type == dns_zone_master && -- (zone->update_acl != NULL || zone->ssutable != NULL)) -+ if (zone->type == dns_zone_master && (inline_secure(zone) || -+ (zone->update_acl != NULL || zone->ssutable != NULL))) -+ { - options = DNS_JOURNALOPT_RESIGN; -- else -+ } else { - options = 0; -+ } - result = dns_journal_rollforward(zone->mctx, db, options, - zone->journal); - if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND && -@@ -4547,14 +4579,14 @@ zone_postload(dns_zone_t *zone, dns_db_t - !isc_serial_gt(serial, oldserial)) { - isc_uint32_t serialmin, serialmax; - -- INSIST(zone->type == dns_zone_master); -+ INSIST(zone->raw == NULL); - - if (serial == oldserial && - zone_unchanged(zone->db, db, zone->mctx)) { - dns_zone_log(zone, ISC_LOG_INFO, - "ixfr-from-differences: " - "unchanged"); -- return(ISC_R_SUCCESS); -+ goto done; - } - - serialmin = (oldserial + 1) & 0xffffffffU; -@@ -4778,8 +4810,7 @@ zone_postload(dns_zone_t *zone, dns_db_t - dns_db_issecure(db) ? " (DNSSEC signed)" : ""); - - zone->loadtime = loadtime; -- DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_LOADPENDING); -- return (result); -+ goto done; - - cleanup: - for (inc = ISC_LIST_HEAD(zone->newincludes); -@@ -4816,6 +4847,23 @@ zone_postload(dns_zone_t *zone, dns_db_t - result = ISC_R_SUCCESS; - } - -+ done: -+ DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_LOADPENDING); -+ /* -+ * If this is an inline-signed zone and we were called for the raw -+ * zone, we need to clear DNS_ZONEFLG_LOADPENDING for the secure zone -+ * as well, but only if this is a reload, not an initial zone load: in -+ * the former case, zone_postload() will not be run for the secure -+ * zone; in the latter case, it will be. Check which case we are -+ * dealing with by consulting the DNS_ZONEFLG_LOADED flag for the -+ * secure zone: if it is set, this must be a reload. -+ */ -+ if (inline_raw(zone) && -+ DNS_ZONE_FLAG(zone->secure, DNS_ZONEFLG_LOADED)) -+ { -+ DNS_ZONE_CLRFLAG(zone->secure, DNS_ZONEFLG_LOADPENDING); -+ } -+ - return (result); - } - diff --git a/net/bind910/patches/patch-lib_isc_unix_socket.c b/net/bind910/patches/patch-lib_isc_unix_socket.c deleted file mode 100644 index cc0599a58bf..00000000000 --- a/net/bind910/patches/patch-lib_isc_unix_socket.c +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-lib_isc_unix_socket.c,v 1.1 2018/08/13 13:37:14 maya Exp $ - -Make ENOBUFS a soft error -https://gitlab.isc.org/isc-projects/bind9/issues/462 - ---- lib/isc/unix/socket.c.orig 2018-07-24 17:26:47.000000000 +0000 -+++ lib/isc/unix/socket.c -@@ -255,6 +255,7 @@ typedef enum { poll_idle, poll_active, p - #define SOFT_ERROR(e) ((e) == EAGAIN || \ - (e) == EWOULDBLOCK || \ - (e) == EINTR || \ -+ (e) == ENOBUFS || \ - (e) == 0) - - #define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x) -@@ -1949,7 +1950,7 @@ doio_recv(isc__socket_t *sock, isc_socke - SOFT_OR_HARD(EHOSTDOWN, ISC_R_HOSTDOWN); - /* HPUX 11.11 can return EADDRNOTAVAIL. */ - SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL); -- ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES); -+ SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES); - /* Should never get this one but it was seen. */ - #ifdef ENOPROTOOPT - SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH); -@@ -2146,7 +2147,7 @@ doio_send(isc__socket_t *sock, isc_socke - ALWAYS_HARD(EHOSTDOWN, ISC_R_HOSTUNREACH); - #endif - ALWAYS_HARD(ENETUNREACH, ISC_R_NETUNREACH); -- ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES); -+ SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES); - ALWAYS_HARD(EPERM, ISC_R_HOSTUNREACH); - ALWAYS_HARD(EPIPE, ISC_R_NOTCONNECTED); - ALWAYS_HARD(ECONNRESET, ISC_R_CONNECTIONRESET); diff --git a/net/bind910/patches/patch-lib_lwres_getaddrinfo.c b/net/bind910/patches/patch-lib_lwres_getaddrinfo.c deleted file mode 100644 index 7d467098168..00000000000 --- a/net/bind910/patches/patch-lib_lwres_getaddrinfo.c +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-lib_lwres_getaddrinfo.c,v 1.2 2014/10/14 16:23:19 taca Exp $ - -* Add fix for KAME based implementation. - ---- lib/lwres/getaddrinfo.c.orig 2014-09-16 19:27:15.000000000 +0000 -+++ lib/lwres/getaddrinfo.c -@@ -142,6 +142,10 @@ - #include <lwres/stdlib.h> - #include <lwres/string.h> - -+#ifdef __KAME__ -+#include <net/if.h> -+#endif -+ - #define SA(addr) ((struct sockaddr *)(addr)) - #define SIN(addr) ((struct sockaddr_in *)(addr)) - #define SIN6(addr) ((struct sockaddr_in6 *)(addr)) -@@ -366,14 +370,22 @@ lwres_getaddrinfo(const char *hostname, - p = strchr(ntmp, '%'); - ep = NULL; - -+#ifdef __KAME__ -+ if (p != NULL) { -+ scopeid = if_nametoindex(p + 1); -+ if (scopeid) -+ p = NULL; -+ } -+#endif - /* - * Vendors may want to support non-numeric - * scopeid around here. - */ - -- if (p != NULL) -+ if (p != NULL) { - scopeid = (lwres_uint32_t)strtoul(p + 1, - &ep, 10); -+ } - if (p != NULL && ep != NULL && ep[0] == '\0') - *p = '\0'; - else { diff --git a/net/bind910/patches/patch-lib_lwres_getnameinfo.c b/net/bind910/patches/patch-lib_lwres_getnameinfo.c deleted file mode 100644 index 58643a76f49..00000000000 --- a/net/bind910/patches/patch-lib_lwres_getnameinfo.c +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-lib_lwres_getnameinfo.c,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $ - -* Add fix for KAME based implementation. - ---- lib/lwres/getnameinfo.c.orig 2011-08-30 23:46:53.000000000 +0000 -+++ lib/lwres/getnameinfo.c -@@ -121,6 +121,10 @@ - #include <lwres/netdb.h> - #include "print_p.h" - -+#ifdef __KAME__ -+#include <net/if.h> -+#endif -+ - #include "assert_p.h" - - #define SUCCESS 0 -@@ -272,13 +276,9 @@ lwres_getnameinfo(const struct sockaddr - ((const struct sockaddr_in6 *)sa)->sin6_scope_id) { - char *p = numaddr + strlen(numaddr); - const char *stringscope = NULL; --#if 0 -- if ((flags & NI_NUMERICSCOPE) == 0) { -- /* -- * Vendors may want to add support for -- * non-numeric scope identifier. -- */ -- stringscope = foo; -+#ifdef __KAME__ -+ stringscope = if_indextoname( -+ ((const struct sockaddr_in6 *)sa)->sin6_scope_id); - } - #endif - if (stringscope == NULL) { |