Revert previous commit as OpenSSL 1.0/1.1 are already used here and there....

Revert previous commit as OpenSSL 1.0/1.1 are already used here and there. Instead make OpenSSH uses OpenSSL 1.0.

This reverts commit 6ca7789a.

component/openssh/buildout.cfg

@@ -22,8 +22,8 @@ patch-binary = ${patch:location}/bin/patch
 patches =
   ${:_profile_base_location_}/no_create_privsep_path.patch#d5b61a2442fffa457cebe4ad1dc68f4e
 environment = 
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${openssl-1.0:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib
 configure-options = 
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --exec-prefix=${buildout:parts-directory}/${:_buildout_section_name_}

component/openssl/buildout.cfg

@@ -17,6 +17,45 @@ parts =
 [openssl]
 recipe = slapos.recipe.cmmi
 shared = true
+url = https://www.openssl.org/source/openssl-1.1.1.tar.gz
+md5sum = 7079eb017429e0ffb9efb42bf80ccb21
+location = @@LOCATION@@
+# 'prefix' option to override --openssldir/--prefix (which is useful
+# when combined with INSTALL_PREFIX). Used by slapos.package.git/obs
+prefix = ${:location}
+certs = ${:location}/etc/ssl/certs
+configure-command = ./config
+configure-options =
+  --with-zlib-include=${zlib:location}/include
+  --with-zlib-lib=${zlib:location}/lib
+  --openssldir=${:prefix}/etc/ssl
+  --prefix=${:prefix}
+  --libdir=lib
+  shared no-idea no-mdc2 no-rc5 zlib
+  -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${:location}/lib
+  && make depend
+make-options =
+  SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib'
+make-targets =
+  install_sw install_ssldirs &&
+  rm -f ${:certs}/* &&
+  for i in ${ca-certificates:location}/certs/*/*.crt; do
+    ln -sv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
+  ; done
+environment =
+  PERL=${perl:location}/bin/perl
+
+[openssl-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:openssl}
+openssl = ${openssl:location}/bin/openssl
+
+[openssl-1.0]
+recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.openssl.org/source/openssl-1.0.2p.tar.gz
 md5sum = ac5eb30bf5798aa14b1ae6d0e7da58df
 location = @@LOCATION@@
@@ -47,11 +86,3 @@ make-targets =
   ; done
 environment =
   PERL=${perl:location}/bin/perl
-
-[openssl-output]
-# Shared binary location to ease migration
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = ${coreutils-output:test} -x ${:openssl}
-openssl = ${openssl:location}/bin/openssl