(conan-io#25125) openssl: add versions 3.0.15, 3.1.7, 3.2.3, `3…

….3.2` * openssl: add versions `3.0.15`, `3.1.7`, `3.2.3`, `3.3.2` * openssl: update Windows workaround for OpenSSL 3.3.2 --------- Co-authored-by: Marian Klymov <[email protected]>
petermbauer · Sep 16, 2024 · ded30ba · ded30ba
1 parent 5e31e69
commit ded30ba
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/recipes/openssl/3.x.x/conandata.yml b/recipes/openssl/3.x.x/conandata.yml
@@ -1,19 +1,31 @@
 sources:
+  3.3.2:
+    url: "https://github.com/openssl/openssl/releases/download/openssl-3.3.2/openssl-3.3.2.tar.gz"
+    sha256: 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281
   3.3.1:
     url: "https://github.com/openssl/openssl/releases/download/openssl-3.3.1/openssl-3.3.1.tar.gz"
     sha256: 777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e
+  3.2.3:
+    url: "https://github.com/openssl/openssl/releases/download/openssl-3.2.3/openssl-3.2.3.tar.gz"
+    sha256: 52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239
   3.2.2:
     url: "https://github.com/openssl/openssl/releases/download/openssl-3.2.2/openssl-3.2.2.tar.gz"
     sha256: 197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7
   3.2.1:
     url: "https://github.com/openssl/openssl/releases/download/openssl-3.2.1/openssl-3.2.1.tar.gz"
     sha256: 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39
+  3.1.7:
+    url: "https://github.com/openssl/openssl/releases/download/openssl-3.1.7/openssl-3.1.7.tar.gz"
+    sha256: 053a31fa80cf4aebe1068c987d2ef1e44ce418881427c4464751ae800c31d06c
   3.1.6:
     url: "https://github.com/openssl/openssl/releases/download/openssl-3.1.6/openssl-3.1.6.tar.gz"
     sha256: 5d2be4036b478ef3cb0a854ca9b353072c3a0e26d8a56f8f0ab9fb6ed32d38d7
   3.1.5:
     url: "https://github.com/openssl/openssl/releases/download/openssl-3.1.5/openssl-3.1.5.tar.gz"
     sha256: 6ae015467dabf0469b139ada93319327be24b98251ffaeceda0221848dc09262
+  3.0.15:
+    url: "https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz"
+    sha256: 23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533
   3.0.14:
     url: "https://github.com/openssl/openssl/releases/download/openssl-3.0.14/openssl-3.0.14.tar.gz"
     sha256: eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca

diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py
@@ -519,7 +519,11 @@ def _make(self):
                 if Version(self.version) >= "3.3.0":
                     # replace backslashes in paths with forward slashes
                     mkinstallvars_pl = os.path.join(self.source_folder, "util", "mkinstallvars.pl")
-                    replace_in_file(self, mkinstallvars_pl, "$ENV{$k} = $v;", """$v =~ s|\\\\|/|g; $ENV{$k} = $v;""")
+                    if Version(self.version) >= "3.3.2":
+                        replace_in_file(self, mkinstallvars_pl, "push @{$values{$k}}, $v;", """$v =~ s|\\\\|/|g; push @{$values{$k}}, $v;""")
+                        replace_in_file(self, mkinstallvars_pl, "$values{$k} = $v;", """$v->[0] =~ s|\\\\|/|g; $values{$k} = $v;""")
+                    else:
+                        replace_in_file(self, mkinstallvars_pl, "$ENV{$k} = $v;", """$v =~ s|\\\\|/|g; $ENV{$k} = $v;""")
             self._run_make()
 
     def _make_install(self):

diff --git a/recipes/openssl/config.yml b/recipes/openssl/config.yml
@@ -1,14 +1,22 @@
 versions:
+  "3.3.2":
+    folder: "3.x.x"
   "3.3.1":
     folder: "3.x.x"
+  "3.2.3":
+    folder: "3.x.x"
   "3.2.2":
     folder: "3.x.x"
   "3.2.1":
     folder: "3.x.x"
+  "3.1.7":
+    folder: "3.x.x"
   "3.1.6":
     folder: "3.x.x"
   "3.1.5":
     folder: "3.x.x"
+  "3.0.15":
+    folder: "3.x.x"
   "3.0.14":
     folder: "3.x.x"
   "3.0.13":