Bläddra i källkod

package/libopenssl: update the patches to be applied with fuzz 0

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
Dario Binacchi 1 år sedan
förälder
incheckning
1b6144a9ad
1 ändrade filer med 9 tillägg och 7 borttagningar
  1. 9 7
      package/libopenssl/0003-Revert-Fix-static-builds.patch

+ 9 - 7
package/libopenssl/0003-Revert-Fix-static-builds.patch

@@ -1,4 +1,4 @@
-From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 Mon Sep 17 00:00:00 2001
+From a048522f64dbbe90cf77aea0c3f47cccdad50742 Mon Sep 17 00:00:00 2001
 From: Bernd Kuhls <bernd@kuhls.net>
 Date: Fri, 21 Jul 2023 19:30:40 +0200
 Subject: [PATCH] Revert "Fix -static builds"
@@ -8,17 +8,19 @@ This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d.
 Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126
 
 Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  Configure | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Configure b/Configure
-index 2c17f4186b..94cab4c3c4 100755
+index 2a5e58805c3b..0e8c1ce5cc74 100755
 --- a/Configure
 +++ b/Configure
-@@ -1377,10 +1377,6 @@ foreach (keys %useradd) {
- # At this point, we can forget everything about %user and %useradd,
- # because it's now all been merged into the corresponding $config entry
+@@ -1466,10 +1466,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) {
+         unless file_name_is_absolute($config{prefix});
+ }
  
 -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
 -    disable('static', 'pic', 'threads');
@@ -27,7 +29,7 @@ index 2c17f4186b..94cab4c3c4 100755
  # Allow overriding the build file name
  $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
  
-@@ -1671,6 +1667,10 @@ if ($strict_warnings)
+@@ -1764,6 +1760,10 @@ if ($strict_warnings)
                  }
          }
  
@@ -39,5 +41,5 @@ index 2c17f4186b..94cab4c3c4 100755
                                ? @strict_warnings_collection
                                : ( $_ ) }
 -- 
-2.39.2
+2.43.0