Use openssl 1.1

software/gitlab/software.cfg

@@ -185,13 +185,14 @@ configure-command = cd ${:path} &&
     ${:bundle} config --local build.re2 --with-re2-dir=${re2:location} &&
     ${:bundle} config --local build.nokogiri --with-zlib-dir=${zlib:location} --with-cflags=-I${xz-utils:location}/include --with-ldflags="-L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib"
     ${:bundle} config --local build.rugged --use-system-libraries --with-git2-dir=${libgit2:location}
+    ${:bundle} config --local build.openssl --with-openssl-dir=${openssl:location}
     ${:bundle} config set without 'development test mysql aws kerberos'
     ${:bundle} config set deployment 'true'
 
 make-binary =
 make-targets= cd ${:path} && ${:bundle} install
 environment =
-  PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig:${libgit2:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig:${libgit2:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
   CFLAGS=-I${xz-utils:location}/include
 
@@ -226,7 +227,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.15:location}/bin:${buildout:bin-directory}:%(PATH)s
   GOPATH=${gowork:directory}
 
@@ -239,7 +240,7 @@ golang  = ${golang1.15: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"
@@ -277,9 +278,9 @@ post-install =
   # solve the problem error="not executable: ruby/git-hooks/pre-receive"
   chmod 755 ${:path}/ruby/git-hooks/gitlab-shell-hook
 environment =
-  PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${libgit2:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${libgit2:location}/lib/pkgconfig
   PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${ruby:location}/bin:%(PATH)s
-  OPENSSL_ROOT_DIR=${openssl-1.0:location}
+  OPENSSL_ROOT_DIR=${openssl:location}
 
 [xnice-repository]
 # to get kirr's misc repo containing xnice script for executing processes