Skip to content

Commit

Permalink
openssh: skip privilege separation tests
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dscho committed Aug 22, 2016
1 parent 633933b commit da63f58
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
7 changes: 5 additions & 2 deletions openssh/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,20 @@ depends=('heimdal' 'libedit' 'libcrypt' 'openssl')
makedepends=('heimdal-devel' 'libedit-devel' 'libcrypt-devel' 'openssl-devel')
source=("http://mirrors.mit.edu/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
openssh-7.3p1-msys2.patch
openssh-7.3p1-msys2-setkey.patch)
openssh-7.3p1-msys2-setkey.patch
openssh-7.3p1-msys2-skip-privsep-tests.patch)
sha256sums=('3ffb989a6dcaa69594c3b550d4855a5a2e1718ccdde7f5e36387b424220fbecc'
'ab54293758c908bfdcd95b338bad5eb35290291e957dc99bc09fae4f906987fc'
'25079cf4a10c1ab70d60302bccaabee513762520dffd7c35285f7aae3ea36087')
'25079cf4a10c1ab70d60302bccaabee513762520dffd7c35285f7aae3ea36087'
'729aa8ef3723a223afbd1bda678a7deaca75b5c3b42a74b1a8c396f95f8677b5')

backup=('etc/ssh/ssh_config')

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
autoreconf -fvi
}

Expand Down
28 changes: 28 additions & 0 deletions openssh/openssh-7.3p1-msys2-skip-privsep-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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

0 comments on commit da63f58

Please sign in to comment.