pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/bind916
Module Name: pkgsrc
Committed By: taca
Date: Wed Jun 2 15:37:06 UTC 2021
Modified Files:
pkgsrc/net/bind916: Makefile distinfo
pkgsrc/net/bind916/patches: patch-lib_isc_task.c
patch-lib_isc_unix_socket.c
Log Message:
net/bind916: update to 9.11.32
Notes for BIND 9.16.16
Feature Changes
* DNSSEC responses containing NSEC3 records with iteration counts greater
than 150 are now treated as insecure. [GL #2445]
* The maximum supported number of NSEC3 iterations that can be configured
for a zone has been reduced to 150. [GL #2642]
* The default value of the max-ixfr-ratio option was changed to unlimited,
for better backwards compatibility in the stable release series. [GL
#2671]
* Zones that want to transition from secure to insecure mode without
becoming bogus in the process must now have their dnssec-policy changed
first to insecure, rather than none. After the DNSSEC records have been
removed from the zone, the dnssec-policy can be set to none or removed
from the configuration. Setting the dnssec-policy to insecure causes CDS
and CDNSKEY DELETE records to be published. [GL #2645]
* The implementation of the ZONEMD RR type has been updated to match RFC
8976. [GL #2658]
* The draft-vandijk-dnsop-nsec-ttl IETF draft was implemented: NSEC(3) TTL
values are now set to the minimum of the SOA MINIMUM value or the SOA TTL.
[GL #2347]
Bug Fixes
* It was possible for corrupt journal files generated by an earlier version
of named to cause problems after an upgrade. This has been fixed. [GL
#2670]
* TTL values in cache dumps were reported incorrectly when
stale-cache-enable was set to yes. This has been fixed. [GL #389] [GL
#2289]
* A deadlock could occur when multiple rndc addzone, rndc delzone, and/or
rndc modzone commands were invoked simultaneously for different zones.
This has been fixed. [GL #2626]
* named and named-checkconf did not report an error when multiple zones with
the dnssec-policy option set were using the same zone file. This has been
fixed. [GL #2603]
* If dnssec-policy was active and a private key file was temporarily offline
during a rekey event, named could incorrectly introduce replacement keys
and break a signed zone. This has been fixed. [GL #2596]
* When generating zone signing keys, KASP now also checks for key ID
conflicts among newly created keys, rather than just between new and
existing ones. [GL #2628]
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/bind916/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/bind916/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind916/patches/patch-lib_isc_task.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/bind916/Makefile
diff -u pkgsrc/net/bind916/Makefile:1.14 pkgsrc/net/bind916/Makefile:1.15
--- pkgsrc/net/bind916/Makefile:1.14 Mon May 24 19:53:15 2021
+++ pkgsrc/net/bind916/Makefile Wed Jun 2 15:37:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/05/24 19:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2021/06/02 15:37:06 taca Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
@@ -16,7 +16,7 @@ CONFLICTS+= host-[0-9]*
MAKE_JOBS_SAFE= no
-BIND_VERSION= 9.16.15
+BIND_VERSION= 9.16.16
BUILD_DEFS+= BIND_DIR VARBASE
Index: pkgsrc/net/bind916/distinfo
diff -u pkgsrc/net/bind916/distinfo:1.12 pkgsrc/net/bind916/distinfo:1.13
--- pkgsrc/net/bind916/distinfo:1.12 Thu Apr 29 05:55:54 2021
+++ pkgsrc/net/bind916/distinfo Wed Jun 2 15:37:06 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2021/04/29 05:55:54 taca Exp $
+$NetBSD: distinfo,v 1.13 2021/06/02 15:37:06 taca Exp $
-SHA1 (bind-9.16.15.tar.xz) = 5d68bbd1ff452708d45f2d4ef832faa3a1690fc7
-RMD160 (bind-9.16.15.tar.xz) = 5697b6b0a0d67022f1e279f27c413b739fa2de4d
-SHA512 (bind-9.16.15.tar.xz) = 30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033
-Size (bind-9.16.15.tar.xz) = 5025688 bytes
+SHA1 (bind-9.16.16.tar.xz) = dc37a919ba83674d1ff48558b640907b7a7dd0a7
+RMD160 (bind-9.16.16.tar.xz) = 3e6d92c834b91bd25122278ac6e9f41795040213
+SHA512 (bind-9.16.16.tar.xz) = 264aa70d0d111ddb2a62c65f57e3eeb7eb93afdebcc523166d236e8f23d61d1e4f91b5a2df8dffa49e6f8e3c7101a2689c38dd6d77ecdedb79e2b163990e6093
+Size (bind-9.16.16.tar.xz) = 5016864 bytes
SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
@@ -43,10 +43,10 @@ SHA1 (patch-lib_isc_include_isc_types.h)
SHA1 (patch-lib_isc_netmgr_netmgr.c) = 63168c8901646e7b2079e1dc3324087508bb1e62
SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82
SHA1 (patch-lib_isc_stats.c) = 024a372d9919fa751b894f8fc8267691297f00f4
-SHA1 (patch-lib_isc_task.c) = 103a23c74888edd3ddee0793ce6531cd2e6b87f3
+SHA1 (patch-lib_isc_task.c) = 1947084d986f8e7fda5babd308171c498e20b7ec
SHA1 (patch-lib_isc_unix_include_isc_align.h) = 1bbd78f1617a40079d1044175cfe037bbd1d95b2
SHA1 (patch-lib_isc_unix_net.c) = c654f60a1feefdba9bf980dcfa46ce37f46918aa
-SHA1 (patch-lib_isc_unix_socket.c) = a034eebc922a3266fdf5acc5fe849709eccbb6ca
+SHA1 (patch-lib_isc_unix_socket.c) = ed1816b50698107cb2034e0e3c61406ee458e697
SHA1 (patch-lib_isc_unix_time.c) = fac9e66754e099f53ba8c499f5f179825a0b0fbd
SHA1 (patch-lib_ns_Makefile.in) = 5d3ecf4d6673cf227635c03779e9969e6eeb8227
SHA1 (patch-lib_ns_client.c) = c5d9e41f58027bdfa6a1cb43cd2cd35b44e85227
Index: pkgsrc/net/bind916/patches/patch-lib_isc_task.c
diff -u pkgsrc/net/bind916/patches/patch-lib_isc_task.c:1.1 pkgsrc/net/bind916/patches/patch-lib_isc_task.c:1.2
--- pkgsrc/net/bind916/patches/patch-lib_isc_task.c:1.1 Sun Aug 9 15:20:22 2020
+++ pkgsrc/net/bind916/patches/patch-lib_isc_task.c Wed Jun 2 15:37:06 2021
@@ -1,22 +1,10 @@
-$NetBSD: patch-lib_isc_task.c,v 1.1 2020/08/09 15:20:22 taca Exp $
+$NetBSD: patch-lib_isc_task.c,v 1.2 2021/06/02 15:37:06 taca Exp $
* Take from NetBSD base.
---- lib/isc/task.c.orig 2020-05-06 09:59:35.000000000 +0000
+--- lib/isc/task.c.orig 2021-05-12 09:53:16.000000000 +0000
+++ lib/isc/task.c
-@@ -1381,8 +1381,11 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
- REQUIRE(managerp != NULL && *managerp == NULL);
-
- manager = isc_mem_get(mctx, sizeof(*manager));
-+#ifndef __lint__
-+// XXX: bug
- *manager = (isc__taskmgr_t){ .common.impmagic = TASK_MANAGER_MAGIC,
- .common.magic = ISCAPI_TASKMGR_MAGIC };
-+#endif
-
- atomic_store(&manager->mode, isc_taskmgrmode_normal);
- isc_mutex_init(&manager->lock);
-@@ -1431,7 +1434,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
+@@ -1412,7 +1412,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsi
isc_thread_create(run, &manager->queues[i],
&manager->queues[i].thread);
char name[21];
Index: pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c
diff -u pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c:1.4 pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c:1.5
--- pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c:1.4 Sat Nov 7 14:28:31 2020
+++ pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c Wed Jun 2 15:37:06 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_isc_unix_socket.c,v 1.4 2020/11/07 14:28:31 taca Exp $
+$NetBSD: patch-lib_isc_unix_socket.c,v 1.5 2021/06/02 15:37:06 taca Exp $
* Apply fixes from NetBSD base system.
* Fix build on SmartOS. In this special case, _XOPEN_SOURCE has to be only
defined on SmartOS.
---- lib/isc/unix/socket.c.orig 2020-08-10 09:31:13.000000000 +0000
+--- lib/isc/unix/socket.c.orig 2021-05-12 09:53:16.000000000 +0000
+++ lib/isc/unix/socket.c
@@ -11,6 +11,15 @@
@@ -22,7 +22,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
#include <inttypes.h>
#include <stdbool.h>
#include <sys/param.h>
-@@ -362,7 +371,11 @@ struct isc__socket {
+@@ -360,7 +369,11 @@ struct isc_socket {
unsigned char overflow; /* used for MSG_TRUNC fake */
#endif /* ifdef ISC_PLATFORM_RECVOVERFLOW */
@@ -35,22 +35,22 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
};
#define SOCKET_MANAGER_MAGIC ISC_MAGIC('I', 'O', 'm', 'g')
-@@ -471,6 +484,14 @@ static bool
+@@ -469,6 +482,14 @@ static bool
process_ctlfd(isc__socketthread_t *thread);
static void
- setdscp(isc__socket_t *sock, isc_dscp_t dscp);
+ setdscp(isc_socket_t *sock, isc_dscp_t dscp);
+static void
-+dispatch_recv(isc__socket_t *sock);
++dispatch_recv(isc_socket_t *sock);
+static void
-+dispatch_send(isc__socket_t *sock);
++dispatch_send(isc_socket_t *sock);
+static void
-+internal_fdwatch_read(isc__socket_t *sock);
++internal_fdwatch_read(isc_socket_t *sock);
+static void
-+internal_fdwatch_write(isc__socket_t *sock);
++internal_fdwatch_write(isc_socket_t *sock);
#define SELECT_POKE_SHUTDOWN (-1)
#define SELECT_POKE_NOTHING (-2)
-@@ -1558,6 +1579,7 @@ doio_recv(isc__socket_t *sock, isc_socke
+@@ -1573,6 +1594,7 @@ doio_recv(isc_socket_t *sock, isc_socket
case isc_sockettype_udp:
case isc_sockettype_raw:
break;
@@ -58,7 +58,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
default:
INSIST(0);
ISC_UNREACHABLE();
-@@ -1766,9 +1788,26 @@ socketclose(isc__socketthread_t *thread,
+@@ -1781,9 +1803,26 @@ socketclose(isc__socketthread_t *thread,
*/
LOCK(&thread->fdlock[lockid]);
thread->fds[fd] = NULL;
@@ -87,7 +87,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
inc_stats(thread->manager->stats, sock->statsindex[STATID_CLOSE]);
-@@ -2154,6 +2193,13 @@ again:
+@@ -2164,6 +2203,13 @@ again:
}
#endif /* if defined(PF_ROUTE) */
break;
@@ -101,7 +101,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
}
} else {
sock->fd = dup(dup_socket->fd);
-@@ -2447,6 +2493,7 @@ socket_create(isc_socketmgr_t *manager0,
+@@ -2456,6 +2502,7 @@ socket_create(isc_socketmgr_t *manager,
REQUIRE(VALID_MANAGER(manager));
REQUIRE(socketp != NULL && *socketp == NULL);
@@ -109,7 +109,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
result = allocate_socket(manager, type, &sock);
if (result != ISC_R_SUCCESS) {
-@@ -2564,6 +2611,7 @@ isc_socket_open(isc_socket_t *sock0) {
+@@ -2570,6 +2617,7 @@ isc_socket_open(isc_socket_t *sock) {
REQUIRE(isc_refcount_current(&sock->references) >= 1);
REQUIRE(sock->fd == -1);
REQUIRE(sock->threadid == -1);
@@ -117,7 +117,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
result = opensocket(sock->manager, sock, NULL);
-@@ -2645,6 +2693,7 @@ isc_socket_close(isc_socket_t *sock0) {
+@@ -2648,6 +2696,7 @@ isc_socket_close(isc_socket_t *sock) {
LOCK(&sock->lock);
@@ -125,12 +125,12 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
REQUIRE(sock->fd >= 0 && sock->fd < (int)sock->manager->maxsocks);
INSIST(!sock->connecting);
-@@ -2675,6 +2724,24 @@ isc_socket_close(isc_socket_t *sock0) {
+@@ -2678,6 +2727,24 @@ isc_socket_close(isc_socket_t *sock) {
return (ISC_R_SUCCESS);
}
+static void
-+dispatch_recv(isc__socket_t *sock) {
++dispatch_recv(isc_socket_t *sock) {
+ if (sock->type != isc_sockettype_fdwatch) {
+ internal_recv(sock);
+ } else {
@@ -139,7 +139,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
+}
+
+static void
-+dispatch_send(isc__socket_t *sock) {
++dispatch_send(isc_socket_t *sock) {
+ if (sock->type != isc_sockettype_fdwatch) {
+ internal_send(sock);
+ } else {
@@ -150,12 +150,12 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
/*
* Dequeue an item off the given socket's read queue, set the result code
* in the done event to the one provided, and send it to the task it was
-@@ -3115,6 +3182,64 @@ finish:
+@@ -3118,6 +3185,64 @@ finish:
}
}
+static void
-+internal_fdwatch_write(isc__socket_t *sock)
++internal_fdwatch_write(isc_socket_t *sock)
+{
+ int more_data;
+
@@ -184,7 +184,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
+}
+
+static void
-+internal_fdwatch_read(isc__socket_t *sock)
++internal_fdwatch_read(isc_socket_t *sock)
+{
+ int more_data;
+
@@ -215,7 +215,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
/*
* Process read/writes on each fd here. Avoid locking
* and unlocking twice if both reads and writes are possible.
-@@ -3162,7 +3287,7 @@ process_fd(isc__socketthread_t *thread,
+@@ -3165,7 +3290,7 @@ process_fd(isc__socketthread_t *thread,
if (sock->connecting) {
internal_connect(sock);
} else {
@@ -224,7 +224,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
}
}
-@@ -3170,7 +3295,7 @@ process_fd(isc__socketthread_t *thread,
+@@ -3173,7 +3298,7 @@ process_fd(isc__socketthread_t *thread,
if (sock->listener) {
internal_accept(sock); /* unlocks sock */
} else {
@@ -233,7 +233,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
UNLOCK(&sock->lock);
}
} else {
-@@ -5274,7 +5399,7 @@ static isc_once_t hasreuseport_once = IS
+@@ -5238,7 +5363,7 @@ static isc_once_t hasreuseport_once = IS
static bool hasreuseport = false;
static void
@@ -242,7 +242,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
/*
* SO_REUSEPORT works very differently on *BSD and on Linux (because why not).
* We only want to use it on Linux, if it's available. On BSD we want to dup()
-@@ -5328,6 +5453,8 @@ _socktype(isc_sockettype_t type) {
+@@ -5292,6 +5417,8 @@ _socktype(isc_sockettype_t type) {
return ("tcp");
case isc_sockettype_unix:
return ("unix");
@@ -251,16 +251,16 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
default:
return ("not-initialized");
}
-@@ -5340,7 +5467,7 @@ _socktype(isc_sockettype_t type) {
+@@ -5304,7 +5431,7 @@ _socktype(isc_sockettype_t type) {
xmlrc = (a); \
if (xmlrc < 0) \
goto error; \
- } while (0)
+ } while (/*CONSTCOND*/0)
int
- isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) {
- isc__socketmgr_t *mgr = (isc__socketmgr_t *)mgr0;
-@@ -5447,7 +5574,7 @@ error:
+ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0) {
+ isc_socket_t *sock = NULL;
+@@ -5410,7 +5537,7 @@ error:
result = ISC_R_NOMEMORY; \
goto error; \
} \
@@ -268,8 +268,8 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
+ } while (/*CONSTCOND*/0)
isc_result_t
- isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, void *stats0) {
-@@ -5569,3 +5696,112 @@ isc_socketmgr_createinctx(isc_mem_t *mct
+ isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0) {
+@@ -5521,4 +5648,113 @@ error:
return (result);
}
@@ -286,7 +286,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
+ isc_task_t *task, isc_socket_t **socketp)
+{
+ isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0;
-+ isc__socket_t *sock = NULL;
++ isc_socket_t *sock = NULL;
+ isc__socketthread_t *thread;
+ isc_result_t result;
+ int lockid;
@@ -358,7 +358,7 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
+isc_result_t
+isc_socket_fdwatchpoke(isc_socket_t *sock0, int flags)
+{
-+ isc__socket_t *sock = (isc__socket_t *)sock0;
++ isc_socket_t *sock = (isc_socket_t *)sock0;
+
+ REQUIRE(VALID_SOCKET(sock));
+
@@ -382,3 +382,4 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
+
+ return (ISC_R_SUCCESS);
+}
+ #endif /* HAVE_JSON_C */
Home |
Main Index |
Thread Index |
Old Index