mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v5 0/4] various version bumps
@ 2022-10-17 12:36 Marc Kleine-Budde
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 1/4] bind: version bump to 9.11.37 + adjust license files checksum Marc Kleine-Budde
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Marc Kleine-Budde @ 2022-10-17 12:36 UTC (permalink / raw)
  To: ptxdist

this series contains a few versions bumps.

regards,
Marc

changes since v1: https://lore.ptxdist.org/ptxdist/20220920125705.2728029-1-mkl@pengutronix.de
- clarify subject and patch description for 1/7

changes since v2: https://lore.ptxdist.org/ptxdist/20220920141759.3394460-1-mkl@pengutronix.de
- 1/5 simplify no SSL backend fix (thanks mol)
- 2/5, 3/5, 4/5 update license file checksums
- 5/5 nettle: new patch
- dropped already applied patches

changes since v3: https://lore.ptxdist.org/ptxdist/20220928121609.1209927-1-mkl@pengutronix.de
- 2/5, 3/5, 4/5: explain diff of license files

changes since v4: https://lore.ptxdist.org/ptxdist/20220929145223.1932910-1-mkl@pengutronix.de
- rebase to ptxdist-2022.10.0, after
  "[PATCH v4 1/5] libcurl: fix configure if no SSL backend is selected"
  has been applied





^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH v5 1/4] bind: version bump to 9.11.37 + adjust license files checksum
  2022-10-17 12:36 [ptxdist] [PATCH v5 0/4] various version bumps Marc Kleine-Budde
@ 2022-10-17 12:36 ` Marc Kleine-Budde
  2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 2/4] dhcp: version bump to 4.4.3 " Marc Kleine-Budde
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Marc Kleine-Budde @ 2022-10-17 12:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

- COPYRIGHT:
  Copyright years changed from "1996-2021" to "1996-2022".

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/bind.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/bind.make b/rules/bind.make
index b547eeff0993..18eac0eaee50 100644
--- a/rules/bind.make
+++ b/rules/bind.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BIND) += bind
 #
 # Paths and names
 #
-BIND_VERSION		:= 9.11.31
-BIND_MD5		:= 40732ca6e4fcc9d022ab0f17b3e55b71
+BIND_VERSION		:= 9.11.37
+BIND_MD5		:= 0a11e9596c46d6728fa3b0989ee75197
 BIND			:= bind-$(BIND_VERSION)
 BIND_SUFFIX		:= tar.gz
 BIND_URL		:= https://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX)
@@ -25,7 +25,7 @@ BIND_LICENSE		:= MPL-2.0 AND ISC AND BSD-3-Clause AND BSD-2-Clause \
 	AND unknown AND JPNIC AND RSA-MD AND OpenSSL AND Apache-2.0
 BIND_LICENSE_FILES	:= \
 	file://LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
-	file://COPYRIGHT;md5=b88e7ca5f21908e1b2720169f6807cf6
+	file://COPYRIGHT;md5=89a97ebbf713f7125fe5c02223d3ae95
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH v5 2/4] dhcp: version bump to 4.4.3 + adjust license files checksum
  2022-10-17 12:36 [ptxdist] [PATCH v5 0/4] various version bumps Marc Kleine-Budde
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 1/4] bind: version bump to 9.11.37 + adjust license files checksum Marc Kleine-Budde
@ 2022-10-17 12:36 ` Marc Kleine-Budde
  2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 3/4] lz4: version bump to 1.9.4 " Marc Kleine-Budde
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 4/4] nettle: version bump to 3.8.1 Marc Kleine-Budde
  3 siblings, 1 reply; 9+ messages in thread
From: Marc Kleine-Budde @ 2022-10-17 12:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

