Merge remote-tracking branch 'boklmtpo/bug_33805_v2'

projects/openssl/build

@@ -14,7 +14,6 @@ export CC='gcc -m32'
   export CC="cc [% c("var/FLAGS") %]"
 [% END -%]
 [% IF c("var/windows") -%]
-  patch -p1 < $rootdir/escape-openssldir.patch
   patch -p1 < $rootdir/use-SOURCE_DATE_EPOCH.patch
 [% END -%]
 # OpenSSL expects the NDK home to include the pre-assembled architecture directory

projects/openssl/config

@@ -32,7 +32,5 @@ input_files:
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
     sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35
-  - filename: escape-openssldir.patch
-    enable: '[% c("var/windows") %]'
   - filename: use-SOURCE_DATE_EPOCH.patch
     enable: '[% c("var/windows") %]'

projects/openssl/escape-openssldir.patch

-diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 7db7578a4b..e5ba20b589 100644
---- a/Configurations/unix-Makefile.tmpl
-+++ b/Configurations/unix-Makefile.tmpl
-@@ -215,6 +215,7 @@ INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
-                   $prefix_dev -}
- INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir);
-                   $x =~ s|\\|/|g;
-+                  $x =~ s/([ \(\)])/\\$1/g;
-                   $x -}
- OPENSSLDIR_dev={- #
-                   # The logic here is that if no --openssldir was given,
-@@ -239,6 +240,7 @@ OPENSSLDIR_dev={- #
-                   $openssldir_dev -}
- OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir);
-                   $x =~ s|\\|/|g;
-+                  $x =~ s/([ \(\)])/\\$1/g;
-                   $x -}
- LIBDIR={- our $libdir = $config{libdir} || "lib";
-           File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -}
-@@ -253,6 +255,7 @@ ENGINESDIR_dev={- use File::Spec::Win32;
-                   $enginesdir_dev -}
- ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir);
-                   $x =~ s|\\|/|g;
-+                  $x =~ s/([ \(\)])/\\$1/g;
-                   $x -}
- # In a Windows environment, $(DESTDIR) is harder to contatenate with other
- # directory variables, because both may contain devices.  What we do here is