Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Dec 2019 02:55:14 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r520603 - in head/security/openssh-portable: . files
Message-ID:  <201912220255.xBM2tEBV045152@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Sun Dec 22 02:55:14 2019
New Revision: 520603
URL: https://svnweb.freebsd.org/changeset/ports/520603

Log:
  Update to 8.1p1
  
  Changes: https://www.openssh.com/txt/release-8.1
  
  Sponsored by:	Dell EMC

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/distinfo
  head/security/openssh-portable/files/extra-patch-hpn

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Sun Dec 22 02:28:57 2019	(r520602)
+++ head/security/openssh-portable/Makefile	Sun Dec 22 02:55:14 2019	(r520603)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	openssh
-DISTVERSION=	8.0p1
-PORTREVISION=	1
+DISTVERSION=	8.1p1
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	OPENBSD/OpenSSH/portable
@@ -116,7 +116,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-hpn-gss-glue
 .  endif
 # - See https://sources.debian.org/data/main/o/openssh/ for which subdir to
 # pull from.
-GSSAPI_DEBIAN_SUBDIR=	${DISTVERSION}-3
+GSSAPI_DEBIAN_SUBDIR=	${DISTVERSION}-1
 # - Debian does not use a versioned filename so we trick fetch to make one for
 # us with the ?<anything>=/ trick.
 PATCH_SITES+=	https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex

Modified: head/security/openssh-portable/distinfo
==============================================================================
--- head/security/openssh-portable/distinfo	Sun Dec 22 02:28:57 2019	(r520602)
+++ head/security/openssh-portable/distinfo	Sun Dec 22 02:55:14 2019	(r520603)
@@ -1,7 +1,5 @@
-TIMESTAMP = 1562109185
-SHA256 (openssh-8.0p1.tar.gz) = bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
-SIZE (openssh-8.0p1.tar.gz) = 1597697
-SHA256 (openssh-7.9p1+x509-11.5.diff.gz) = 1d15099ce54614f158f10f55b6b4992d915353f92a05e179a64b0655650c00bb
-SIZE (openssh-7.9p1+x509-11.5.diff.gz) = 594995
-SHA256 (openssh-8.0p1-gsskex-all-20141021-debian-rh-20190719.patch) = 6e07d74626915246d500eeaf9bfb23b1329d6e204d81ba67c09c9c237626c250
-SIZE (openssh-8.0p1-gsskex-all-20141021-debian-rh-20190719.patch) = 128374
+TIMESTAMP = 1576982938
+SHA256 (openssh-8.1p1.tar.gz) = 02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff
+SIZE (openssh-8.1p1.tar.gz) = 1625894
+SHA256 (openssh-8.1p1-gsskex-all-20141021-debian-rh-20190719.patch) = 7875fe41ce090ba2bb3d76c396f9e6de863fbad34235bf97a4012d2f949909fb
+SIZE (openssh-8.1p1-gsskex-all-20141021-debian-rh-20190719.patch) = 128409

Modified: head/security/openssh-portable/files/extra-patch-hpn
==============================================================================
--- head/security/openssh-portable/files/extra-patch-hpn	Sun Dec 22 02:28:57 2019	(r520602)
+++ head/security/openssh-portable/files/extra-patch-hpn	Sun Dec 22 02:55:14 2019	(r520603)
@@ -685,23 +685,14 @@ diff -urN -x configure -x config.guess -x config.h.in 
  	int64_t rekey_limit;
  	int	rekey_interval;
  	int	no_host_authentication_for_localhost;
---- work.clean/openssh-6.8p1/scp.c	2015-03-17 00:49:20.000000000 -0500
-+++ work/openssh-6.8p1/scp.c	2015-04-02 16:51:25.108407000 -0500
-@@ -1066,7 +1066,7 @@ source(int argc, char **argv)
- 	off_t i, statbytes;
- 	size_t amt, nr;
- 	int fd = -1, haderr, indx;
--	char *last, *name, buf[2048], encname[PATH_MAX];
-+	char *last, *name, buf[16384], encname[PATH_MAX];
- 	int len;
- 
- 	for (indx = 0; indx < argc; ++indx) {
+--- work/openssh/scp.c.orig	2019-12-20 18:52:08.907088000 -0800
++++ work/openssh-8.1p1/scp.c	2019-12-20 18:51:55.186005000 -0800
 @@ -1239,7 +1239,7 @@ sink(int argc, char **argv, const char *src)
  	off_t size, statbytes;
  	unsigned long long ull;
  	int setimes, targisdir, wrerrno = 0;
 -	char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048];
-+	char ch, *cp, *np, *targ, *why, *vect[1], buf[16384], visbuf[16384];
++	char ch, *cp, *np, *targ, *why, *vect[1], buf[COPY_BUFLEN], visbuf[COPY_BUFLEN];
  	char **patterns = NULL;
  	size_t n, npatterns = 0;
  	struct timeval tv[2];



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912220255.xBM2tEBV045152>