From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2 3/7] dhcp: version bump to 4.4.3
Date: Thu, 22 Sep 2022 17:20:11 +0200 [thread overview]
Message-ID: <Yyx9K2rYDHw8fZxH@pengutronix.de> (raw)
In-Reply-To: <20220920141759.3394460-4-mkl@pengutronix.de>
On Tue, Sep 20, 2022 at 04:17:55PM +0200, Marc Kleine-Budde wrote:
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
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 <tmark@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..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 |
next prev parent reply other threads:[~2022-09-22 15:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 14:17 [ptxdist] [PATCH 0/7] various version bumps Marc Kleine-Budde
2022-09-20 14:17 ` [ptxdist] [PATCH v2 1/7] libcurl: fix configure if no SSL backend is selected Marc Kleine-Budde
2022-09-22 14:00 ` Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 2/7] bind: version bump to 9.11.37 Marc Kleine-Budde
2022-09-22 14:50 ` Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 3/7] dhcp: version bump to 4.4.3 Marc Kleine-Budde
2022-09-22 15:20 ` Michael Olbrich [this message]
2022-09-20 14:17 ` [ptxdist] [PATCH v2 4/7] dnsmasq: version bump to 2.86 Marc Kleine-Budde
2022-09-28 14:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 5/7] glib: version bump to 2.72.3 Marc Kleine-Budde
2022-09-28 14:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 6/7] gnutls: version bump to 3.7.7 Marc Kleine-Budde
2022-09-28 14:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-20 14:17 ` [ptxdist] [PATCH v2 7/7] lz4: version bump to 1.9.4 Marc Kleine-Budde
2022-09-22 14:24 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yyx9K2rYDHw8fZxH@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=mkl@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox