From f9fa4fd518d0f49b3176603c4c6ccabf78fd2bcf Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Tue, 6 Aug 2019 19:13:28 +0100
Subject: OpenSSH necessary to use OpenMPI

Until now, OpenMPI was being installed without any dependency. This was
fine because it would indeed build. But the moment you tried loading
something that depends on it (for example `mpi4py' through `astropy'), you
would get an error complaining that SSH isn't present.

With this commit, the pipeline now also installs OpenSSH to solve this
problem.
---
 reproduce/software/config/installation/checksums.mk |  1 +
 reproduce/software/config/installation/versions.mk  |  1 +
 reproduce/software/make/high-level.mk               | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'reproduce/software')

diff --git a/reproduce/software/config/installation/checksums.mk b/reproduce/software/config/installation/checksums.mk
index f370c39..d061595 100644
--- a/reproduce/software/config/installation/checksums.mk
+++ b/reproduce/software/config/installation/checksums.mk
@@ -97,6 +97,7 @@ libxml2-checksum = cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa
 netpbm-checksum = 064720f8a9d0a502488e1af4daecdbf3936910996507ca6f311073a0ad842346692a148eb1ddf7b717f7b108f60500246cb4b83f4d3665f5fc285a84ae1d63d6
 openblas-checksum = 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0
 openmpi-checksum = 760716974cb6b25ad820184622e1ee7926bc6fda87db6b574f76792bc1ca99522e52195866c14b7cb2df5a4981efdaf9f71d2c5533cc0e8e45c2c4b3b74cbacc
+openssh-checksum = e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982
 pixman-checksum = 1b0205dbe9d9185c68813ce577a889f3c83e83fbd9955c3a72d411c3b476e6be93fc246b5b6ef4ee17e2bb8eb6fb5559e01dff7feb6a6c4c6314f980e960d690
 python-checksum = c87be001f3de677f7838cc7767beefe5781d3d5e4ba39abb8dba1d77ce4a334660e27ed2dfd26bc90afcdb94b5b8a3a7aea329852557404d1c85cb2c268651db
 scamp-checksum = 35034a367d2cd09dc51e727e0f23ef6234edc0d978fd71cda1e80391d86af160138cb57281f7f7f9047e35b1246a0de6b235414086a62524413ed423f498583f
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk
index f8c6c72..085646c 100644
--- a/reproduce/software/config/installation/versions.mk
+++ b/reproduce/software/config/installation/versions.mk
@@ -93,6 +93,7 @@ libtiff-version = 4.0.10
 libxml2-version = 2.9.9
 openblas-version = 0.3.5
 openmpi-version = 4.0.1
+openssh-version = 8.0p1
 pixman-version = 0.38.0
 python-version = 3.7.3
 scamp-version = 2.6.7
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 167f430..c175622 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -152,8 +152,9 @@ tarballs = $(foreach t, astrometry.net-$(astrometrynet-version).tar.gz \
                         libgit2-$(libgit2-version).tar.gz \
                         libxml2-$(libxml2-version).tar.gz \
                         netpbm-$(netpbm-version).tar.gz \
-                        openmpi-$(openmpi-version).tar.gz \
                         openblas-$(openblas-version).tar.gz \
+                        openmpi-$(openmpi-version).tar.gz \
+                        openssh-$(openssh-version).tar.gz \
                         pixman-$(pixman-version).tar.gz \
                         scamp-$(scamp-version).tar.lz \
                         scons-$(scons-version).tar.gz \
@@ -226,6 +227,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
 	  c=$(openmpi-checksum)
 	  majorver=$$(echo $(openmpi-version) | sed -e 's/\./ /g' | awk '{printf("%d.%d", $$1, $$2)}')
 	  w=https://download.open-mpi.org/release/open-mpi/v$$majorver/$*
+	elif [ $$n = openssh     ]; then c=$(openssh-checksum); w=https://artfiles.org/openbsd/OpenSSH/portable
 	elif [ $$n = pixman      ]; then c=$(pixman-checksum); w=https://www.cairographics.org/releases
 	elif [ $$n = scamp       ]; then c=$(scamp-checksum); w=http://akhlaghi.org/reproduce-software
 	elif [ $$n = scons       ]; then
@@ -479,11 +481,20 @@ $(ibidir)/openblas: $(tdir)/openblas-$(openblas-version).tar.gz
 	&& rm -rf OpenBLAS-$(openblas-version) \
 	&& echo "OpenBLAS $(openblas-version)" > $@
 
-$(ibidir)/openmpi: $(tdir)/openmpi-$(openmpi-version).tar.gz
+$(ibidir)/openmpi: $(tdir)/openmpi-$(openmpi-version).tar.gz \
+                   | $(ibidir)/openssh
 	$(call gbuild, $<, openmpi-$(openmpi-version), static, , \
 	               -j$(numthreads) V=1) \
 	&& echo "Open MPI $(openmpi-version)" > $@
 
+$(ibidir)/openssh: $(tdir)/openssh-$(openssh-version).tar.gz
+	$(call gbuild, $<, openssh-$(openssh-version), static, \
+	               --with-ssl-engine \
+	               --with-privsep-user=nobody \
+	               --with-md5-passwords \
+	               , -j$(numthreads) V=1) \
+	&& echo "OpenSSH $(openssh-version)" > $@
+
 $(ibidir)/pixman: $(tdir)/pixman-$(pixman-version).tar.gz
 	$(call gbuild, $<, pixman-$(pixman-version), static, , \
 	                   -j$(numthreads) V=1) \
-- 
cgit v1.2.1