Sat Nov 7 14:26:21 2020 UTC ()
net/bind916: fix build problem

Fix build problem on platform which supports epoll(2).


(taca)
diff -r1.4 -r1.5 pkgsrc/net/bind916/distinfo
diff -r1.2 -r1.3 pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c
cvs diff -r1.4 -r1.5 pkgsrc/net/bind916/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind916/distinfo 2020/09/19 13:09:27 1.4
+++ pkgsrc/net/bind916/distinfo 2020/11/07 14:26:21 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.4 2020/09/19 13:09:27 taca Exp $ 1$NetBSD: distinfo,v 1.5 2020/11/07 14:26:21 taca Exp $
2 2
3SHA1 (bind-9.16.7.tar.xz) = 633667fac05ad1f87d89bddc504b3e1c3fe0549a 3SHA1 (bind-9.16.7.tar.xz) = 633667fac05ad1f87d89bddc504b3e1c3fe0549a
4RMD160 (bind-9.16.7.tar.xz) = 55a5a7cb173ff0bb2214f073c90c2e281daedbd1 4RMD160 (bind-9.16.7.tar.xz) = 55a5a7cb173ff0bb2214f073c90c2e281daedbd1
5SHA512 (bind-9.16.7.tar.xz) = 176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768 5SHA512 (bind-9.16.7.tar.xz) = 176c84657e8a7b10a7ca93c939ca6a7fcdefb22f9200c3f01be59bcd8990dee27b8dc0970299225bcbe0f1aa8f49a67c80c4a9853895ffbcd685adb9674e7768
6Size (bind-9.16.7.tar.xz) = 3241476 bytes 6Size (bind-9.16.7.tar.xz) = 3241476 bytes
7SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98 7SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
8SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8 8SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
9SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb 9SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
10SHA1 (patch-bin_named_main.c) = 408c3f6acd70f20c26801baaa9922091a6a7fe7e 10SHA1 (patch-bin_named_main.c) = 408c3f6acd70f20c26801baaa9922091a6a7fe7e
11SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d 11SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
12SHA1 (patch-bin_nsupdate_nsupdate.c) = 4ccd0e503a972cf16905e999bcc574f8ee0dd85d 12SHA1 (patch-bin_nsupdate_nsupdate.c) = 4ccd0e503a972cf16905e999bcc574f8ee0dd85d
13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e 13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
14SHA1 (patch-bin_tests_system_kasp_tests.sh) = 80b096debade569ca28305f8afee4ffdd1c0a908 14SHA1 (patch-bin_tests_system_kasp_tests.sh) = 80b096debade569ca28305f8afee4ffdd1c0a908
@@ -39,25 +39,25 @@ SHA1 (patch-lib_dns_view.c) = 5b092f0344 @@ -39,25 +39,25 @@ SHA1 (patch-lib_dns_view.c) = 5b092f0344
39SHA1 (patch-lib_dns_zone.c) = 900e84e0de403d601df4c30f22758ab26a2a52b5 39SHA1 (patch-lib_dns_zone.c) = 900e84e0de403d601df4c30f22758ab26a2a52b5
40SHA1 (patch-lib_isc_backtrace.c) = 1b6bca9b3de7f7298882c6c88274b0baf1dad507 40SHA1 (patch-lib_isc_backtrace.c) = 1b6bca9b3de7f7298882c6c88274b0baf1dad507
41SHA1 (patch-lib_isc_hp.c) = 4c9646722297460f0e973bd131439b4ede885588 41SHA1 (patch-lib_isc_hp.c) = 4c9646722297460f0e973bd131439b4ede885588
42SHA1 (patch-lib_isc_include_isc_netmgr.h) = 1b59d94e0236922f8fc3118ad775cb8eecf8f033 42SHA1 (patch-lib_isc_include_isc_netmgr.h) = 1b59d94e0236922f8fc3118ad775cb8eecf8f033
43SHA1 (patch-lib_isc_include_isc_socket.h) = dc6376cd9e8391fa96efd805faee1a5d0647a142 43SHA1 (patch-lib_isc_include_isc_socket.h) = dc6376cd9e8391fa96efd805faee1a5d0647a142
44SHA1 (patch-lib_isc_include_isc_types.h) = bc0cdeb762d974b7be6e602b7dc2aac17fa7fe2f 44SHA1 (patch-lib_isc_include_isc_types.h) = bc0cdeb762d974b7be6e602b7dc2aac17fa7fe2f
45SHA1 (patch-lib_isc_netmgr_netmgr.c) = 63168c8901646e7b2079e1dc3324087508bb1e62 45SHA1 (patch-lib_isc_netmgr_netmgr.c) = 63168c8901646e7b2079e1dc3324087508bb1e62
46SHA1 (patch-lib_isc_netmgr_tcp.c) = f71556e21a6416af012b8d37a9ffb7c3ed4aa986 46SHA1 (patch-lib_isc_netmgr_tcp.c) = f71556e21a6416af012b8d37a9ffb7c3ed4aa986
47SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82 47SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82
48SHA1 (patch-lib_isc_stats.c) = 024a372d9919fa751b894f8fc8267691297f00f4 48SHA1 (patch-lib_isc_stats.c) = 024a372d9919fa751b894f8fc8267691297f00f4
49SHA1 (patch-lib_isc_task.c) = 103a23c74888edd3ddee0793ce6531cd2e6b87f3 49SHA1 (patch-lib_isc_task.c) = 103a23c74888edd3ddee0793ce6531cd2e6b87f3
50SHA1 (patch-lib_isc_unix_include_isc_align.h) = 1bbd78f1617a40079d1044175cfe037bbd1d95b2 50SHA1 (patch-lib_isc_unix_include_isc_align.h) = 1bbd78f1617a40079d1044175cfe037bbd1d95b2
51SHA1 (patch-lib_isc_unix_net.c) = c654f60a1feefdba9bf980dcfa46ce37f46918aa 51SHA1 (patch-lib_isc_unix_net.c) = c654f60a1feefdba9bf980dcfa46ce37f46918aa
52SHA1 (patch-lib_isc_unix_socket.c) = 3178214a578e977ecdcf6e44ac04b25690176a03 52SHA1 (patch-lib_isc_unix_socket.c) = 35d8f2afa566f689bbd80a4dfc29c9be69657e84
53SHA1 (patch-lib_isc_unix_time.c) = fac9e66754e099f53ba8c499f5f179825a0b0fbd 53SHA1 (patch-lib_isc_unix_time.c) = fac9e66754e099f53ba8c499f5f179825a0b0fbd
54SHA1 (patch-lib_ns_Makefile.in) = 5626877ffe97261518f976bb8dd827cdb53668ed 54SHA1 (patch-lib_ns_Makefile.in) = 5626877ffe97261518f976bb8dd827cdb53668ed
55SHA1 (patch-lib_ns_client.c) = e0453a7483a4f899023e0c5ab970cda241976b90 55SHA1 (patch-lib_ns_client.c) = e0453a7483a4f899023e0c5ab970cda241976b90
56SHA1 (patch-lib_ns_include_ns_client.h) = 56009c601d54491ffd16f6438d55206705a5aa23 56SHA1 (patch-lib_ns_include_ns_client.h) = 56009c601d54491ffd16f6438d55206705a5aa23
57SHA1 (patch-lib_ns_include_ns_pfilter.h) = cc86752971b4f9f7492283c4ad3ff29bc1bae237 57SHA1 (patch-lib_ns_include_ns_pfilter.h) = cc86752971b4f9f7492283c4ad3ff29bc1bae237
58SHA1 (patch-lib_ns_interfacemgr.c) = fc31720734b02155acd7fa9b370a6ebb82022532 58SHA1 (patch-lib_ns_interfacemgr.c) = fc31720734b02155acd7fa9b370a6ebb82022532
59SHA1 (patch-lib_ns_pfilter.c) = 14d3d55768ee9abe444ed81ee0839cb9ac67af1f 59SHA1 (patch-lib_ns_pfilter.c) = 14d3d55768ee9abe444ed81ee0839cb9ac67af1f
60SHA1 (patch-lib_ns_query.c) = fb9ee13205a95a7fc52893406dbeaf3145640ea6 60SHA1 (patch-lib_ns_query.c) = fb9ee13205a95a7fc52893406dbeaf3145640ea6
61SHA1 (patch-lib_ns_update.c) = 30468795b1d8ea5b81ad799a395a8a37ec7fa2d0 61SHA1 (patch-lib_ns_update.c) = 30468795b1d8ea5b81ad799a395a8a37ec7fa2d0
62SHA1 (patch-lib_ns_xfrout.c) = 82fe2dd10feaef58a042103b9d417bfeb49d12b7 62SHA1 (patch-lib_ns_xfrout.c) = 82fe2dd10feaef58a042103b9d417bfeb49d12b7
63SHA1 (patch-make_rules.in) = b4e340237b4d444dbd857a8c2a4760182569173d 63SHA1 (patch-make_rules.in) = b4e340237b4d444dbd857a8c2a4760182569173d
cvs diff -r1.2 -r1.3 pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c (expand / switch to unified diff)

--- pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c 2020/08/23 10:03:00 1.2
+++ pkgsrc/net/bind916/patches/patch-lib_isc_unix_socket.c 2020/11/07 14:26:21 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-lib_isc_unix_socket.c,v 1.2 2020/08/23 10:03:00 taca Exp $ 1$NetBSD: patch-lib_isc_unix_socket.c,v 1.3 2020/11/07 14:26:21 taca Exp $
2 2
3* Apply fixes from NetBSD base system. 3* Apply fixes from NetBSD base system.
4* Fix build on SmartOS. In this special case, _XOPEN_SOURCE has to be only 4* Fix build on SmartOS. In this special case, _XOPEN_SOURCE has to be only
5 defined on SmartOS. 5 defined on SmartOS.
6 6
7--- lib/isc/unix/socket.c.orig 2020-08-10 09:31:13.000000000 +0000 7--- lib/isc/unix/socket.c.orig 2020-08-10 09:31:13.000000000 +0000
8+++ lib/isc/unix/socket.c 8+++ lib/isc/unix/socket.c
9@@ -11,6 +11,15 @@ 9@@ -11,6 +11,15 @@
10  10
11 /*! \file */ 11 /*! \file */
12  12
13+/* needed for CMSG_DATA */ 13+/* needed for CMSG_DATA */
14+#if defined(__sun) 14+#if defined(__sun)
@@ -313,27 +313,27 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1 @@ -313,27 +313,27 @@ $NetBSD: patch-lib_isc_unix_socket.c,v 1
313+ *socketp = (isc_socket_t *)sock; 313+ *socketp = (isc_socket_t *)sock;
314+ 314+
315+ /* 315+ /*
316+ * Note we don't have to lock the socket like we normally would because 316+ * Note we don't have to lock the socket like we normally would because
317+ * there are no external references to it yet. 317+ * there are no external references to it yet.
318+ */ 318+ */
319+ 319+
320+ lockid = FDLOCK_ID(sock->fd); 320+ lockid = FDLOCK_ID(sock->fd);
321+ LOCK(&thread->fdlock[lockid]); 321+ LOCK(&thread->fdlock[lockid]);
322+ thread->fds[sock->fd] = sock; 322+ thread->fds[sock->fd] = sock;
323+ thread->fdstate[sock->fd] = MANAGED; 323+ thread->fdstate[sock->fd] = MANAGED;
324+ 324+
325+#if defined(USE_EPOLL) 325+#if defined(USE_EPOLL)
326+ manager->epoll_events[sock->fd] = 0; 326+ therad->epoll_events[sock->fd] = 0;
327+#endif 327+#endif
328+ UNLOCK(&thread->fdlock[lockid]); 328+ UNLOCK(&thread->fdlock[lockid]);
329+ 329+
330+ LOCK(&manager->lock); 330+ LOCK(&manager->lock);
331+ ISC_LIST_APPEND(manager->socklist, sock, link); 331+ ISC_LIST_APPEND(manager->socklist, sock, link);
332+#ifdef USE_SELECT 332+#ifdef USE_SELECT
333+ if (manager->maxfd < sock->fd) 333+ if (manager->maxfd < sock->fd)
334+ manager->maxfd = sock->fd; 334+ manager->maxfd = sock->fd;
335+#endif 335+#endif
336+ UNLOCK(&manager->lock); 336+ UNLOCK(&manager->lock);
337+ 337+
338+ sock->active = 1; 338+ sock->active = 1;
339+ if (flags & ISC_SOCKFDWATCH_READ) 339+ if (flags & ISC_SOCKFDWATCH_READ)