[packages/openssh] hack: require openssh-server only if sshd user does not exist

glen glen at pld-linux.org
Wed Mar 25 13:34:48 CET 2015


commit 9880a59f756b36e134de49bbf95e5c9615fcf80c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 25 14:34:19 2015 +0200

    hack: require openssh-server only if sshd user does not exist
    
    refs 163b394

 openssh.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/openssh.spec b/openssh.spec
index 64a5dd8..fb9293c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -73,7 +73,6 @@ Patch15:	%{name}-disable_ldap.patch
 Patch16:	libseccomp-sandbox.patch
 URL:		http://www.openssh.com/portable.html
 BuildRequires:	%{__perl}
-%{?with_tests:BuildRequires:	%{name}-server}
 %{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -93,6 +92,9 @@ BuildRequires:	sed >= 4.0
 # libseccomp based sandbox requires NO_NEW_PRIVS prctl flag
 %{?with_tests:BuildRequires:	uname(release) >= 3.5}
 BuildRequires:	zlib-devel >= 1.2.3
+%if %{with tests} && 0%(id -u sshd 2>/dev/null; echo $?)
+BuildRequires:	%{name}-server
+%endif
 Requires:	zlib >= 1.2.3
 %if "%{pld_release}" == "ac"
 Requires:	filesystem >= 2.0-1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/9880a59f756b36e134de49bbf95e5c9615fcf80c



More information about the pld-cvs-commit mailing list