Merge pull request #405 from citrus-it/openssh

Openssh: Move to 64-bit, improve tests, cleanup patches.

Author: hadfl

build/openssh/build.sh

@@ -34,9 +34,9 @@ PKG=network/openssh
 SUMMARY="OpenSSH Client and utilities"
 DESC="OpenSSH Secure Shell protocol Client and associated Utilities"
 
-BUILDARCH=32
-# Since we're only building 32-bit, don't bother with isaexec subdirs
-CONFIGURE_OPTS_32="
+BUILDARCH=64
+# Since we're only building 64-bit, don't bother with isaexec subdirs
+CONFIGURE_OPTS_64="
     --prefix=$PREFIX
     --sysconfdir=/etc/ssh
     --includedir=$PREFIX/include
@@ -63,18 +63,11 @@ CONFIGURE_OPTS="
     --with-solaris-projects
 "
 
-CFLAGS+="-O2 "
+CFLAGS+="-O2 -g -fstack-check "
 CFLAGS+="-DPAM_ENHANCEMENT -DSET_USE_PAM -DPAM_BUGFIX -DDTRACE_SFTP "
 CFLAGS+="-I/usr/include/kerberosv5 -DKRB5_BUILD_FIX -DDISABLE_BANNER "
 CFLAGS+="-DDEPRECATE_SUNSSH_OPT -DOPTION_DEFAULT_VALUE -DSANDBOX_SOLARIS"
 
-auto_reconf() {
-        # This package needs a whack upside the head post-patches!
-        pushd $TMPDIR/$BUILDDIR >/dev/null
-        autoreconf -fi
-        popd
-}
-
 move_manpage() {
     local page=$1
     local old=$2
@@ -112,12 +105,19 @@ init
 download_source $PROG $PROG $VER
 move_manpages
 patch_source
-auto_reconf
+run_inbuild autoreconf -fi
 prep_build
 run_autoconf
 build
 install_smf network ssh.xml sshd
-run_testsuite tests
+
+export TESTSUITE_FILTER='^ok |^test_|failed|^all tests'
+(
+    # The test SSH daemon needs root privileges to properly access PAM
+    # on OmniOS. Sudo does not work well enough so use pfexec here.
+    export SUDO=pfexec
+    run_testsuite tests
+)
 
 # Remove the letter from VER for packaging
 VER=${VER//p/.}

build/openssh/patches/0012-Deprecate-SunSSH-compatible-server-options.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 12/34] Deprecate SunSSH compatible server options
 # server config (sshd_config) options. In internal testing we have discovered,
 # that this would bring too much trouble to the said administrators.
 # The probability of these options appearing in existing sshd_config files
-# is higher than initially though, because some of the options have been in
+# is higher than initially thought, because some of the options have been in
 # default sshd_config file for very long time. Also the consequence of
 # unknown server option is harsh - ssh service goes to maintenance mode
 # possible rendering the instance not accessible. For this reason we will

build/openssh/patches/0020-Compatibility-fix-for-ListenAddress.patch

@@ -8,7 +8,15 @@ fact will listen on both IPv4 and IPv6.
 diff -pruN '--exclude=*.orig' openssh-7.6p1~/servconf.c openssh-7.6p1/servconf.c
 --- openssh-7.6p1~/servconf.c	2017-11-22 12:16:10.881359013 +0000
 +++ openssh-7.6p1/servconf.c	2017-11-22 12:16:10.931424966 +0000
-@@ -768,11 +768,22 @@ process_queued_listen_addrs(ServerOption
+@@ -678,6 +841,7 @@
+ process_queued_listen_addrs(ServerOptions *options)
+ {
+ 	u_int i;
++	int v4port = 0;
+ 
+ 	if (options->num_ports == 0)
+ 		options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
+@@ -685,11 +849,25 @@
  		options->address_family = AF_UNSPEC;
 
  	for (i = 0; i < options->num_queued_listens; i++) {
@@ -19,7 +27,10 @@ diff -pruN '--exclude=*.orig' openssh-7.6p1~/servconf.c openssh-7.6p1/servconf.c
 +		 * on :: into a listener of unspecified AF (so it listens on
 +		 * v4 too)
 +		 */
-+		if (strcmp(options->queued_listen_addrs[i], "::") == 0) {
++		if (!strcmp(options->queued_listen_addrs[i], "0.0.0.0"))
++			v4port = options->queued_listen_ports[i];
++		if (!strcmp(options->queued_listen_addrs[i], "::") &&
++		    options->queued_listen_ports[i] != v4port) {
 +			add_listen_addr(options, NULL,
 +			    options->queued_listen_ports[i]);
 +		} else {

build/openssh/patches/0024-Add-with-key-dir-configure-option-to-place-SSH-host-.patch

@@ -7,13 +7,13 @@ diff -pruN '--exclude=*.orig' openssh-7.6p1~/pathnames.h openssh-7.6p1/pathnames
 --- openssh-7.6p1~/pathnames.h	2017-11-22 12:16:11.028564589 +0000
 +++ openssh-7.6p1/pathnames.h	2017-11-22 12:16:11.123678066 +0000
 @@ -46,6 +46,7 @@
- #define _PATH_HOST_ED25519_KEY_FILE	SSHKEYDIR "/ssh_host_ed25519_key"
- #define _PATH_HOST_RSA_KEY_FILE		SSHKEYDIR "/ssh_host_rsa_key"
- #define _PATH_DH_MODULI			SSHKEYDIR "/moduli"
+ #define _PATH_HOST_ED25519_KEY_FILE	SSHDIR "/ssh_host_ed25519_key"
+ #define _PATH_HOST_RSA_KEY_FILE		SSHDIR "/ssh_host_rsa_key"
+ #define _PATH_DH_MODULI			SSHDIR "/moduli"
 +#define _PATH_DEFAULT_LOGIN		ETCDIR "/default/login"
- /* Backwards compatibility */
- #define _PATH_DH_PRIMES			SSHDIR "/primes"
 
+ #ifndef _PATH_SSH_PROGRAM
+ #define _PATH_SSH_PROGRAM               "/usr/bin/ssh"
 diff -pruN '--exclude=*.orig' openssh-7.6p1~/servconf.c openssh-7.6p1/servconf.c
 --- openssh-7.6p1~/servconf.c	2017-11-22 12:16:10.931424966 +0000
 +++ openssh-7.6p1/servconf.c	2017-11-22 12:16:11.124233172 +0000