openssh: Update to 8.1p1

This commit is contained in:
Alexey Pavlov
2019-10-14 09:28:14 +03:00
parent b352459e12
commit f221e4f8d2
2 changed files with 2 additions and 33 deletions

View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=openssh
pkgver=8.0p1
pkgver=8.1p1
pkgrel=1
pkgdesc='Free version of the SSH connectivity tools'
url='https://www.openssh.com/portable.html'
@@ -13,13 +13,11 @@ makedepends=('heimdal-devel' 'libedit-devel' 'libcrypt-devel' 'openssl-devel')
source=("https://mirrors.mit.edu/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc}
openssh-7.3p1-msys2.patch
openssh-7.3p1-msys2-setkey.patch
openssh-7.3p1-msys2-skip-privsep-tests.patch
openssh-7.3p1-msys2-drive-name-in-path.patch)
sha256sums=('bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68'
sha256sums=('02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff'
'SKIP'
'9530ab786e343ef576e0154afb850728b4b7101fc1169041da68137dd6ba7f3e'
'25079cf4a10c1ab70d60302bccaabee513762520dffd7c35285f7aae3ea36087'
'729aa8ef3723a223afbd1bda678a7deaca75b5c3b42a74b1a8c396f95f8677b5'
'903b3eee51e492a125cab9c724ad967450307d53e457f025e4432b81cb145af5')
validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30')
@@ -29,7 +27,6 @@ prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ${srcdir}/openssh-7.3p1-msys2.patch
patch -p1 -i ${srcdir}/openssh-7.3p1-msys2-setkey.patch
patch -p1 -i ${srcdir}/openssh-7.3p1-msys2-skip-privsep-tests.patch
patch -p1 -i ${srcdir}/openssh-7.3p1-msys2-drive-name-in-path.patch
autoreconf -fvi
}

View File

@@ -1,28 +0,0 @@
From 1de7f30668339f2bf3d74f1f1d19dd7714f8ff4d Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 22 Aug 2016 17:47:05 +0200
Subject: [PATCH] openssh: skip privilege separation tests
In MSYS2's context, it does not make sense, as we do not have a
special-purpose 'sshd' user account and also no easy way to make one.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
regress/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/regress/Makefile b/regress/Makefile
index 08fd82d..00cff71 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.88 2016/06/03 04:10:41 dtucker Exp $
-REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
+REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12
tests: prep $(REGRESS_TARGETS)
# Interop tests are not run by default
--
2.9.1