Skip to contentSkip to conversation

package/openssh: bump to version 8.0p1

PATCH New aduskett at gmail.com 1 participant 1 message Jun 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/openssh: bump to version 8.0p1

From: Adam Duskett <[email protected]>

Also remove upstream patches.

---
 ...w-empty-incoming-filename-or-ones-th.patch |  39 ---
 ...e-scp-filenames-via-snmprintf.-To-do.patch | 275 ------------------
 ...n-scp-client-that-filenames-sent-dur.patch | 186 ------------
 package/openssh/openssh.hash                  |   4 +-
 package/openssh/openssh.mk                    |   2 +-
 5 files changed, 3 insertions(+), 503 deletions(-)
 delete mode 100644 package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch
 delete mode 100644 package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch
 delete mode 100644 package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch
package/openssh/0001-upstream-disallow-empty-incoming-filename-or-ones-th.patch deleted +0 -39
deleted file mode 100644
index 2b5a958d13..0000000000
@@ -1,39 +0,0 @@
-From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001
-From: "djm at openbsd.org" <[email protected]>
-Date: Fri, 16 Nov 2018 03:03:10 +0000
-Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer
- to the
-
-current directory; based on report/patch from Harry Sintonen
-
-OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status (openssh-portable): commit 6010c0303a422
-
- scp.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/scp.c b/scp.c
-index 60682c68769b..4f3fdcd3db89 100644
---- a/scp.c
-+++ b/scp.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
-+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */
- /*
-  * scp - secure remote copy.  This is basically patched BSD rcp which
-  * uses ssh to do the data transfer (instead of using rcmd).
-@@ -1106,7 +1106,8 @@ sink(int argc, char **argv)
- 			SCREWUP("size out of range");
- 		size = (off_t)ull;
- 
--		if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
-+		if (*cp == '\0' || strchr(cp, '/') != NULL ||
-+		    strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
- 			run_err("error: unexpected filename: %s", cp);
- 			exit(1);
- 		}
--- 
-2.20.1
-
package/openssh/0002-upstream-Sanitize-scp-filenames-via-snmprintf.-To-do.patch deleted +0 -275

275 lines not on this page · raw message

package/openssh/0003-upstream-check-in-scp-client-that-filenames-sent-dur.patch deleted +0 -186

186 lines not on this page · raw message

package/openssh/openssh.hash +2 -2
index 26b143c059..f4ae9042a1 100644
@@ -1,4 +1,4 @@
-# From http://www.openssh.com/txt/release-7.9 (base64 encoded)
-sha256 6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad  openssh-7.9p1.tar.gz
+# From http://www.openssh.com/txt/release-8.0 (base64 encoded)
+sha256 bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68  openssh-8.0p1.tar.gz
 # Locally calculated
 sha256 05a4c25ef464e19656c5259bd4f4da8428efab01044f3541b79fbb3ff209350f  LICENCE
package/openssh/openssh.mk +1 -1
index d21640e43e..85c570ce40 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENSSH_VERSION = 7.9p1
+OPENSSH_VERSION = 8.0p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain
 OPENSSH_LICENSE_FILES = LICENCE
Signature · 1 line
2.21.0