- 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 <mkl@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 <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..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




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH v5 3/4] lz4: version bump to 1.9.4 + adjust license files checksum
  2022-10-17 12:36 [ptxdist] [PATCH v5 0/4] various version bumps Marc Kleine-Budde
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 1/4] bind: version bump to 9.11.37 + adjust license files checksum Marc Kleine-Budde
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 2/4] dhcp: version bump to 4.4.3 " Marc Kleine-Budde
@ 2022-10-17 12:36 ` Marc Kleine-Budde
  2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 4/4] nettle: version bump to 3.8.1 Marc Kleine-Budde
  3 siblings, 1 reply; 9+ messages in thread
From: Marc Kleine-Budde @ 2022-10-17 12:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

- LICENSE:
  Paragraph about '`programs`, `tests` or `examples`' was changed from
  'receive more limited attention and support for such scenario.' to
  'are intended to be used "as is", as part of their intended scenarios,
   with no intention to support 3rd party integration use cases.'
- lib/LICENSE:
  Copyright years changed from "2011-2016" to "2011-2020".

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/lz4.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/lz4.make b/rules/lz4.make
index 79d8600c29db..4b9b2bb33076 100644
--- a/rules/lz4.make
+++ b/rules/lz4.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LZ4) += lz4
 #
 # Paths and names
 #
-LZ4_VERSION	:= 1.9.3
-LZ4_MD5		:= 3a1ab1684e14fc1afc66228ce61b2db3
+LZ4_VERSION	:= 1.9.4
+LZ4_MD5		:= e9286adb64040071c5e23498bf753261
 LZ4		:= lz4-$(LZ4_VERSION)
 LZ4_SUFFIX	:= tar.gz
 LZ4_URL		:= https://github.com/Cyan4973/lz4/archive/v$(LZ4_VERSION).$(LZ4_SUFFIX)
@@ -23,8 +23,8 @@ LZ4_SOURCE	:= $(SRCDIR)/$(LZ4).$(LZ4_SUFFIX)
 LZ4_DIR		:= $(BUILDDIR)/$(LZ4)
 LZ4_LICENSE	:= BSD-2-Clause AND GPL-2.0-or-later
 LZ4_LICENSE_FILES := \
-	file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \
-	file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \
+	file://LICENSE;md5=c5cc3cd6f9274b4d32988096df9c3ec3 \
+	file://lib/LICENSE;md5=5cd5f851b52ec832b10eedb3f01f885a \
 	file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
 
 # ----------------------------------------------------------------------------
-- 
2.30.2




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH v5 4/4] nettle: version bump to 3.8.1
  2022-10-17 12:36 [ptxdist] [PATCH v5 0/4] various version bumps Marc Kleine-Budde
                   ` (2 preceding siblings ...)
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 3/4] lz4: version bump to 1.9.4 " Marc Kleine-Budde
@ 2022-10-17 12:36 ` Marc Kleine-Budde
  2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich
  3 siblings, 1 reply; 9+ messages in thread
From: Marc Kleine-Budde @ 2022-10-17 12:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/nettle.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/nettle.make b/rules/nettle.make
index c27f2116be66..43e0b41581e9 100644
--- a/rules/nettle.make
+++ b/rules/nettle.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle
 #
 # Paths and names
 #
-NETTLE_VERSION	:= 3.7.3
-NETTLE_MD5	:= a60273d0fab9c808646fcf5e9edc2e8f
+NETTLE_VERSION	:= 3.8.1
+NETTLE_MD5	:= e15c5fd5cc901f5dde6a271d7f2320d1
 NETTLE		:= nettle-$(NETTLE_VERSION)
 NETTLE_SUFFIX	:= tar.gz
 NETTLE_SOURCE	:= $(SRCDIR)/$(NETTLE).$(NETTLE_SUFFIX)
-- 
2.30.2




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] bind: version bump to 9.11.37 + adjust license files checksum
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 1/4] bind: version bump to 9.11.37 + adjust license files checksum Marc Kleine-Budde
@ 2022-10-19  5:40   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:40 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

Thanks, applied as 23acd3897378730dbdc07381d6766195b19678dd.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:40:53 +0200, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> - COPYRIGHT:
>   Copyright years changed from "1996-2021" to "1996-2022".
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Message-Id: <20221017123636.54555-2-mkl@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/bind.make b/rules/bind.make
> index b547eeff0993..18eac0eaee50 100644
> --- a/rules/bind.make
> +++ b/rules/bind.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BIND) += bind
>  #
>  # Paths and names
>  #
> -BIND_VERSION		:= 9.11.31
> -BIND_MD5		:= 40732ca6e4fcc9d022ab0f17b3e55b71
> +BIND_VERSION		:= 9.11.37
> +BIND_MD5		:= 0a11e9596c46d6728fa3b0989ee75197
>  BIND			:= bind-$(BIND_VERSION)
>  BIND_SUFFIX		:= tar.gz
>  BIND_URL		:= https://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX)
> @@ -25,7 +25,7 @@ BIND_LICENSE		:= MPL-2.0 AND ISC AND BSD-3-Clause AND BSD-2-Clause \
>  	AND unknown AND JPNIC AND RSA-MD AND OpenSSL AND Apache-2.0
>  BIND_LICENSE_FILES	:= \
>  	file://LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \
> -	file://COPYRIGHT;md5=b88e7ca5f21908e1b2720169f6807cf6
> +	file://COPYRIGHT;md5=89a97ebbf713f7125fe5c02223d3ae95
>  
>  # ----------------------------------------------------------------------------
>  # Prepare



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] dhcp: version bump to 4.4.3 + adjust license files checksum
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 2/4] dhcp: version bump to 4.4.3 " Marc Kleine-Budde
@ 2022-10-19  5:40   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:40 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

Thanks, applied as 220f432b4848a7ba6379fc55573f31c2ba562226.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:40:54 +0200, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> - 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 <mkl@pengutronix.de>
> Message-Id: <20221017123636.54555-3-mkl@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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..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



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] lz4: version bump to 1.9.4 + adjust license files checksum
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 3/4] lz4: version bump to 1.9.4 " Marc Kleine-Budde
@ 2022-10-19  5:40   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:40 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

Thanks, applied as 27e8aa53593ff6d4418277b74d4631dcb9553216.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:40:57 +0200, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> - LICENSE:
>   Paragraph about '`programs`, `tests` or `examples`' was changed from
>   'receive more limited attention and support for such scenario.' to
>   'are intended to be used "as is", as part of their intended scenarios,
>    with no intention to support 3rd party integration use cases.'
> - lib/LICENSE:
>   Copyright years changed from "2011-2016" to "2011-2020".
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Message-Id: <20221017123636.54555-4-mkl@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/lz4.make b/rules/lz4.make
> index 79d8600c29db..4b9b2bb33076 100644
> --- a/rules/lz4.make
> +++ b/rules/lz4.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LZ4) += lz4
>  #
>  # Paths and names
>  #
> -LZ4_VERSION	:= 1.9.3
> -LZ4_MD5		:= 3a1ab1684e14fc1afc66228ce61b2db3
> +LZ4_VERSION	:= 1.9.4
> +LZ4_MD5		:= e9286adb64040071c5e23498bf753261
>  LZ4		:= lz4-$(LZ4_VERSION)
>  LZ4_SUFFIX	:= tar.gz
>  LZ4_URL		:= https://github.com/Cyan4973/lz4/archive/v$(LZ4_VERSION).$(LZ4_SUFFIX)
> @@ -23,8 +23,8 @@ LZ4_SOURCE	:= $(SRCDIR)/$(LZ4).$(LZ4_SUFFIX)
>  LZ4_DIR		:= $(BUILDDIR)/$(LZ4)
>  LZ4_LICENSE	:= BSD-2-Clause AND GPL-2.0-or-later
>  LZ4_LICENSE_FILES := \
> -	file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \
> -	file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \
> +	file://LICENSE;md5=c5cc3cd6f9274b4d32988096df9c3ec3 \
> +	file://lib/LICENSE;md5=5cd5f851b52ec832b10eedb3f01f885a \
>  	file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
>  
>  # ----------------------------------------------------------------------------



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [APPLIED] nettle: version bump to 3.8.1
  2022-10-17 12:36 ` [ptxdist] [PATCH v5 4/4] nettle: version bump to 3.8.1 Marc Kleine-Budde
