From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jun 2021 07:09:58 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly60U-00079I-R8 for lore@lore.pengutronix.de; Tue, 29 Jun 2021 07:09:58 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly60U-0005wT-IK; Tue, 29 Jun 2021 07:09:58 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ly5za-0005bc-EJ; Tue, 29 Jun 2021 07:09:02 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly5zZ-0005bl-T7; Tue, 29 Jun 2021 07:09:01 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ly5zZ-00AaO4-QG; Tue, 29 Jun 2021 07:09:01 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 29 Jun 2021 07:09:01 +0200 Message-Id: <20210629050901.2523109-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210611125527.12186-1-bst@pengutronix.de> References: <20210611125527.12186-1-bst@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] openssh: version bump 8.3p1 -> 8.6p1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Bastian Krause Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as ff7d50a595870b1eea44c708df964fab6a17cc25. Michael [sent from post-receive hook] On Tue, 29 Jun 2021 07:09:01 +0200, Bastian Krause 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 > Message-Id: <20210611125527.12186-1-bst@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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