[tmp] Revert OpenSSL fixup

In preparation to move all the ``` [openssl] <= openssl-1.1 ``` from individual Python2 SRs to a common stack/slapos-py2.cfg introduced next. This commit is kept separate on purpose until nexedi/master is stable.

[tmp] Revert OpenSSL fixup
In preparation to move all the ``` [openssl] <= openssl-1.1 ``` from individual Python2 SRs to a common stack/slapos-py2.cfg introduced next. This commit is kept separate on purpose until nexedi/master is stable.
a0f8abd9 · Xavier Thompson · Jérome Perrin · 62ea8d47 · a0f8abd9 · a0f8abd9
Commit a0f8abd9 authored May 17, 2024 by Xavier Thompson Committed by Jérome Perrin May 24, 2024
19 changed files
--- a/component/ZODB/test-zodb4-wc2.cfg
+++ b/component/ZODB/test-zodb4-wc2.cfg
@@ -25,9 +25,6 @@ revision =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 # we need persistent to be a git checkout because persistent tests want to
 # discover in-tree files that are not present in persistent egg when it is
 # installed in non-development mode:

--- a/component/nxdtest/test-py2.cfg
+++ b/component/nxdtest/test-py2.cfg
@@ -6,6 +6,3 @@ extends =

 [python]
 part = python2.7
-
-[openssl]
-<= openssl-1.1
--- a/component/pygolang/test-py2.cfg
+++ b/component/pygolang/test-py2.cfg
@@ -5,6 +5,3 @@ extends = test.cfg

 [python]
 part = python2.7
-
-[openssl]
-<= openssl-1.1
--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -17,6 +17,9 @@ extends =
 parts =
    python2.7

+[openssl]
+<= openssl-1.1
+
 [bootstrap2.7]
 recipe = zc.recipe.egg
 eggs = zc.buildout

--- a/component/re6stnet/buildout.cfg
+++ b/component/re6stnet/buildout.cfg
@@ -15,9 +15,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [gcc]
 min_version = 0


--- a/component/zodbtools/test-py2.cfg
+++ b/component/zodbtools/test-py2.cfg
 [python]
 part = python2.7
-
-[openssl]
-<= openssl-1.1
--- a/software/backupserver/software.cfg
+++ b/software/backupserver/software.cfg
@@ -30,9 +30,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [rssgen-eggs]
 recipe = zc.recipe.egg
 interpreter = python-${:_buildout_section_name_}

--- a/software/beremiz-ide/software.cfg
+++ b/software/beremiz-ide/software.cfg
@@ -45,9 +45,6 @@ max_version = 0
 # Beremiz works with python2.7 for now, the code is not yet upgraded for python3
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [open62541]
 # Beremiz need it to be in folder parts/open62541
 # as Beremiz search for open62541 to BEREMIZ_PATH/../open62541

--- a/software/beremiz-runtime/software.cfg
+++ b/software/beremiz-runtime/software.cfg
@@ -22,9 +22,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [gcc]
 # we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
 max_version = 0

--- a/software/build-rina/software.cfg
+++ b/software/build-rina/software.cfg
@@ -11,9 +11,6 @@ download-cache = ${:directory}/download-cache
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [template]
 recipe = slapos.recipe.template:jinja2
 # XXX: "template.cfg" is hardcoded in instanciation recipe

--- a/software/buildout-testing/software-py2.cfg
+++ b/software/buildout-testing/software-py2.cfg
@@ -4,6 +4,3 @@ extends =

 [python]
 part = python2.7
-
-[openssl]
-<= openssl-1.1
--- a/software/dream/software.cfg
+++ b/software/dream/software.cfg
@@ -24,9 +24,6 @@ part = gcc-8.5
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [dream-repository.git]
 revision = f3bcf115741886835df8c0ca0fdbf510d77d8db8


--- a/software/hellorina/software.cfg
+++ b/software/hellorina/software.cfg
@@ -9,9 +9,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [file]
 # For old GCC like 4.9.2 on Debian 8.
 # XXX: This should be moved to component/rina-tools/buildout.cfg, next to where

--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -33,9 +33,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [gcc:python2]
 # use old gcc version for old scipy version used in python2
 part = gcc-8.5

--- a/software/neotest/software.cfg
+++ b/software/neotest/software.cfg
@@ -50,9 +50,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [neo]
 <= go-git-package
 go.importpath = lab.nexedi.com/kirr/neo

--- a/software/re6stnet/software.cfg
+++ b/software/re6stnet/software.cfg
@@ -20,9 +20,6 @@ parts +=
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [re6stnet-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/re6stnet.git

--- a/software/slapos-testing/software-py2.cfg
+++ b/software/slapos-testing/software-py2.cfg
@@ -5,9 +5,6 @@ extends =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [extra-eggs]
 eggs +=
  ${re6stnet-setup:egg}

--- a/software/tsn-demo/software.cfg
+++ b/software/tsn-demo/software.cfg
@@ -15,9 +15,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 # eggs for instance-rsn-client.cfg
 [eggs]
 recipe  = zc.recipe.egg

--- a/software/zabbix-agent/software.cfg
+++ b/software/zabbix-agent/software.cfg
@@ -13,9 +13,6 @@ parts =
 [python]
 part = python2.7

-[openssl]
-<= openssl-1.1
-
 [template]
 # Default template for the instance.
 recipe = slapos.recipe.template