(#22610) openssl: add versions 3.2.1, 3.1.5 and 3.0.13

* openssl: add versions `3.2.1`, `3.1.5` and `3.0.13` * exclude 3.1.2 from conandata.yml * Exclude 3.1.2 from config.yml --------- Co-authored-by: Uilian Ries <[email protected]>
conan-io · Feb 1, 2024 · 30e1abe · 30e1abe
1 parent 9eb51cf
commit 30e1abe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/recipes/openssl/3.x.x/conandata.yml b/recipes/openssl/3.x.x/conandata.yml
@@ -3,12 +3,17 @@ sources:
     url:
       - "https://www.openssl.org/source/openssl-3.2.1.tar.gz"
       - "https://github.com/openssl/openssl/releases/download/openssl-3.2.1/openssl-3.2.1.tar.gz"
-    sha256: 83C7329FE52C850677D75E5D0B0CA245309B97E8ECBCFDC1DFDC4AB9FAC35B39
+    sha256: 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39
   3.2.0:
     url:
       - "https://www.openssl.org/source/openssl-3.2.0.tar.gz"
       - "https://github.com/openssl/openssl/releases/download/openssl-3.2.0/openssl-3.2.0.tar.gz"
     sha256: 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e
+  3.1.5:
+    url:
+      - "https://www.openssl.org/source/openssl-3.1.5.tar.gz"
+      - "https://github.com/openssl/openssl/releases/download/openssl-3.1.5/openssl-3.1.5.tar.gz"
+    sha256: 6ae015467dabf0469b139ada93319327be24b98251ffaeceda0221848dc09262
   3.1.4:
     url:
       - "https://www.openssl.org/source/openssl-3.1.4.tar.gz"
@@ -19,26 +24,16 @@ sources:
       - "https://www.openssl.org/source/openssl-3.1.3.tar.gz"
       - "https://github.com/openssl/openssl/releases/download/openssl-3.1.3/openssl-3.1.3.tar.gz"
     sha256: f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6
-  3.1.2:
-    url:
-      - "https://www.openssl.org/source/openssl-3.1.2.tar.gz"
-      - "https://github.com/openssl/openssl/releases/download/openssl-3.1.2/openssl-3.1.2.tar.gz"
-    sha256: a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539
-  3.1.1:
+  3.0.13:
     url:
-      - "https://www.openssl.org/source/openssl-3.1.1.tar.gz"
-      - "https://github.com/openssl/openssl/releases/download/openssl-3.1.1/openssl-3.1.1.tar.gz"
-    sha256: b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674
+      - "https://www.openssl.org/source/openssl-3.0.13.tar.gz"
+      - "https://github.com/openssl/openssl/releases/download/openssl-3.0.13/openssl-3.0.13.tar.gz"
+    sha256: 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
   3.0.12:
     url:
       - "https://www.openssl.org/source/openssl-3.0.12.tar.gz"
       - "https://github.com/openssl/openssl/releases/download/openssl-3.0.12/openssl-3.0.12.tar.gz"
     sha256: f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61
-  3.0.11:
-    url:
-      - "https://www.openssl.org/source/openssl-3.0.11.tar.gz"
-      - "https://github.com/openssl/openssl/releases/download/openssl-3.0.11/openssl-3.0.11.tar.gz"
-    sha256: b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
 patches:
   3.2.0:
     - patch_file: "patches/3.2.0-fix-winsock2.patch"

diff --git a/recipes/openssl/config.yml b/recipes/openssl/config.yml
@@ -5,18 +5,16 @@ versions:
   3.2.0:
     folder: "3.x.x"
   # 3.1.x releases
+  3.1.5:
+    folder: "3.x.x"
   3.1.4:
     folder: "3.x.x"
   3.1.3:
     folder: "3.x.x"
-  3.1.2:
-    folder: "3.x.x"
-  3.1.1:
-    folder: "3.x.x"
   # 3.0.x releases
-  3.0.12:
+  3.0.13:
     folder: "3.x.x"
-  3.0.11:
+  3.0.12:
     folder: "3.x.x"
   # 1.1.1x releases
   1.1.1w: