components/network/openssh/patches/0002-Skip-config-check.patch

   1 From 41b029a3dab10a1bd3d2924a3b6c891b74102599 Mon Sep 17 00:00:00 2001
   2 From: oracle <solaris@oracle.com>
   3 Date: Mon, 3 Aug 2015 14:31:53 -0700
   4 Subject: [PATCH 02/34] Skip config check
   5
   6 #
   7 # This change is to remove some misleading error messages when running
   8 # "gmake install". OpenSSH mixes the building and running together. Some
   9 # system setup checking for running the program needs to be removed, because
  10 # they are not suitable in a build system.  This is for Solaris only, so we
  11 # will not contribute back this change to the upstream community.
  12 #
  13 ---
  14  Makefile.in | 11 ++++++++++-
  15  1 file changed, 10 insertions(+), 1 deletion(-)
  16
  17 diff --git a/Makefile.in b/Makefile.in
  18 index d401787..c124ef6 100644
  19 --- a/Makefile.in
  20 +++ b/Makefile.in
  21 @@ -291,7 +291,16 @@ install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysc
  22  install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
  23
  24  check-config:
  25 -       -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
  26 +# On Solaris, to workaround OpenSSH's unlucky mixing of 'building ssh' and
  27 +# 'running ssh', on build machine the following requisites shouldn't be
  28 +# enforced:
  29 +#     1) existence of privsep user sshd
  30 +#     2) existence of privsep directory /var/empty
  31 +#     3) read permissions for /etc/ssh/ssh_host_[rsa,dsa]_key
  32 +#
  33 +#      -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
  34 +#
  35 +       @echo 'Oracle Solaris: skipping check-config'
  36
  37  install-files:
  38         $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  39 --
  40 2.5.4 (Apple Git-61)
  41