package/dhcp: bump to version 4.4.1
PATCH 1/1 package/dhcp: bump to version 4.4.1
- Use --with-bind-extra-config option to:
- add --without-zlib otherwise static build will fail if zlib is found on host
- Add --without-dlopen otherwise static build will fail
- Drop all patches (already in version)
- Drop autoreconf (not needed anymore)
- Update license to MPL-2.0:
https://www.isc.org/blogs/isc-dhcp-moves-to-mpl-2-0-license
- Update hash of license file
--- package/dhcp/0001-bind-cross-compile.patch | 24 -------- ...gs-a-socket-descriptor-leak-in-OMAPI.patch | 51 ---------------- ...uffer-overrun-in-pretty_print_option.patch | 59 ------------------- ...rected-refcnt-loss-in-option-parsing.patch | 40 ------------- package/dhcp/dhcp.hash | 6 +- package/dhcp/dhcp.mk | 26 ++++---- 6 files changed, 16 insertions(+), 190 deletions(-) delete mode 100644 package/dhcp/0001-bind-cross-compile.patch delete mode 100644 package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch delete mode 100644 package/dhcp/0003-Correct-buffer-overrun-in-pretty_print_option.patch delete mode 100644 package/dhcp/0004-Corrected-refcnt-loss-in-option-parsing.patch
package/dhcp/0001-bind-cross-compile.patch deleted +0 -24
@@ -1,24 +0,0 @@ -bind cross compile support integration - -Pass system types from dhcp configure to bind configure. - -This patch is submitted upstream as part of a cross compiling enhancement -suggestion to dhcp-suggest at isc.org. Reference ISC-Bugs #41502. - -Signed-off-by: Doug Kehn <[email protected]> - -Index: dhcp-4.3.3-P1/bind/Makefile.in -=================================================================== ---- dhcp-4.3.3-P1.orig/bind/Makefile.in -+++ dhcp-4.3.3-P1/bind/Makefile.in -@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable- - --without-openssl --without-libxml2 --enable-exportlib \ - --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ - --with-export-includedir=${binddir}/include \ -- --with-export-libdir=${binddir}/lib -+ --with-export-libdir=${binddir}/lib \ -+ --target=@target_alias@ --host=@host_alias@ \ -+ --build=@build_alias@ - - @BIND_ATF_FALSE at cleandirs = ./lib ./include - @BIND_ATF_TRUE at cleandirs = ./lib ./include ./atf
package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch deleted +0 -51
51 lines not on this page · raw message
package/dhcp/0003-Correct-buffer-overrun-in-pretty_print_option.patch deleted +0 -59
59 lines not on this page · raw message
package/dhcp/0004-Corrected-refcnt-loss-in-option-parsing.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 93b5b67dd31b9efcbfaabc2df1e1d9d164a5e04a Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder <[email protected]> -Date: Fri, 9 Feb 2018 14:46:08 -0500 -Subject: [PATCH 2/2] Corrected refcnt loss in option parsing - - Merges in 47140. - -[baruch: drop RELNOTES and tests; address CVE-2018-5733] -Signed-off-by: Baruch Siach <[email protected]> ---- -Upstream status: backported from commit 197b26f25309 ---- - common/options.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/options.c b/common/options.c -index 2ed6b16c6412..25b29a6be7bb 100644 ---- a/common/options.c -+++ b/common/options.c -@@ -3,7 +3,7 @@ - DHCP options parsing and reassembly. */ - - /* -- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") -+ * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC") - * Copyright (c) 1995-2003 by Internet Software Consortium - * - * Permission to use, copy, modify, and distribute this software for any -@@ -177,6 +177,8 @@ int parse_option_buffer (options, buffer, length, universe) - - /* If the length is outrageous, the options are bad. */ - if (offset + len > length) { -+ /* Avoid reference count overflow */ -+ option_dereference(&option, MDL); - reason = "option length exceeds option buffer length"; - bogus: - log_error("parse_option_buffer: malformed option " --- -2.16.1 -
package/dhcp/dhcp.hash +3 -3
@@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.3.6/dhcp-4.3.6.tar.gz.sha256.asc -sha256 a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b dhcp-4.3.6.tar.gz +# 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 # Locally calculated -sha256 dd7ae2201c0c11c3c1e2510d731c67b2f4bc8ba735707d7348ddd65f7b598562 LICENSE +sha256 18add1790d1ed47d6ef6f3ed5945aa0cb2f7785fa8bc7fd859f8ae2f9f78567d LICENSE
package/dhcp/dhcp.mk +13 -13
@@ -4,10 +4,10 @@ # ################################################################################ -DHCP_VERSION = 4.3.6 +DHCP_VERSION = 4.4.1 DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES -DHCP_LICENSE = ISC +DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE DHCP_CONF_ENV = \ CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
@@ -15,6 +15,7 @@ DHCP_CONF_ENV = \ CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1' DHCP_CONF_OPTS = \ + --with-bind-extra-config="$(DHCP_BIND_CONF_OPTS)" \ --with-randomdev=/dev/random \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
@@ -27,17 +28,6 @@ DHCP_CONF_OPTS = \ --with-relay-pid-file=/var/run/dhcrelay.pid \ --with-relay6-pid-file=/var/run/dhcrelay6.pid -# The source for the bind libraries used by dhcp are embedded in the dhcp source -# as a tar-ball. Extract the bind source to allow any patches to be applied -# during the patch phase. -define DHCP_EXTRACT_BIND - cd $(@D)/bind; tar -xvf bind.tar.gz -endef -DHCP_POST_EXTRACT_HOOKS += DHCP_EXTRACT_BIND - -# The patchset requires configure et.al. to be regenerated. -DHCP_AUTORECONF = YES - # bind does not support parallel builds. DHCP_MAKE = $(MAKE1)
@@ -54,6 +44,16 @@ ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y) DHCP_CONF_OPTS += --enable-delayed-ack endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +DHCP_BIND_CONF_OPTS += --with-zlib +else +DHCP_BIND_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_STATIC_LIBS),y) +DHCP_BIND_CONF_OPTS += --without-dlopen +endif + ifeq ($(BR2_PACKAGE_DHCP_SERVER),y) define DHCP_INSTALL_SERVER mkdir -p $(TARGET_DIR)/var/lib
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/dhcp: bump to version 4.4.1
Quoted 11 lines · On Thu, 18 Apr 2019 15:17:33 +0200 Fabrice Fontaine…
- Use --with-bind-extra-config option to:
- add --without-zlib otherwise static build will fail if zlib is found on host
- Add --without-dlopen otherwise static build will fail
- Drop all patches (already in version)
- Drop autoreconf (not needed anymore)
- Update license to MPL-2.0:
https://www.isc.org/blogs/isc-dhcp-moves-to-mpl-2-0-license
- Update hash of license fileSigned-off-by Fabrice Fontaine <[email protected]>
Quoted 12 lines
--- package/dhcp/0001-bind-cross-compile.patch | 24 -------- ...gs-a-socket-descriptor-leak-in-OMAPI.patch | 51 ---------------- ...uffer-overrun-in-pretty_print_option.patch | 59 ------------------- ...rected-refcnt-loss-in-option-parsing.patch | 40 ------------- package/dhcp/dhcp.hash | 6 +- package/dhcp/dhcp.mk | 26 ++++---- 6 files changed, 16 insertions(+), 190 deletions(-) delete mode 100644 package/dhcp/0001-bind-cross-compile.patch delete mode 100644 package/dhcp/0002-v4_3-Plugs-a-socket-descriptor-leak-in-OMAPI.patch delete mode 100644 package/dhcp/0003-Correct-buffer-overrun-in-pretty_print_option.patch delete mode 100644 package/dhcp/0004-Corrected-refcnt-loss-in-option-parsing.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com