From 5c0092d53e212de054f68e25b21711d4fac50005 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2022 15:24:37 +0000 Subject: [PATCH] net/isc-dhcp4: update to 4.4.3 Internet Systems Consortium DHCP Distribution Version 4.4.3 9 March 2022 Release Notes NEW FEATURES Please note that that ISC DHCP is licensed under the Mozilla Public License, MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0 license terms. NOTE: The client and relay components are now End-Of-Life. 4.4.3 is the final release for those components. For information on how to install, configure, and run this software, as well as how to find documentation and report bugs, please consult the README file. ISC DHCP uses the standard GNU configure command for installation. Please review the output of `./configure --help` to see what options are available. The system has only been tested on Linux and FreeBSD, and may not work on other platforms. Please subscribe to the dhcp-users mailing list at https://lists.isc.org/mailman/listinfo/dhcp-users and report any problems and/or suggested fixes to dhcp-users@lists.isc.org. ISC DHCP is open source software maintained by Internet Systems Consortium. This product includes cryptographic software written by Eric Young (eay@cryptsoft.com). Changes since 4.4.2-P1 (New Features) - Two new OMAPI function calls were added, `dhcpctl_timed_connect()` and `dhcpctl_timed_wait_for_completion()`. These provide timed versions of creating a connection and waiting for an operation to complete. [GitLab #76] - The BIND libraries have been updated to the latest version, 9.11.36. This fixes a number of compilation issues on various systems, including OpenWRT. Thanks to Philip Prindeville for testing on OpenWRT. [GitLab #218, #171, #180, #192] - Support was added for the new DHCPv4 option v6-only-preferred, specified in RFC 8925. A new reason code, V6ONLY, was added to the client script and the client Linux script sample was updated. [GitLab #132] Changes since 4.4.2-P1 (Bug Fixes) - Minor corrections were made to allow compilation under gcc 10. [GitLab #117] - The logic in dhclient that causes it to decline DHCPv4 leases if the client script exits abnormally (i.e. crashes) has been corrected. [GitLab #123] - The limit on the size of a lease file that can be loaded at startup is now only enforced on 32-bit systems. [GitLab #92] - The PRNG initialization has been improved. It now uses the configure flag `--with-randomdev=PATH`, which specifies the device from which to read the initial seed. That is typically `/dev/random` (the default value) or `/dev/urandom`, but may be specified otherwise on the local system. The old behavior can be forced by disabling this feature (`--with-randomdev=no`). If the initialization is disabled or reading from the random device fails, the previous algorithm (retrieve the last four bytes of hardware addresses from all network interfaces that have them, and use the current time and process ID) is used. [GitLab #197] - A minor dhclient code fix was made to remove compilation warnings. [GitLab #190] - The hard-coded MD5 algorithm name was removed in OMAPI connection logic. Previously, using any other algorithm via a key-algorithm statement would allow OMAPI connections to be made, but subsequent actions such as updating an object would fail. [GitLab #148] - The parallel build has been improved. Thanks to Sergei Trofimovich for the patch. The parallel build is still experimental, as officially the BIND 9 code does not support the parallel build for libraries. [GitLab #91] - Handling of LDAP options (`ldap-gssapi-principal` and `ldap-gssapi-keytab`) has been improved. This is contributed code that has not been tested by ISC. Thank you to Petr Mensik and Pavel Zhukov for the patches! [GitLab !56,!75] - It is now possible to use `option -g ipaddr` in the dhcrelay to replace the giaddr sent to clients with the given ipaddr, to work around bogus clients like Solaris 11 grub which use giaddr instead of the announced router (3) to set up their default route. Thanks to Jens Elkner for the patch! [GitLab #223, !86, !92] --- net/isc-dhcp4/Makefile.common | 6 +++--- net/isc-dhcp4/distinfo | 11 +++++------ ...ind-9.11.14_bin_tests_system_metadata_tests.sh | 15 --------------- net/isc-dhcp4/patches/patch-common_dlpi.c | 10 +++++----- 4 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 net/isc-dhcp4/patches/patch-bind_bind-9.11.14_bin_tests_system_metadata_tests.sh diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common index a297c64a8ba4..cd6cab57d032 100644 --- a/net/isc-dhcp4/Makefile.common +++ b/net/isc-dhcp4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.42 2021/05/27 14:10:12 taca Exp $ +# $NetBSD: Makefile.common,v 1.43 2022/03/13 15:24:37 taca Exp $ # # used by net/isc-dhcp4/Makefile # used by net/isc-dhcpd4/Makefile @@ -17,7 +17,7 @@ LICENSE= mpl-2.0 CONFLICTS+= isc-dhcp-base-3.* -VERSION= 4.4.2-P1 +VERSION= 4.4.3 .include "../../mk/bsd.prefs.mk" @@ -86,7 +86,7 @@ BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib BIND_CONFIGURE_ARGS+= --with-gssapi=no BIND_CONFIGURE_ARGS+= --with-python=no -BIND_WRKSRC= ${WRKSRC}/bind/bind-9.11.14 +BIND_WRKSRC= ${WRKSRC}/bind/bind-9.11.36 post-configure: ${RUN}${_ULIMIT_CMD} \ diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo index 40638a30ea2c..886d93b098e2 100644 --- a/net/isc-dhcp4/distinfo +++ b/net/isc-dhcp4/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.32 2021/10/26 11:05:49 nia Exp $ +$NetBSD: distinfo,v 1.33 2022/03/13 15:24:37 taca Exp $ -BLAKE2s (dhcp-4.4.2-P1.tar.gz) = 1515c75745cb93137a54021d2af6bf82e014a96aa5669c9f99bc6adb95c940f9 -SHA512 (dhcp-4.4.2-P1.tar.gz) = 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040 -Size (dhcp-4.4.2-P1.tar.gz) = 9898311 bytes +BLAKE2s (dhcp-4.4.3.tar.gz) = 21d9898366e34a4cdede90eb01eee456acdf33937a0e7f1bca7033dd4850c5ee +SHA512 (dhcp-4.4.3.tar.gz) = 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0 +Size (dhcp-4.4.3.tar.gz) = 10078953 bytes SHA1 (patch-aa) = da090b3b824f5d437f8d05ce00e2ac4dfc65d6af SHA1 (patch-ab) = 0683dd2259e48184713559aa0356ee352aa52c39 SHA1 (patch-ac) = a7e6808a6e1e93c520eb085f31259f6c142750f4 -SHA1 (patch-bind_bind-9.11.14_bin_tests_system_metadata_tests.sh) = d6d0baf70de0b5349ac164a4affb55dea9fcca51 -SHA1 (patch-common_dlpi.c) = 14cb1c1aed610b1d6952b26a7775caa06b6a8792 +SHA1 (patch-common_dlpi.c) = a4258a6bc7a2b12fab45a10054bca83e235acfbd diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.11.14_bin_tests_system_metadata_tests.sh b/net/isc-dhcp4/patches/patch-bind_bind-9.11.14_bin_tests_system_metadata_tests.sh deleted file mode 100644 index 662700781f7d..000000000000 --- a/net/isc-dhcp4/patches/patch-bind_bind-9.11.14_bin_tests_system_metadata_tests.sh +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bind_bind-9.11.14_bin_tests_system_metadata_tests.sh,v 1.1 2020/01/23 08:11:27 taca Exp $ - -Fix shell portability. - ---- bind/bind-9.11.14/bin/tests/system/metadata/tests.sh.orig 2019-12-12 11:36:39.000000000 +0000 -+++ bind/bind-9.11.14/bin/tests/system/metadata/tests.sh -@@ -137,7 +137,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/isc-dhcp4/patches/patch-common_dlpi.c b/net/isc-dhcp4/patches/patch-common_dlpi.c index 459e2c1cfb4c..196fea3436ff 100644 --- a/net/isc-dhcp4/patches/patch-common_dlpi.c +++ b/net/isc-dhcp4/patches/patch-common_dlpi.c @@ -1,10 +1,10 @@ -$NetBSD: patch-common_dlpi.c,v 1.3 2016/03/30 15:55:44 taca Exp $ +$NetBSD: patch-common_dlpi.c,v 1.4 2022/03/13 15:24:38 taca Exp $ Add support for Crossbow style NICs (SunOS). ---- common/dlpi.c.orig 2016-03-22 13:16:51.000000000 +0000 +--- common/dlpi.c.orig 2022-03-08 09:26:03.000000000 +0000 +++ common/dlpi.c -@@ -778,14 +778,26 @@ static int dlpiunit (ifname) +@@ -782,14 +782,26 @@ static int dlpiunit (ifname) */ static int dlpiopen(const char *ifname) { @@ -13,11 +13,11 @@ Add support for Crossbow style NICs (SunOS). char *dp; const char *cp, *ep; + int fd; - + if (!ifname) { return -1; } - + + /* Try Crossbow Device Path */ + if (ifname[0] == '/') { + fd = open (ifname, O_RDWR, 0);