From nobody Wed Oct 05 15:37:08 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MjJbT2KbDz4V3bp; Wed, 5 Oct 2022 15:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MjJbT1lJjz3hq9; Wed, 5 Oct 2022 15:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664984229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W9koeCcE4GTuhuiZMKm3We7NSVClrsIk4te8nPAPqdI=; b=eDxlVOVKUmQFphxgG1t00F8y+iBhrUhekyUWqBX1/g27UnAhGqe3fDVhA8QrfXGju+mMrY TP7Qg6Bp87O3NZA3R37qtdR1yKZj3BpyoJL4ywcuo/hXAINFJ0UyPOetmQHmpprk8PTIET 9jRSMWiTXGF7M2+0DmggPvfgCIlbN1OYomXTouJ1YmGp+LX6uZUTvSEEmJ2eKTnWpB86m/ c/PDlmTXSPLEmkjl9yjxh19DMEQQkxDaeWEsSMGDSuqUSAy+eeLNpOM2qYO2d7onMejANk piIi6+fKdxl1/NyXTQI0QhP1zOFk+SfIa7u2K/YBNmwO1oTNyfjMYhsEubX65A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MjJbT0lp5zx4x; Wed, 5 Oct 2022 15:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 295Fb9wa078833; Wed, 5 Oct 2022 15:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295Fb8gk078832; Wed, 5 Oct 2022 15:37:08 GMT (envelope-from git) Date: Wed, 5 Oct 2022 15:37:08 GMT Message-Id: <202210051537.295Fb8gk078832@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 2c0375a15638 - main - net/isc-dhcp44-server: Update to 4.4.3-P1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c0375a15638da1f6bfc09c21c9751a5f358250c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664984229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W9koeCcE4GTuhuiZMKm3We7NSVClrsIk4te8nPAPqdI=; b=l7BZjXMKt/o1he4Eg/6rzwCP5OeNO5KMd7yx3bWxS2AbVCmnl75Aq6LCLU+kPzG6O1F8gQ AUU1NP1+dNkEJWBG4aQI5OaIgKH4MC9hDIKCUYXyeGcOai/0sPqhK7DZ6PP5XQNjtzawHt 433zyeI6Olykth5HdbrervI9ycBtHGsnlg6S1MUQNrgiFWmWWV8HinqghXvJtqlqbAozri 9wvU8BooqjUsENE3xBVCr9fXRaDAtjBS7gbvYaa4+L5kQkJoxV/ooqJ8Qf4E5jinS2WvVf Z+NtysMlxpmcA0FnnWgOndOrbYsv4T9VEDyJi3Lvq3B9agUYH5i+UxOPcF6Mbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664984229; a=rsa-sha256; cv=none; b=SLdLzfUImLG3yWW+iwPq1ouqRHZ8scheF7IzBTVZj4QUd9ZtQu11k78bYUjzdlULs6uaSX W06aJqttLCGuWgslx7rYzkhxSE8/EVz8aw5Xw7g/MDVQ/Qn/RAKG0Us7Eeps2e8jo3WPAU 3JhUyVHbBcknnZplL2+d0Fow/IbqjxXCiidYBXKRCLaD+wzIQzHMLZAIFdl6d3KMC8GRL1 TGiWuCe16dz2WMsZB3ybowoHFNIqAm8vpYsc+6YLgMT70IwUI51cIvcUhxjTKA+nWEl7cp zWPUfVNubzTl0+b2qxtPu1U0zA8KnxkbpVoQr5vy/Bwu8PO1pmlNu/L8WL2naQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c0375a15638da1f6bfc09c21c9751a5f358250c commit 2c0375a15638da1f6bfc09c21c9751a5f358250c Author: Ryan Steinmetz AuthorDate: 2022-10-05 15:35:24 +0000 Commit: Ryan Steinmetz 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);