update to bind-9.11.10
This commit is contained in:
sthen
parent
702957f67f
commit
2c7731e662
@ -1,18 +1,18 @@
|
||||
# $OpenBSD: Makefile,v 1.95 2019/07/27 14:01:45 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.96 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
COMMENT= Berkeley Internet Name Daemon: DNS server and tools
|
||||
|
||||
# 9.11 is an ESV. After 9.11 the format changes: odd numbers are devel,
|
||||
# even numbers are stable (and for stable branches, point releases are
|
||||
# bug fixes only). The next ESV will be 9.16.
|
||||
V= 9.11.9
|
||||
V= 9.11.10
|
||||
EPOCH= 0
|
||||
|
||||
DISTNAME= bind-$V
|
||||
PKGNAME= isc-bind-${V:S/-P/pl/}
|
||||
|
||||
# in shared_libs.log but not installed: isc-nosymtbl, t_api
|
||||
SHARED_LIBS += isc 4.1
|
||||
SHARED_LIBS += isc 4.2
|
||||
SHARED_LIBS += isccc 2.0
|
||||
SHARED_LIBS += dns 8.0
|
||||
SHARED_LIBS += isccfg 3.0
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (bind-9.11.9.tar.gz) = ljvwSDVHlbhbjz2+P/W6Uk0/WxS4akzHM/z5cbQ6xQ4=
|
||||
SIZE (bind-9.11.9.tar.gz) = 8159746
|
||||
SHA256 (bind-9.11.10.tar.gz) = sruEDNog5nca6MBUAHtOwS4btqpr/nkQKJDrlJVqcMM=
|
||||
SIZE (bind-9.11.10.tar.gz) = 8174257
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
$OpenBSD: patch-bin_dig_dig_c,v 1.10 2019/03/01 17:17:08 sthen Exp $
|
||||
$OpenBSD: patch-bin_dig_dig_c,v 1.11 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
Index: bin/dig/dig.c
|
||||
--- bin/dig/dig.c.orig
|
||||
+++ bin/dig/dig.c
|
||||
@@ -2244,6 +2244,11 @@ void dig_setup(int argc, char **argv)
|
||||
@@ -2251,6 +2251,11 @@ void dig_setup(int argc, char **argv)
|
||||
ISC_LIST_INIT(server_list);
|
||||
ISC_LIST_INIT(search_list);
|
||||
|
||||
@ -14,7 +15,7 @@ Index: bin/dig/dig.c
|
||||
debug("dig_setup()");
|
||||
|
||||
/* setup dighost callbacks */
|
||||
@@ -2271,6 +2276,13 @@ void dig_query_setup(bool is_batchfile, bool config_on
|
||||
@@ -2278,6 +2283,13 @@ void dig_query_setup(bool is_batchfile, bool config_on
|
||||
debug("dig_query_setup");
|
||||
|
||||
parse_args(is_batchfile, config_only, argc, argv);
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-bin_dig_host_c,v 1.8 2019/03/01 17:17:08 sthen Exp $
|
||||
$OpenBSD: patch-bin_dig_host_c,v 1.9 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
Index: bin/dig/host.c
|
||||
--- bin/dig/host.c.orig
|
||||
+++ bin/dig/host.c
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-bin_dig_nslookup_c,v 1.9 2019/03/01 17:17:08 sthen Exp $
|
||||
$OpenBSD: patch-bin_dig_nslookup_c,v 1.10 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
Index: bin/dig/nslookup.c
|
||||
--- bin/dig/nslookup.c.orig
|
||||
+++ bin/dig/nslookup.c
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-bin_named_include_named_globals_h,v 1.10 2018/12/02 13:25:44 sthen Exp $
|
||||
$OpenBSD: patch-bin_named_include_named_globals_h,v 1.11 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
Index: bin/named/include/named/globals.h
|
||||
--- bin/named/include/named/globals.h.orig
|
||||
+++ bin/named/include/named/globals.h
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-lib_isc_Makefile_in,v 1.3 2018/07/12 10:12:30 sthen Exp $
|
||||
$OpenBSD: patch-lib_isc_Makefile_in,v 1.4 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
Index: lib/isc/Makefile.in
|
||||
--- lib/isc/Makefile.in.orig
|
||||
|
||||
@ -1,8 +1,23 @@
|
||||
$OpenBSD: patch-lib_isc_unix_net_c,v 1.7 2019/03/01 17:17:08 sthen Exp $
|
||||
$OpenBSD: patch-lib_isc_unix_net_c,v 1.8 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
Index: lib/isc/unix/net.c
|
||||
--- lib/isc/unix/net.c.orig
|
||||
+++ lib/isc/unix/net.c
|
||||
@@ -731,7 +731,7 @@ try_dscp_v6(void) {
|
||||
@@ -255,6 +255,13 @@ isc_net_probeunix(void) {
|
||||
#ifdef WANT_IPV6
|
||||
static void
|
||||
try_ipv6only(void) {
|
||||
+#ifdef __OpenBSD__
|
||||
+/*
|
||||
+ * pledge doesn't allow setting IPV6_V6ONLY, but that's ok,
|
||||
+ * IPV6_V6ONLY is always enabled on OpenBSD;
|
||||
+ */
|
||||
+#undef IPV6_V6ONLY
|
||||
+#endif
|
||||
#ifdef IPV6_V6ONLY
|
||||
int s, on;
|
||||
char strbuf[ISC_STRERRORSIZE];
|
||||
@@ -731,7 +738,7 @@ try_dscp_v6(void) {
|
||||
if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, &dscp, sizeof(dscp)) == 0)
|
||||
dscp_result |= ISC_NET_DSCPSETV6;
|
||||
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-lib_isc_unix_socket_c,v 1.13 2019/05/17 12:52:46 sthen Exp $
|
||||
$OpenBSD: patch-lib_isc_unix_socket_c,v 1.14 2019/08/22 16:16:46 sthen Exp $
|
||||
|
||||
Index: lib/isc/unix/socket.c
|
||||
--- lib/isc/unix/socket.c.orig
|
||||
+++ lib/isc/unix/socket.c
|
||||
@ -11,3 +12,17 @@ Index: lib/isc/unix/socket.c
|
||||
if ((sock->pf == AF_INET6)
|
||||
&& (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVTCLASS,
|
||||
(void *)&on, sizeof(on)) < 0)) {
|
||||
@@ -6387,6 +6387,13 @@ isc__socket_isbound(isc_socket_t *sock0) {
|
||||
void
|
||||
isc__socket_ipv6only(isc_socket_t *sock0, bool yes) {
|
||||
isc__socket_t *sock = (isc__socket_t *)sock0;
|
||||
+#ifdef __OpenBSD__
|
||||
+/*
|
||||
+ * pledge doesn't allow setting IPV6_V6ONLY, but that's ok,
|
||||
+ * IPV6_V6ONLY is always enabled on OpenBSD;
|
||||
+ */
|
||||
+#undef IPV6_V6ONLY
|
||||
+#endif
|
||||
#if defined(IPV6_V6ONLY)
|
||||
int onoff = yes ? 1 : 0;
|
||||
#else
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.15 2018/12/02 13:25:44 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.16 2019/08/22 16:16:47 sthen Exp $
|
||||
@pkgpath net/isc-bind,ratelimit
|
||||
@newgroup _bind:741
|
||||
@newuser _bind:741:_bind:daemon:bind user:/nonexistent:/sbin/nologin
|
||||
@ -148,6 +148,7 @@ include/isc/counter.h
|
||||
include/isc/crc64.h
|
||||
include/isc/deprecated.h
|
||||
include/isc/dir.h
|
||||
include/isc/endian.h
|
||||
include/isc/entropy.h
|
||||
include/isc/errno.h
|
||||
include/isc/error.h
|
||||
@ -212,6 +213,7 @@ include/isc/safe.h
|
||||
include/isc/serial.h
|
||||
include/isc/sha1.h
|
||||
include/isc/sha2.h
|
||||
include/isc/siphash.h
|
||||
include/isc/sockaddr.h
|
||||
include/isc/socket.h
|
||||
include/isc/stat.h
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user