Ports: Update openssl's patches to use git patches

4 files changed, 63 insertions, 19 deletions

diff --git a/Ports/openssl/patches/serenity-configuration.patch b/Ports/openssl/patches/0001-Add-a-serenity-configuration.patch
index c1ea2e97e3..24e546d483 100644
--- a/Ports/openssl/patches/serenity-configuration.patch
+++ b/Ports/openssl/patches/0001-Add-a-serenity-configuration.patch
@@ -1,6 +1,18 @@
---- openssl-1.1.1n/Configurations/10-main.conf	2021-03-25 21:28:38.000000000 +0800
-+++ openssl-1.1.1n/Configurations/10-main.conf	2021-09-26 00:05:04.340004623 +0800
-@@ -627,6 +627,30 @@
+From 924ba86b0ea438a69f0110ccf16cebe24619d3e1 Mon Sep 17 00:00:00 2001
+From: Luke Wilde <lukew@serenityos.org>
+Date: Wed, 16 Mar 2022 12:52:30 +0000
+Subject: [PATCH 1/2] Add a serenity configuration
+
+Co-Authored-By: Rodrigo Tobar <rtobarc@gmail.com>
+---
+ Configurations/10-main.conf | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
+index 8ca8235..3dea01f 100644
+--- a/Configurations/10-main.conf
++++ b/Configurations/10-main.conf
+@@ -627,6 +627,30 @@ my %targets = (
          shared_extension => ".so",
      },
  
@@ -31,3 +43,6 @@
  ####
  #### Variety of LINUX:-)
  ####
+-- 
+2.36.1
+
diff --git a/Ports/openssl/patches/0002-Add-build-configuration-info-for-serenity.patch b/Ports/openssl/patches/0002-Add-build-configuration-info-for-serenity.patch
new file mode 100644
index 0000000000..7c60fd2b61
--- /dev/null
+++ b/Ports/openssl/patches/0002-Add-build-configuration-info-for-serenity.patch
@@ -0,0 +1,31 @@
+From 191753ac1b680d24d76558209d9e26fd6d0ce372 Mon Sep 17 00:00:00 2001
+From: Luke Wilde <lukew@serenityos.org>
+Date: Wed, 16 Mar 2022 12:52:30 +0000
+Subject: [PATCH 2/2] Add build configuration info for serenity
+
+Co-Authored-By: Rodrigo Tobar <rtobarc@gmail.com>
+---
+ Configurations/shared-info.pl | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
+index 47eddd6..ab04a19 100644
+--- a/Configurations/shared-info.pl
++++ b/Configurations/shared-info.pl
+@@ -34,6 +34,13 @@ my %shared_info;
+             shared_defflag    => '-Wl,--version-script=',
+         };
+     },
++    'serenity-shared' => {
++        shared_ldflag         => '-shared',
++        shared_sonameflag     => '-Wl,-soname=',
++        # -Map is not really what should be used here, but we need a flag that
++        # accepts a filename and that it's '-version-map'
++        shared_defflag        => "-Wl,-Map=",
++    },
+     'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },
+     'bsd-shared' => sub {
+         return $shared_info{'gnu-shared'} if detect_gnu_ld();
+-- 
+2.36.1
+
diff --git a/Ports/openssl/patches/ReadMe.md b/Ports/openssl/patches/ReadMe.md
new file mode 100644
index 0000000000..cb5972add9
--- /dev/null
+++ b/Ports/openssl/patches/ReadMe.md
@@ -0,0 +1,14 @@
+# Patches for openssl on SerenityOS
+
+## `0001-Add-a-serenity-configuration.patch`
+
+Add a serenity configuration
+
+
+
+## `0002-Add-build-configuration-info-for-serenity.patch`
+
+Add build configuration info for serenity
+
+
+
diff --git a/Ports/openssl/patches/shared-info.patch b/Ports/openssl/patches/shared-info.patch
deleted file mode 100644
index 2a616c69e2..0000000000
--- a/Ports/openssl/patches/shared-info.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- openssl-1.1.1n/Configurations/shared-info.pl	2021-03-25 21:28:38.000000000 +0800
-+++ openssl-1.1.1n/Configurations/shared-info.pl	2021-09-26 00:05:04.340004623 +0800
-@@ -34,6 +34,13 @@
-             shared_defflag    => '-Wl,--version-script=',
-         };
-     },
-+    'serenity-shared' => {
-+        shared_ldflag         => '-shared',
-+        shared_sonameflag     => '-Wl,-soname=',
-+        # -Map is not really what should be used here, but we need a flag that
-+        # accepts a filename and that it's '-version-map'
-+        shared_defflag        => "-Wl,-Map=",
-+    },
-     'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },
-     'bsd-shared' => sub {
-         return $shared_info{'gnu-shared'} if detect_gnu_ld();