mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] openssl: update license and add license file with hash
@ 2024-03-03  9:37 Bruno Thomsen
  2024-03-15  4:06 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Bruno Thomsen @ 2024-03-03  9:37 UTC (permalink / raw)
  To: ptxdist; +Cc: bruno.thomsen

OpenSSL is covered by one of two licenses, depending on which
release is involved. For the 3.0 release, and later releases
derived from that, the Apache License v2 applies. This also
applies to the git “master” branch.

https://www.openssl.org/source/license.html

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/openssl.make | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/rules/openssl.make b/rules/openssl.make
index 7080bd50ba55..fbc6424e0c56 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -16,16 +16,18 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
 #
 # Paths and names
 #
-OPENSSL_VERSION	:= 3.2.1
-OPENSSL_MD5	:= c239213887804ba00654884918b37441
-OPENSSL		:= openssl-$(OPENSSL_VERSION)
-OPENSSL_SUFFIX	:= tar.gz
-OPENSSL_URL	:= \
+OPENSSL_VERSION		:= 3.2.1
+OPENSSL_MD5		:= c239213887804ba00654884918b37441
+OPENSSL			:= openssl-$(OPENSSL_VERSION)
+OPENSSL_SUFFIX		:= tar.gz
+OPENSSL_URL		:= \
 	https://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) \
 	https://www.openssl.org/source/old/$(basename $(OPENSSL_VERSION))/$(OPENSSL).$(OPENSSL_SUFFIX)
-OPENSSL_SOURCE	:= $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
-OPENSSL_DIR	:= $(BUILDDIR)/$(OPENSSL)
-OPENSSL_LICENSE	:= OpenSSL
+OPENSSL_SOURCE		:= $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
+OPENSSL_DIR		:= $(BUILDDIR)/$(OPENSSL)
+OPENSSL_LICENSE		:= Apache-2.0
+OPENSSL_LICENSE_FILES	:= \
+	file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04
 
 # ----------------------------------------------------------------------------
 # Prepare

base-commit: 6bf08f784b8d41b63ba1d322e79145ad670b09e2
-- 
2.44.0




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

* Re: [ptxdist] [APPLIED] openssl: update license and add license file with hash
  2024-03-03  9:37 [ptxdist] [PATCH] openssl: update license and add license file with hash Bruno Thomsen
@ 2024-03-15  4:06 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2024-03-15  4:06 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Thanks, applied as 99328f6c0f15d104c2bc1753c3e15d85fa9c92eb.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:25 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> OpenSSL is covered by one of two licenses, depending on which
> release is involved. For the 3.0 release, and later releases
> derived from that, the Apache License v2 applies. This also
> applies to the git “master” branch.
> 
> https://www.openssl.org/source/license.html
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20240303093730.50924-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/openssl.make b/rules/openssl.make
> index 7080bd50ba55..fbc6424e0c56 100644
> --- a/rules/openssl.make
> +++ b/rules/openssl.make
> @@ -16,16 +16,18 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
>  #
>  # Paths and names
>  #
> -OPENSSL_VERSION	:= 3.2.1
> -OPENSSL_MD5	:= c239213887804ba00654884918b37441
> -OPENSSL		:= openssl-$(OPENSSL_VERSION)
> -OPENSSL_SUFFIX	:= tar.gz
> -OPENSSL_URL	:= \
> +OPENSSL_VERSION		:= 3.2.1
> +OPENSSL_MD5		:= c239213887804ba00654884918b37441
> +OPENSSL			:= openssl-$(OPENSSL_VERSION)
> +OPENSSL_SUFFIX		:= tar.gz
> +OPENSSL_URL		:= \
>  	https://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) \
>  	https://www.openssl.org/source/old/$(basename $(OPENSSL_VERSION))/$(OPENSSL).$(OPENSSL_SUFFIX)
> -OPENSSL_SOURCE	:= $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
> -OPENSSL_DIR	:= $(BUILDDIR)/$(OPENSSL)
> -OPENSSL_LICENSE	:= OpenSSL
> +OPENSSL_SOURCE		:= $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
> +OPENSSL_DIR		:= $(BUILDDIR)/$(OPENSSL)
> +OPENSSL_LICENSE		:= Apache-2.0
> +OPENSSL_LICENSE_FILES	:= \
> +	file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04
>  
>  # ----------------------------------------------------------------------------
>  # Prepare



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

end of thread, other threads:[~2024-03-15  4:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-03  9:37 [ptxdist] [PATCH] openssl: update license and add license file with hash Bruno Thomsen
2024-03-15  4:06 ` [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