OS-8412 Bump OpenSSH to 9.1p1 (#1060)

Reviewed by: Dan McDonald <danmcd@mnx.io>
Reviewed by: Travis Paul <travis.paul@mnx.io>
Approved by: Dan McDonald <danmcd@mnx.io>

Makefile

@@ -153,8 +153,9 @@ TOOLS_TARGETS = \
 	$(UCODECHECK) \
 	tools/cryptpass
 
-world: 0-strap-stamp 0-illumos-stamp 0-extra-stamp 0-livesrc-stamp \
-	0-local-stamp 0-tools-stamp 0-devpro-stamp $(TOOLS_TARGETS)
+world: 0-preflight-stamp 0-strap-stamp 0-illumos-stamp 0-extra-stamp \
+	0-livesrc-stamp 0-local-stamp 0-tools-stamp 0-devpro-stamp \
+	$(TOOLS_TARGETS)
 
 live: world manifest boot $(TOOLS_TARGETS) $(MANCF_FILE) mancheck
 	@echo $(SUBDIR_MANIFESTS)
@@ -350,6 +351,11 @@ $(STAMPFILE):
 
 FORCEARG_yes=-f
 
+# Check any build requirements that are easy to catch early.
+0-preflight-stamp:
+	$(ROOT)/tools/preflight
+	touch $@
+
 # build our proto.strap area
 0-strap-stamp:
 	$(ROOT)/tools/build_strap make \
@@ -369,7 +375,7 @@ $(CTFTOOLS_TARBALL): 0-strap-stamp $(STAMPFILE)
 	    -j $(MAX_JOBS) -o $(CTFTOOLS_TARBALL)
 
 # additional illumos-extra content for proto itself
-0-extra-stamp: 0-illumos-stamp
+0-extra-stamp: 0-preflight-stamp 0-illumos-stamp
 	(cd $(ROOT)/projects/illumos-extra && \
 	    gmake $(SUBDIR_DEFS) DESTDIR=$(PROTO) \
 	    install)

README.md

@@ -170,6 +170,13 @@ image, the SmartOS Platform Image must be 20211007 or newer. This can be done
 in VMware, on an existing SmartOS machine, or other virtualization. You must
 build inside of a non-global zone.
 
+### Minimum Platform Image
+
+As of [OS-8412](https://smartos.org/bugview/OS-8412), OpenSSH requires OpenSSL
+3.0 to build, which means that you'll need to use a platform that includes
+[OS-8334](https://smartos.org/bugview/OS-8334). Release builds as of
+20211216T012707Z will satisfy this requirement.
+
 ### Importing the Zone Image
 
 The SmartOS build currently uses the `base-64-lts 21.4.0` image

tools/preflight

@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+# Copyright 2022 MNX Cloud, Inc.
+#
+# This script will check some build requirements and provide a helpful
+# error message early, rather than a cryptic one much later in the build.
+#
+# This is primarily intended to check things that we know will fail in
+# illumos-extra if the build host doesn't satisfy the requirements.
+#
+
+if [[ -n "$TRACE" ]]; then
+    export PS4='[\D{%FT%TZ}] ${BASH_SOURCE}:${LINENO}: ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
+    set -o xtrace
+fi
+
+errors=0
+
+#
+# Begin checks
+#
+
+# OpenSSH 9 requires OpenSSL 3
+mapfile -t openssl_version < <(/bin/openssl version | awk -v 'OFS=\n' -F'[ .]' '{print $2,$3,$4}')
+openssl_maj="${openssl_version[0]}"
+if (( openssl_maj < 3 )); then
+    printf 'Platform image must include OpenSSL 3.0.0 or later.\n'
+    printf 'Release 20211216T012707Z or later will satisfy this requirement.\n'
+    errors=$(( errors + 1))
+fi
+
+#
+# If any of the checks above failed, exit  with a failure so that make stops
+# here.
+#
+
+if (( errors > 0 )); then
+    exit 1
+fi