From efd09ce33151b09f6814022aabbcf598feeca586 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 22 Dec 2022 08:36:41 +0000 Subject: [PATCH] update to isc-bind-9.18.10 --- net/isc-bind/Makefile | 3 +-- net/isc-bind/distinfo | 4 ++-- net/isc-bind/patches/patch-bin_dig_dig_c | 4 ++-- net/isc-bind/patches/patch-bin_dig_host_c | 4 ++-- net/isc-bind/patches/patch-bin_dig_nslookup_c | 4 ++-- net/isc-bind/patches/patch-lib_isc_netmgr_netmgr_c | 6 +++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile index df7aca90f72..01c2f4f6ab5 100644 --- a/net/isc-bind/Makefile +++ b/net/isc-bind/Makefile @@ -2,7 +2,7 @@ COMMENT= Berkeley Internet Name Daemon: DNS server and tools # Second digits: odd numbers devel, even numbers stable, # ESV branched occasionally. 9.16.x is ESV. -V= 9.18.9 +V= 9.18.10 SUBST_VARS+= V PORTROACH= limitw:1,even EXTRACT_SUFX= .tar.xz @@ -11,7 +11,6 @@ PATCH_DIST_STRIP= -p1 DISTNAME= bind-$V PKGNAME= isc-bind-${V:S/-P/pl/} -REVISION= 2 CATEGORIES= net diff --git a/net/isc-bind/distinfo b/net/isc-bind/distinfo index ca1151f5d37..e80f4076025 100644 --- a/net/isc-bind/distinfo +++ b/net/isc-bind/distinfo @@ -1,2 +1,2 @@ -SHA256 (bind-9.18.9.tar.xz) = apZlmY1WhgRGDfCRj8jM+tfSk4jU2EJWDAVswhHLskM= -SIZE (bind-9.18.9.tar.xz) = 5281732 +SHA256 (bind-9.18.10.tar.xz) = 9BWpL+tiVotQhUoGPLIx4lc1H4ZyGG0KsDGkmz3iysY= +SIZE (bind-9.18.10.tar.xz) = 5261572 diff --git a/net/isc-bind/patches/patch-bin_dig_dig_c b/net/isc-bind/patches/patch-bin_dig_dig_c index 008e0b8320a..dc020971206 100644 --- a/net/isc-bind/patches/patch-bin_dig_dig_c +++ b/net/isc-bind/patches/patch-bin_dig_dig_c @@ -12,7 +12,7 @@ Index: bin/dig/dig.c #include #include -@@ -3026,6 +3027,15 @@ dig_setup(int argc, char **argv) { +@@ -3035,6 +3036,15 @@ dig_setup(int argc, char **argv) { ISC_LIST_INIT(server_list); ISC_LIST_INIT(search_list); @@ -28,7 +28,7 @@ Index: bin/dig/dig.c debug("dig_setup()"); /* setup dighost callbacks */ -@@ -3057,6 +3067,21 @@ dig_query_setup(bool is_batchfile, bool config_only, i +@@ -3066,6 +3076,21 @@ dig_query_setup(bool is_batchfile, bool config_only, i } else if (keysecret[0] != 0) { setup_text_key(); } diff --git a/net/isc-bind/patches/patch-bin_dig_host_c b/net/isc-bind/patches/patch-bin_dig_host_c index 021a3359800..d7195c2668c 100644 --- a/net/isc-bind/patches/patch-bin_dig_host_c +++ b/net/isc-bind/patches/patch-bin_dig_host_c @@ -12,7 +12,7 @@ Index: bin/dig/host.c #include #include -@@ -900,6 +901,15 @@ main(int argc, char **argv) { +@@ -908,6 +909,15 @@ main(int argc, char **argv) { dighost_trying = trying; dighost_shutdown = host_shutdown; @@ -28,7 +28,7 @@ Index: bin/dig/host.c debug("main()"); progname = argv[0]; pre_parse_args(argc, argv); -@@ -913,6 +923,21 @@ main(int argc, char **argv) { +@@ -921,6 +931,21 @@ main(int argc, char **argv) { } else if (keysecret[0] != 0) { setup_text_key(); } diff --git a/net/isc-bind/patches/patch-bin_dig_nslookup_c b/net/isc-bind/patches/patch-bin_dig_nslookup_c index 5f853ac6258..e275f835d93 100644 --- a/net/isc-bind/patches/patch-bin_dig_nslookup_c +++ b/net/isc-bind/patches/patch-bin_dig_nslookup_c @@ -4,7 +4,7 @@ locale is needed for idn2. Index: bin/dig/nslookup.c --- bin/dig/nslookup.c.orig +++ bin/dig/nslookup.c -@@ -940,6 +940,15 @@ main(int argc, char **argv) { +@@ -941,6 +941,15 @@ main(int argc, char **argv) { result = isc_app_start(); check_result(result, "isc_app_start"); @@ -20,7 +20,7 @@ Index: bin/dig/nslookup.c setup_libs(); progname = argv[0]; -@@ -950,6 +959,21 @@ main(int argc, char **argv) { +@@ -951,6 +960,21 @@ main(int argc, char **argv) { } else if (keysecret[0] != 0) { setup_text_key(); } diff --git a/net/isc-bind/patches/patch-lib_isc_netmgr_netmgr_c b/net/isc-bind/patches/patch-lib_isc_netmgr_netmgr_c index c0031393dba..61f9ec031ce 100644 --- a/net/isc-bind/patches/patch-lib_isc_netmgr_netmgr_c +++ b/net/isc-bind/patches/patch-lib_isc_netmgr_netmgr_c @@ -3,7 +3,7 @@ Patch to use pledge on OpenBSD. Index: lib/isc/netmgr/netmgr.c --- lib/isc/netmgr/netmgr.c.orig +++ lib/isc/netmgr/netmgr.c -@@ -3285,7 +3285,8 @@ isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_famil +@@ -3288,7 +3288,8 @@ isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_famil * Disable the Path MTU Discovery on IP packets */ if (sa_family == AF_INET6) { @@ -13,7 +13,7 @@ Index: lib/isc/netmgr/netmgr.c if (setsockopt_off(fd, IPPROTO_IPV6, IPV6_DONTFRAG) == -1) { return (ISC_R_FAILURE); } else { -@@ -3303,7 +3304,12 @@ isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_famil +@@ -3306,7 +3307,12 @@ isc__nm_socket_disable_pmtud(uv_os_sock_t fd, sa_famil UNUSED(fd); #endif } else if (sa_family == AF_INET) { @@ -27,7 +27,7 @@ Index: lib/isc/netmgr/netmgr.c if (setsockopt_off(fd, IPPROTO_IP, IP_DONTFRAG) == -1) { return (ISC_R_FAILURE); } else { -@@ -3333,7 +3339,11 @@ isc__nm_socket_v6only(uv_os_sock_t fd, sa_family_t sa_ +@@ -3336,7 +3342,11 @@ isc__nm_socket_v6only(uv_os_sock_t fd, sa_family_t sa_ * Enable the IPv6-only option on IPv6 sockets */ if (sa_family == AF_INET6) {