From patchwork Sat Apr 25 21:28:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1276874 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=C04M4bFo; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 498kgM0zv9z9sPF for ; Sun, 26 Apr 2020 07:28:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A38E585535; Sat, 25 Apr 2020 21:28:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZgOjKbSkofpI; Sat, 25 Apr 2020 21:28:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AF6688553B; Sat, 25 Apr 2020 21:28:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9F76F1BF593 for ; Sat, 25 Apr 2020 21:28:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B0358461B for ; Sat, 25 Apr 2020 21:28:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nh1bS0IWgvKe for ; Sat, 25 Apr 2020 21:28:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id BC4A7843BD for ; Sat, 25 Apr 2020 21:28:41 +0000 (UTC) Received: by mail-qv1-f65.google.com with SMTP id ep1so6563842qvb.0 for ; Sat, 25 Apr 2020 14:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=kW97vhe2k2hN7/prlUhCteVS4u0DnfgxCWJ+rdpGUs8=; b=C04M4bFot8lX40UV4stapit109JNu+N2DaKhD7IOcwwACSC/NBh80h0AfyiDvR/Cvt 8Ii+1yqBL9PdlwyihKEurLJSKikUhXpY65jCvyjbAxyi+CFQR1qhqfPnIDOTjH/DiL0k wcCtwgT1rTnV5AU9GNRPBoAxUrCh7ed5K7YP8zLXr0SZNTb08qqCx2Lt72QL0O1zjJ1G JbPaMcV6rIY9chMaKFyPyliWhzpGcJ/H8wJJ+mnlV8mOv519SRwzjwwl/PYkfL/t6MdH 1XCwWlhxagxJTMAF8mZPwiCru0bG52yvn2jUtCmYuA3WHKiORq6YIf4aGWmGa5pj1X86 TzCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kW97vhe2k2hN7/prlUhCteVS4u0DnfgxCWJ+rdpGUs8=; b=dt8zUMlpf6bmNskwbDoxwlpP7c3cRf0jeaGTkQFC9fVU+8ClSX1TrMje9IKpc5PUDL 2dDmh/eRBqlQxpHkcUNqoioyhSqn2YTZaVYPvW9ZPoPjukDUSd5r/xS1EoW57Lstnmbv VzC73bFfIREh97fUQLqgCw2YRNtpek99Yeu6gZ18w1kDDHJN2Hfsr6sNGwKDzMwGSxcy nGeEHoeqHSsJIe4Mih+jKWBbRkfPDyYZjJvb2g8KHz+5At+vHzvmCb7baldmRBfB0kMB mV0g6zFKdYLGfkjC6XFzAFxZFxbrujsJkny7YovSp23k5367Ly/5kJ361Wc8DOCY7HvQ T9dg== X-Gm-Message-State: AGi0PuajvXTVpB7WGuzZrjL1UxUGLa2XJf9PASu3hNjxko9h+TfBuCi5 eircGqq2vxXw5icaTUK8u/159Ptfy8MTiQ== X-Google-Smtp-Source: APiQypJb8ccTRDT7bqpS+Nv3LH4lPqb4+CP/wgOufFsJgpzri1uMWi0aPearSvsU7GQia3aQU6ye8A== X-Received: by 2002:a0c:b719:: with SMTP id t25mr16117044qvd.144.1587850120405; Sat, 25 Apr 2020 14:28:40 -0700 (PDT) Received: from ryan-xps13.lilmerv.home (50-80-22-148.client.mchsi.com. [50.80.22.148]) by smtp.gmail.com with ESMTPSA id a196sm6578541qkc.108.2020.04.25.14.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Apr 2020 14:28:39 -0700 (PDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Sat, 25 Apr 2020 16:28:30 -0500 Message-Id: <20200425212830.12910-1-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH] package/dhcp: bump to version 4.4.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Removed 0001-*.patch as it is included with the maintenance release. The LICENSE file hash changed due to Copyright year updating to include 2020. Signed-off-by: Ryan Barnett --- ...ibility-headers-updated-util-bind-sh.patch | 87 ------------------- package/dhcp/dhcp.hash | 6 +- package/dhcp/dhcp.mk | 2 +- 3 files changed, 4 insertions(+), 91 deletions(-) delete mode 100644 package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch diff --git a/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch b/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch deleted file mode 100644 index b8b187f17b..0000000000 --- a/package/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-headers-updated-util-bind-sh.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Fri, 14 Sep 2018 13:41:41 -0400 -Subject: [PATCH] [master] Added includes of new BIND9 compatibility headers, - updated util/bind.sh - - Merges in rt48072. -Signed-off-by: Fabrice Fontaine -[Retrieved (and updated to remvove bind.sh update) from: -https://gitlab.isc.org/isc-projects/dhcp/commit/8194daabfd590f17825f0c61e9534bee5c99cc86] ---- - includes/omapip/isclib.h | 3 +++ - includes/omapip/result.h | 1 + - server/dhcpv6.c | 13 +++++++++---- - 3 files changed, 39 insertions(+), 12 deletions(-) - -diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h -index 75a87ff6..538b927f 100644 ---- a/includes/omapip/isclib.h -+++ b/includes/omapip/isclib.h -@@ -48,6 +48,9 @@ - #include - #include - -+#include -+#include -+ - #include - #include - #include -diff --git a/includes/omapip/result.h b/includes/omapip/result.h -index 91243e1b..860298f6 100644 ---- a/includes/omapip/result.h -+++ b/includes/omapip/result.h -@@ -26,6 +26,7 @@ - #ifndef DHCP_RESULT_H - #define DHCP_RESULT_H 1 - -+#include - #include - #include - #include -diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f98..cde4f617 100644 ---- a/server/dhcpv6.c -+++ b/server/dhcpv6.c -@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, - shared_name, - inet_ntop(AF_INET6, &lease->addr, - tmp_addr, sizeof(tmp_addr)), -- used, count); -+ (long long unsigned)(used), -+ (long long unsigned)(count)); - } - return; - } -@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, - "address: %s; high threshold %d%% %llu/%llu.", - shared_name, - inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), -- poolhigh, used, count); -+ poolhigh, (long long unsigned)(used), -+ (long long unsigned)(count)); - - /* handle the low threshold now, if we don't - * have one we default to 0. */ -@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - " 2^64-1 < total, %llu active, %llu abandoned", -- shared_name, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } else { - log_debug("Unable to pick client address: " - "no addresses available - shared network %s: " - "%llu total, %llu active, %llu abandoned", -- shared_name, total, active - abandoned, abandoned); -+ shared_name, (long long unsigned)(total), -+ (long long unsigned)(active - abandoned), -+ (long long unsigned)(abandoned)); - } - - return ISC_R_NORESOURCES; --- -2.18.1 - diff --git a/package/dhcp/dhcp.hash b/package/dhcp/dhcp.hash index df07a32557..92ecdfec58 100644 --- a/package/dhcp/dhcp.hash +++ b/package/dhcp/dhcp.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1.tar.gz.sha256.asc -sha256 2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608 dhcp-4.4.1.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.4.2/dhcp-4.4.2.tar.gz.sha256.asc +sha256 1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521 dhcp-4.4.2.tar.gz # Locally calculated -sha256 18add1790d1ed47d6ef6f3ed5945aa0cb2f7785fa8bc7fd859f8ae2f9f78567d LICENSE +sha256 89e7b0661134cc118bdcdeb87ff0493d544bc5723c9ca6616fa05f03539738af LICENSE diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 335c631119..ad59804d3b 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCP_VERSION = 4.4.1 +DHCP_VERSION = 4.4.2 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0