From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 438D6138350 for ; Tue, 21 Apr 2020 09:28:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86BDFE08FC; Tue, 21 Apr 2020 09:28:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70DE1E08FC for ; Tue, 21 Apr 2020 09:28:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BA7134F0F8 for ; Tue, 21 Apr 2020 09:28:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 180D49C for ; Tue, 21 Apr 2020 09:28:55 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1587461328.12b4d8f06024aba59d700e6b3c40ae5b46ed9d26.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/, net-misc/dhcp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcp/dhcp-4.4.2-r2.ebuild net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch X-VCS-Directories: net-misc/dhcp/files/ net-misc/dhcp/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 12b4d8f06024aba59d700e6b3c40ae5b46ed9d26 X-VCS-Branch: master Date: Tue, 21 Apr 2020 09:28:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ce3d471-a519-436e-a50e-fc45e41212d8 X-Archives-Hash: 610bfa36edebc61fad5f2e310eb25c86 commit: 12b4d8f06024aba59d700e6b3c40ae5b46ed9d26 Author: Lars Wendler gentoo org> AuthorDate: Tue Apr 21 09:28:39 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Apr 21 09:28:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b4d8f0 net-misc/dhcp: Fix build with gcc-10 Bug: https://bugs.gentoo.org/710194 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Lars Wendler gentoo.org> net-misc/dhcp/dhcp-4.4.2-r2.ebuild | 3 +++ net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch | 34 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild index 650a485d9d6..8adf530720e 100644 --- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild +++ b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild @@ -67,6 +67,9 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636 "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142 "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832 + + # Possible upstream candidates + "${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194 ) src_prepare() { diff --git a/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch b/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch new file mode 100644 index 00000000000..5d0b7bdd535 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.4.2-fno-common.patch @@ -0,0 +1,34 @@ +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -83,8 +83,6 @@ + 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; + #if defined(DHCPv6) && defined(DHCP4o6) + int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */ + #endif +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c +@@ -95,9 +95,6 @@ + forward_untouched, /* Forward without changes. */ + discard } agent_relay_mode = forward_and_replace; + +-u_int16_t local_port; +-u_int16_t remote_port; +- + /* Relay agent server list. */ + struct server_list { + struct server_list *next; +--- a/server/mdb.c ++++ b/server/mdb.c +@@ -67,8 +67,6 @@ + + int numclasseswritten; + +-omapi_object_type_t *dhcp_type_host; +- + isc_result_t enter_class(cd, dynamicp, commit) + struct class *cd; + int dynamicp;