- LICENSE: Copyright years changed from "2004-2020" to "2004-2022". Paragraph 'THE SOFTWARE IS PROVIDED "AS IS"' removed. Address of "Internet Systems Consortium, Inc." removed. - server/ldap.c: Copyright years changed from "2010-2019" to "2010-2022". - server/ldap_casa.c: removed trailing whitespace Copyright years changed from "2004-2010" to "2004-2022". Address of "Internet Systems Consortium, Inc." adjusted.
Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de> --- ...0001-Fixed-gcc-10-compilation-issues.patch | 82 ------------------- patches/dhcp-4.4.2/series | 4 - rules/dhcp.make | 10 +-- 3 files changed, 5 insertions(+), 91 deletions(-) delete mode 100644 patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch delete mode 100644 patches/dhcp-4.4.2/series diff --git a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch b/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch deleted file mode 100644 index f0e3cc450bbe..000000000000 --- a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Thomas Markwalder <tm...@isc.org> -Date: Thu, 30 Jul 2020 10:01:36 -0400 -Subject: [PATCH] Fixed gcc 10 compilation issues - -client/dhclient.c -relay/dhcrelay.c - extern'ed local_port,remote_port - -common/discover.c - init local_port,remote_port to 0 - -server/mdb.c - extern'ed dhcp_type_host - -server/mdb6.c - create_prefix6() - eliminated memcpy string overflow error - -Origin: https://sources.debian.org/patches/isc-dhcp/4.4.1-2.2/Fixed_gcc_10_compilation_issues.patch/ ---- - client/dhclient.c | 5 +++-- - relay/dhcrelay.c | 4 ++-- - server/mdb.c | 2 +- - server/mdb6.c | 2 +- - 4 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/client/dhclient.c b/client/dhclient.c -index 189e527094e8..7a7837cb8152 100644 ---- a/client/dhclient.c -+++ b/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/relay/dhcrelay.c b/relay/dhcrelay.c -index 883d5058f2ee..7211e3bbbec9 100644 ---- a/relay/dhcrelay.c -+++ b/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 ff8a707fac1b..8266d76432b8 100644 ---- a/server/mdb.c -+++ b/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 da7baf6e50df..ebe01e5607cb 100644 ---- a/server/mdb6.c -+++ b/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); diff --git a/patches/dhcp-4.4.2/series b/patches/dhcp-4.4.2/series deleted file mode 100644 index de5f31877455..000000000000 --- a/patches/dhcp-4.4.2/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fixed-gcc-10-compilation-issues.patch -# dd19bdbd49b780e973ed9392604d03fe - git-ptx-patches magic diff --git a/rules/dhcp.make b/rules/dhcp.make index 7feb6ef5b668..f4860507ded0 100644 --- a/rules/dhcp.make +++ b/rules/dhcp.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DHCP) += dhcp # # Paths and names # -DHCP_VERSION := 4.4.2 -DHCP_MD5 := 2afdaf8498dc1edaf3012efdd589b3e1 +DHCP_VERSION := 4.4.3 +DHCP_MD5 := 9076af4cc1293dde5a7c6cae7de6ab45 DHCP := dhcp-$(DHCP_VERSION) DHCP_SUFFIX := tar.gz DHCP_URL := \ @@ -29,9 +29,9 @@ DHCP_SOURCE := $(SRCDIR)/$(DHCP).$(DHCP_SUFFIX) DHCP_DIR := $(BUILDDIR)/$(DHCP) DHCP_LICENSE := MPL-2.0 AND BSD-3-Clause AND ISC DHCP_LICENSE_FILES := \ - file://LICENSE;md5=b9c6e660b3d9260de9a342d2fb77540a \ - file://server/ldap.c;startline=6;endline=35;md5=8e5f9d2cd6b641d599871fd2430708c4 \ - file://server/ldap_casa.c;startline=35;endline=48;md5=d2ea64a00aeacb447c6634d984486afe + file://LICENSE;md5=c463f4afde26d9eb60f14f50aeb85f8f \ + file://server/ldap.c;startline=6;endline=35;md5=8d047cff3fcdff1e6df8e3a82aff0f7c \ + file://server/ldap_casa.c;startline=35;endline=48;md5=d865213e14a02885f25467a709307bf3 # ---------------------------------------------------------------------------- # Prepare -- 2.30.2
