From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 22 Sep 2022 17:20:39 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1obO0F-00CGGo-UK for lore@lore.pengutronix.de; Thu, 22 Sep 2022 17:20:39 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1obO0F-00073L-2N; Thu, 22 Sep 2022 17:20:39 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1obNzo-00072h-P4; Thu, 22 Sep 2022 17:20:12 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1obNzp-002Hq6-FO; Thu, 22 Sep 2022 17:20:12 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1obNzn-00CIt0-Dh; Thu, 22 Sep 2022 17:20:11 +0200 Date: Thu, 22 Sep 2022 17:20:11 +0200 From: Michael Olbrich To: Marc Kleine-Budde Message-ID: Mail-Followup-To: Marc Kleine-Budde , ptxdist@pengutronix.de References: <20220920141759.3394460-1-mkl@pengutronix.de> <20220920141759.3394460-4-mkl@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220920141759.3394460-4-mkl@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH v2 3/7] dhcp: version bump to 4.4.3 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Tue, Sep 20, 2022 at 04:17:55PM +0200, Marc Kleine-Budde wrote: > Signed-off-by: Marc Kleine-Budde License file changes. Michael > --- > ...0001-Fixed-gcc-10-compilation-issues.patch | 82 ------------------- > patches/dhcp-4.4.2/series | 4 - > rules/dhcp.make | 4 +- > 3 files changed, 2 insertions(+), 88 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 > -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..b726b8787890 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 := \ > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |