[ptxdist] [PATCH 0/2] libsodium: version bump

[ptxdist] [PATCH 0/2] libsodium: version bump

[Alexander Dahl]

Hello,

some housekeeping here.

Greets
Alex

Alexander Dahl (2):
  libsodium: Add license file hash
  libsodium: version bump 1.0.16 -> 1.0.18

 rules/libsodium.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


base-commit: 7384b37919cb66e12ff15b4264325cb5eba911c3
-- 
2.30.2

[ptxdist] [PATCH 1/2] libsodium: Add license file hash

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libsodium.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/libsodium.make b/rules/libsodium.make
index 97051557f..ff10faaa9 100644
--- a/rules/libsodium.make
+++ b/rules/libsodium.make
@@ -22,6 +22,7 @@ LIBSODIUM_URL		:= https://github.com/jedisct1/libsodium/releases/download/$(LIBS
 LIBSODIUM_SOURCE	:= $(SRCDIR)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
 LIBSODIUM_DIR		:= $(BUILDDIR)/$(LIBSODIUM)
 LIBSODIUM_LICENSE	:= ISC
+LIBSODIUM_LICENSE_FILES	:= file://LICENSE;md5=7f5ecba1fa793fc1f3c8f32d6cb5a37b
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2

[ptxdist] [PATCH 2/2] libsodium: version bump 1.0.16 -> 1.0.18

[Alexander Dahl]

- download URL as announced on https://doc.libsodium.org/
- copyright year changed in license file

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libsodium.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/libsodium.make b/rules/libsodium.make
index ff10faaa9..b0c3ba6b3 100644
--- a/rules/libsodium.make
+++ b/rules/libsodium.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_LIBSODIUM) += libsodium
 #
 # Paths and names
 #
-LIBSODIUM_VERSION	:= 1.0.16
-LIBSODIUM_MD5		:= 37b18839e57e7a62834231395c8e962b
+LIBSODIUM_VERSION	:= 1.0.18
+LIBSODIUM_MD5		:= 3ca9ebc13b6b4735acae0a6a4c4f9a95
 LIBSODIUM		:= libsodium-$(LIBSODIUM_VERSION)
 LIBSODIUM_SUFFIX	:= tar.gz
-LIBSODIUM_URL		:= https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
+LIBSODIUM_URL		:= https://download.libsodium.org/libsodium/releases/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
 LIBSODIUM_SOURCE	:= $(SRCDIR)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
 LIBSODIUM_DIR		:= $(BUILDDIR)/$(LIBSODIUM)
 LIBSODIUM_LICENSE	:= ISC
-LIBSODIUM_LICENSE_FILES	:= file://LICENSE;md5=7f5ecba1fa793fc1f3c8f32d6cb5a37b
+LIBSODIUM_LICENSE_FILES	:= file://LICENSE;md5=47203c753972e855179dfffe15188bee
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2

Re: [ptxdist] [APPLIED] libsodium: Add license file hash

[Michael Olbrich]

Thanks, applied as 636304aef07e78c463d76a33b72463b334c7a425.

Michael

[sent from post-receive hook]

On Fri, 29 Jul 2022 08:23:46 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220707145908.2217-2-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libsodium.make b/rules/libsodium.make
> index 97051557f5c9..ff10faaa9e3b 100644
> --- a/rules/libsodium.make
> +++ b/rules/libsodium.make
> @@ -22,6 +22,7 @@ LIBSODIUM_URL		:= https://github.com/jedisct1/libsodium/releases/download/$(LIBS
>  LIBSODIUM_SOURCE	:= $(SRCDIR)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
>  LIBSODIUM_DIR		:= $(BUILDDIR)/$(LIBSODIUM)
>  LIBSODIUM_LICENSE	:= ISC
> +LIBSODIUM_LICENSE_FILES	:= file://LICENSE;md5=7f5ecba1fa793fc1f3c8f32d6cb5a37b
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

Re: [ptxdist] [APPLIED] libsodium: version bump 1.0.16 -> 1.0.18

[Michael Olbrich]

Thanks, applied as 92f1a101dc92cd0f7b9502df96a9165d7f8155a6.

Michael

[sent from post-receive hook]

On Fri, 29 Jul 2022 08:23:47 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> - download URL as announced on https://doc.libsodium.org/
> - copyright year changed in license file
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220707145908.2217-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libsodium.make b/rules/libsodium.make
> index ff10faaa9e3b..b0c3ba6b30d7 100644
> --- a/rules/libsodium.make
> +++ b/rules/libsodium.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_LIBSODIUM) += libsodium
>  #
>  # Paths and names
>  #
> -LIBSODIUM_VERSION	:= 1.0.16
> -LIBSODIUM_MD5		:= 37b18839e57e7a62834231395c8e962b
> +LIBSODIUM_VERSION	:= 1.0.18
> +LIBSODIUM_MD5		:= 3ca9ebc13b6b4735acae0a6a4c4f9a95
>  LIBSODIUM		:= libsodium-$(LIBSODIUM_VERSION)
>  LIBSODIUM_SUFFIX	:= tar.gz
> -LIBSODIUM_URL		:= https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
> +LIBSODIUM_URL		:= https://download.libsodium.org/libsodium/releases/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
>  LIBSODIUM_SOURCE	:= $(SRCDIR)/$(LIBSODIUM).$(LIBSODIUM_SUFFIX)
>  LIBSODIUM_DIR		:= $(BUILDDIR)/$(LIBSODIUM)
>  LIBSODIUM_LICENSE	:= ISC
> -LIBSODIUM_LICENSE_FILES	:= file://LICENSE;md5=7f5ecba1fa793fc1f3c8f32d6cb5a37b
> +LIBSODIUM_LICENSE_FILES	:= file://LICENSE;md5=47203c753972e855179dfffe15188bee
>  
>  # ----------------------------------------------------------------------------
>  # Prepare