components/openssh/patches/001-skip_config_check.patch
branchs11-update
changeset 3946 b1e0e68de63b
equal deleted inserted replaced
3942:dd80f8602a0d 3946:b1e0e68de63b
       
     1 #
       
     2 # This change is to remove some misleading error messages when running 
       
     3 # "gmake install". OpenSSH mixes the building and running together. Some 
       
     4 # system setup checking for running the program needs to be removed, because
       
     5 # they are not suitable in a build system.  This is for Solaris only, so we
       
     6 # will not contribute back this change to the upstream community.
       
     7 #
       
     8 --- orig/Makefile.in	Wed Mar 27 16:56:36 2013
       
     9 +++ new/Makefile.in	Wed Mar 27 17:05:06 2013
       
    10 @@ -237,7 +237,16 @@
       
    11  install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
       
    12  
       
    13  check-config:
       
    14 -	-$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
       
    15 +# On Solaris, to workaround OpenSSH's unlucky mixing of 'building ssh' and
       
    16 +# 'running ssh', on build machine the following requisites shouldn't be
       
    17 +# enforced:
       
    18 +#     1) existence of privsep user sshd
       
    19 +#     2) existence of privsep directory /var/empty
       
    20 +#     3) read permissions for /etc/ssh/ssh_host_[rsa,dsa]_key 
       
    21 +#
       
    22 +#	-$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
       
    23 +#
       
    24 +	@echo 'Oracle Solaris: skipping check-config'
       
    25  
       
    26  install-files:
       
    27  	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)