[ptxdist] [PATCH] openssh: version bump 8.3p1 -> 8.6p1

[ptxdist] [PATCH] openssh: version bump 8.3p1 -> 8.6p1

[Bastian Krause]

LICENSE was converted to UTF-8 with OpenSSH's 2ad5b36b [1], so drop the
encoding=.

OpenSSH's 922cfac5 [2] added missed BSD-2-Clause/BSD-4-Clause licenses
for some portions of the code. So add the missing BSD-4-Clause.

[1] https://anongit.mindrot.org/openssh.git/commit/?id=2ad5b36b
[2] https://anongit.mindrot.org/openssh.git/commit/?id=922cfac5

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/openssh.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/openssh.make b/rules/openssh.make
index 2c86a97a1..d85771a9e 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh
 #
 # Paths and names
 #
-OPENSSH_VERSION	:= 8.3p1
-OPENSSH_MD5	:= 68d7527bf2672153ca47402f6489a1af
+OPENSSH_VERSION	:= 8.6p1
+OPENSSH_MD5	:= 805f7048aec6dd752584e570383a6f00
 OPENSSH		:= openssh-$(OPENSSH_VERSION)
 OPENSSH_SUFFIX	:= tar.gz
 OPENSSH_URL	:= \
@@ -25,8 +25,8 @@ OPENSSH_URL	:= \
 
 OPENSSH_SOURCE	:= $(SRCDIR)/$(OPENSSH).$(OPENSSH_SUFFIX)
 OPENSSH_DIR	:= $(BUILDDIR)/$(OPENSSH)
-OPENSSH_LICENSE	:= BSD AND BSD-2-Clause AND BSD-3-Clause AND MIT AND Beerware AND ISC
-OPENSSH_LICENSE_FILES := file://LICENCE;encoding=ISO-8859-1;md5=18d9e5a8b3dd1790d73502f50426d4d3
+OPENSSH_LICENSE	:= BSD AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT AND Beerware AND ISC
+OPENSSH_LICENSE_FILES := file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] openssh: version bump 8.3p1 -> 8.6p1

[Michael Olbrich]

Thanks, applied as ff7d50a595870b1eea44c708df964fab6a17cc25.

Michael

[sent from post-receive hook]

On Tue, 29 Jun 2021 07:09:01 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> LICENSE was converted to UTF-8 with OpenSSH's 2ad5b36b [1], so drop the
> encoding=.
> 
> OpenSSH's 922cfac5 [2] added missed BSD-2-Clause/BSD-4-Clause licenses
> for some portions of the code. So add the missing BSD-4-Clause.
> 
> [1] https://anongit.mindrot.org/openssh.git/commit/?id=2ad5b36b
> [2] https://anongit.mindrot.org/openssh.git/commit/?id=922cfac5
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20210611125527.12186-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/openssh.make b/rules/openssh.make
> index 2c86a97a13c4..d85771a9e130 100644
> --- a/rules/openssh.make
> +++ b/rules/openssh.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh
>  #
>  # Paths and names
>  #
> -OPENSSH_VERSION	:= 8.3p1
> -OPENSSH_MD5	:= 68d7527bf2672153ca47402f6489a1af
> +OPENSSH_VERSION	:= 8.6p1
> +OPENSSH_MD5	:= 805f7048aec6dd752584e570383a6f00
>  OPENSSH		:= openssh-$(OPENSSH_VERSION)
>  OPENSSH_SUFFIX	:= tar.gz
>  OPENSSH_URL	:= \
> @@ -25,8 +25,8 @@ OPENSSH_URL	:= \
>  
>  OPENSSH_SOURCE	:= $(SRCDIR)/$(OPENSSH).$(OPENSSH_SUFFIX)
>  OPENSSH_DIR	:= $(BUILDDIR)/$(OPENSSH)
> -OPENSSH_LICENSE	:= BSD AND BSD-2-Clause AND BSD-3-Clause AND MIT AND Beerware AND ISC
> -OPENSSH_LICENSE_FILES := file://LICENCE;encoding=ISO-8859-1;md5=18d9e5a8b3dd1790d73502f50426d4d3
> +OPENSSH_LICENSE	:= BSD AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND MIT AND Beerware AND ISC
> +OPENSSH_LICENSE_FILES := file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de