git: 2c0375a15638 - main - net/isc-dhcp44-server: Update to 4.4.3-P1

The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2c0375a15638da1f6bfc09c21c9751a5f358250c

commit 2c0375a15638da1f6bfc09c21c9751a5f358250c
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2022-10-05 15:35:24 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2022-10-05 15:36:50 +0000

    net/isc-dhcp44-server: Update to 4.4.3-P1
---
 net/isc-dhcp44-server/Makefile               |  4 +-
 net/isc-dhcp44-server/distinfo               |  6 +-
 net/isc-dhcp44-server/files/patch-129b7e40.c | 88 ----------------------------
 3 files changed, 5 insertions(+), 93 deletions(-)

diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile
index 84e629b9f0cb..6b4bbfe6248f 100644
--- a/net/isc-dhcp44-server/Makefile
+++ b/net/isc-dhcp44-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dhcp
-ISCVERSION=	4.4.2-P1
+ISCVERSION=	4.4.3-P1
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
@@ -19,7 +19,7 @@ USES=		cpe gmake
 
 CPE_VENDOR=	isc
 
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	0
 PORTREVISION_CLIENT=	0
 PORTREVISION_RELAY=	0
 
diff --git a/net/isc-dhcp44-server/distinfo b/net/isc-dhcp44-server/distinfo
index 009692c28d49..01ef61ee7e7d 100644
--- a/net/isc-dhcp44-server/distinfo
+++ b/net/isc-dhcp44-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621858088
-SHA256 (dhcp-4.4.2-P1.tar.gz) = b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a
-SIZE (dhcp-4.4.2-P1.tar.gz) = 9898311
+TIMESTAMP = 1664982364
+SHA256 (dhcp-4.4.3-P1.tar.gz) = 0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7
+SIZE (dhcp-4.4.3-P1.tar.gz) = 10081055
diff --git a/net/isc-dhcp44-server/files/patch-129b7e40.c b/net/isc-dhcp44-server/files/patch-129b7e40.c
deleted file mode 100644
index 3c683d1dbf71..000000000000
--- a/net/isc-dhcp44-server/files/patch-129b7e40.c
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/RELNOTES b/RELNOTES
-index 9d0a04144253e399d572e043ff2f4da4613d9b82..6919dba7f7e8fc91269081115648f4da3636a153 100644
---- RELNOTES
-+++ RELNOTES
-@@ -103,6 +103,11 @@ 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 (Bug Fixes)
-+
-+- Minor corrections to allow compilation under gcc 10.
-+  [Gitlab #117]
-+
- 		Changes since 4.4.2b1 (Bug Fixes)
- 
- - Added a clarification on DHCPINFORMs and server authority to
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 189e527094e8adaaa71c4bb859e484018168b100..7a7837cb8152796743a4c9aeec55ceb413c1cde6 100644
---- client/dhclient.c
-+++ client/dhclient.c
-@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium DHCP Client";
- static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
- #endif /* UNIT_TEST */
- 
--u_int16_t local_port = 0;
--u_int16_t remote_port = 0;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
-+
- #if defined(DHCPv6) && defined(DHCP4o6)
- int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
- #endif
-diff --git a/common/discover.c b/common/discover.c
-index ca4f4d55ec9f06c8217222787add5e413b206627..22f09767e98079c8d95ed1e8cb5dd00b56158da4 100644
---- common/discover.c
-+++ common/discover.c
-@@ -45,8 +45,8 @@ struct interface_info *fallback_interface = 0;
- 
- int interfaces_invalidated;
- int quiet_interface_discovery;
--u_int16_t local_port;
--u_int16_t remote_port;
-+u_int16_t local_port = 0;
-+u_int16_t remote_port = 0;
- u_int16_t relay_port = 0;
- int dhcpv4_over_dhcpv6 = 0;
- int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *);
-diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index 883d5058f2ee5b95ea7a23e6cd4c95b41ff08b9c..7211e3bbbec937386c0f5335a626a35dca8fee72 100644
---- relay/dhcrelay.c
-+++ relay/dhcrelay.c
-@@ -95,8 +95,8 @@ enum { forward_and_append,	/* Forward and append our own relay option. */
-        forward_untouched,	/* Forward without changes. */
-        discard } agent_relay_mode = forward_and_replace;
- 
--u_int16_t local_port;
--u_int16_t remote_port;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
- 
- /* Relay agent server list. */
- struct server_list {
-diff --git a/server/mdb.c b/server/mdb.c
-index ff8a707fac1b82e0bd00f9cc1f0730be6d18e43e..8266d76432b8fd1fa3ccedb29c75dc68107ae25a 100644
---- server/mdb.c
-+++ server/mdb.c
-@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL;
- 
- int numclasseswritten;
- 
--omapi_object_type_t *dhcp_type_host;
-+extern omapi_object_type_t *dhcp_type_host;
- 
- isc_result_t enter_class(cd, dynamicp, commit)
- 	struct class *cd;
-diff --git a/server/mdb6.c b/server/mdb6.c
-index da7baf6e50dfb6c92d8c2d3f9229f8a06f6c61a2..ebe01e5607cb57e7385f739470b82416a43a5b2e 100644
---- server/mdb6.c
-+++ server/mdb6.c
-@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref,
- 		}
- 		new_ds.data = new_ds.buffer->data;
- 		memcpy(new_ds.buffer->data, ds.data, ds.len);
--		memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp));
-+		memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp));
- 		data_string_forget(&ds, MDL);
- 		data_string_copy(&ds, &new_ds, MDL);
- 		data_string_forget(&new_ds, MDL);