@ 2022-10-19  5:40   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-10-19  5:40 UTC (permalink / raw)
  To: ptxdist; +Cc: Marc Kleine-Budde

Thanks, applied as 495bf5345a935064fa340765c6f96e24f6109288.

Michael

[sent from post-receive hook]

On Wed, 19 Oct 2022 07:40:58 +0200, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Message-Id: <20221017123636.54555-5-mkl@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/nettle.make b/rules/nettle.make
> index c27f2116be66..43e0b41581e9 100644
> --- a/rules/nettle.make
> +++ b/rules/nettle.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle
>  #
>  # Paths and names
>  #
> -NETTLE_VERSION	:= 3.7.3
> -NETTLE_MD5	:= a60273d0fab9c808646fcf5e9edc2e8f
> +NETTLE_VERSION	:= 3.8.1
> +NETTLE_MD5	:= e15c5fd5cc901f5dde6a271d7f2320d1
>  NETTLE		:= nettle-$(NETTLE_VERSION)
>  NETTLE_SUFFIX	:= tar.gz
>  NETTLE_SOURCE	:= $(SRCDIR)/$(NETTLE).$(NETTLE_SUFFIX)



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-10-19  5:41 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-17 12:36 [ptxdist] [PATCH v5 0/4] various version bumps Marc Kleine-Budde
2022-10-17 12:36 ` [ptxdist] [PATCH v5 1/4] bind: version bump to 9.11.37 + adjust license files checksum Marc Kleine-Budde
2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-17 12:36 ` [ptxdist] [PATCH v5 2/4] dhcp: version bump to 4.4.3 " Marc Kleine-Budde
2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-17 12:36 ` [ptxdist] [PATCH v5 3/4] lz4: version bump to 1.9.4 " Marc Kleine-Budde
2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-17 12:36 ` [ptxdist] [PATCH v5 4/4] nettle: version bump to 3.8.1 Marc Kleine-Budde
2022-10-19  5:40   ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox