From 8450018b1ce8eb8c8cf38a3412d2915fd2e3e829 Mon Sep 17 00:00:00 2001
From: Guillaume Egles <gegles@users.noreply.github.com>
Date: Wed, 7 Aug 2024 04:17:25 -0700
Subject: [PATCH] (#24706) openssl: add version `3.3.1`

* openssl: add version `3.3.1`

* openssl 3.3.1: windows fixes

---------

Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
---
 recipes/openssl/3.x.x/conandata.yml | 3 +++
 recipes/openssl/3.x.x/conanfile.py  | 5 +++++
 recipes/openssl/config.yml          | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/recipes/openssl/3.x.x/conandata.yml b/recipes/openssl/3.x.x/conandata.yml
index 0e6fcf58a8a23..2d9a9b8cb4c8e 100644
--- a/recipes/openssl/3.x.x/conandata.yml
+++ b/recipes/openssl/3.x.x/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  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.2:
     url: "https://github.com/openssl/openssl/releases/download/openssl-3.2.2/openssl-3.2.2.tar.gz"
     sha256: 197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7
diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py
index 6b88374a14b20..91c611c18115c 100644
--- a/recipes/openssl/3.x.x/conanfile.py
+++ b/recipes/openssl/3.x.x/conanfile.py
@@ -6,6 +6,7 @@
 from conan.tools.gnu import AutotoolsToolchain
 from conan.tools.layout import basic_layout
 from conan.tools.microsoft import is_msvc, msvc_runtime_flag, unix_path
+from conan.tools.scm import Version
 
 import fnmatch
 import os
@@ -515,6 +516,10 @@ def _make(self):
                 # When `--prefix=/`, the scripts derive `\` without escaping, which
                 # causes issues on Windows
                 replace_in_file(self, "Makefile", "INSTALLTOP_dir=\\", "INSTALLTOP_dir=\\\\")
+                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;""")
             self._run_make()
 
     def _make_install(self):
diff --git a/recipes/openssl/config.yml b/recipes/openssl/config.yml
index 1ab48b68f1e65..474c4c3f3696f 100644
--- a/recipes/openssl/config.yml
+++ b/recipes/openssl/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.3.1":
+    folder: "3.x.x"
   "3.2.2":
     folder: "3.x.x"
   "3.2.1":