drop deprecated OpenSSL 1.0.x and use OpenSSL 1.1.x instead.

component/nodejs/buildout.cfg

@@ -49,7 +49,7 @@ PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 # Server-side Javascript.
 version =
 md5sum =
-openssl_location = ${openssl-1.0:location}
+openssl_location = ${openssl:location}
 
 recipe = slapos.recipe.cmmi
 shared = true

component/openssl/buildout.cfg

@@ -7,7 +7,6 @@
 extends =
   ../ca-certificates/buildout.cfg
   ../coreutils/buildout.cfg
-  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -54,37 +53,3 @@ update-command = ${:command}
 command = ${coreutils-output:test} -x ${:openssl}
 openssl = ${openssl:location}/bin/openssl
 bin = ${openssl:location}
-
-[openssl-1.0]
-recipe = slapos.recipe.cmmi
-shared = true
-url = https://www.openssl.org/source/openssl-1.0.2u.tar.gz
-md5sum = cdc2638f789ecc2db2c91488265686c1
-location = @@LOCATION@@
-# 'prefix' option to override --openssldir/--prefix (which is useful
-# when combined with INSTALL_PREFIX). Used by slapos.package.git/obs
-prefix = ${:location}
-patch-binary = ${patch:location}/bin/patch
-patches =
-  ${:_profile_base_location_}/openssl-nodoc.patch#a78c14908fe9ec624b1fb9fa97e01bb9
-  ${:_profile_base_location_}/openssl-1.0.2d-parallel-build.patch#e4cf66a48a85a0da68fd4842e6fab54b
-patch-options = -p1
-configure-command = ./config
-configure-options =
-  -I${zlib:location}/include
-  -L${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 && x=${:location}/etc/ssl/certs && rm -f $x/* &&
-  for i in ${ca-certificates:location}/certs/*/*.crt; do
-    ln -sfv $i $x/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
-  ; done
-environment =
-  PERL=${perl:location}/bin/perl

component/openssl/openssl-nodoc.patch

-diff -ur openssl-1.0.2c.orig/Makefile openssl-1.0.2c/Makefile
---- openssl-1.0.2c.orig/Makefile	2015-06-12 17:10:40.000000000 +0200
-+++ openssl-1.0.2c/Makefile	2015-06-25 15:06:08.858209486 +0200
-@@ -528,7 +528,7 @@
- dist_pem_h:
- 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
- 
--install: all install_docs install_sw
-+install: all install_sw
- 
- install_sw:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

component/ruby/buildout.cfg

@@ -20,8 +20,8 @@ configure-options =
   --with-out-ext=tk,tk/tkutil,win32,win32ole
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl-1.0:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
   PKG_CONFIG_PATH=${libyaml:location}/lib/
 
 

software/gitlab/software.cfg

@@ -188,7 +188,7 @@ make-binary =
 make-targets= cd ${:path} &&
     ${:bundle} install --deployment  --without development test mysql aws kerberos
 environment =
-  PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
   CFLAGS=-I${xz-utils:location}/include
 
@@ -223,7 +223,7 @@ make-targets= cd ${go_github.com_libgit2_git2go:location}
               && sed -i 's/.*--build.*/cmake --build . --target install/' script/build-libgit2-static.sh
               && make install
 environment =
-  PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang1.12:location}/bin:${buildout:bin-directory}:%(PATH)s
   GOPATH=${gowork:directory}
 
@@ -239,7 +239,7 @@ golang  = ${golang1.12:location}
 install =
   lab.nexedi.com/kirr/git-backup
 cpkgpath =
-    ${openssl-1.0:location}/lib/pkgconfig
+    ${openssl:location}/lib/pkgconfig
     ${zlib:location}/lib/pkgconfig
     ${go_github.com_libgit2_git2go_prepare:path}/vendor/libgit2/install/lib/pkgconfig
 buildflags = --tags "static"
@@ -272,7 +272,7 @@ make-targets =
   unset GOBIN &&
   make
 environment =
-  PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${ruby2.3:location}/bin:%(PATH)s