From dde50606ee55d36bcc9a2115fa0a360f59fc8684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 4 Oct 2022 12:01:31 +0300 Subject: [PATCH] extras: tools: Tidy up cmake-enable-ALPN-support-on-macOS-10.14.patch In b8eb8c6d4ea7dc8f8707550fa6c05b3e3ccb62fc, this patch was manually touched up to make it apply on a newer version of CMake - the line counts mismatched slightly, but GNU patch 2.7.6 still happily managed to apply it. However patch 2.5.8 in macOS failed to apply the patch due to the mismatched numbers of lines. This makes the patch apply correctly with the version of patch on macOS too. This should fix issue #27381. --- .../cmake-enable-ALPN-support-on-macOS-10.14.patch | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch b/extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch index 1024542975..8e9d3eb78f 100644 --- a/extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch +++ b/extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch @@ -1,4 +1,4 @@ -From ca650572a6d9198563c91c4c8f418a3e9f7eebe2 Mon Sep 17 00:00:00 2001 +From f0d87cb7c54464a1b2677346a6f53771527ad50a Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 11 Jun 2020 15:09:53 +0200 Subject: [PATCH] enable ALPN support on macOS 10.14 @@ -17,10 +17,10 @@ ld: symbol(s) not found for architecture x86_64 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Utilities/cmcurl/lib/vtls/sectransp.c b/Utilities/cmcurl/lib/vtls/sectransp.c -index 2fdf662a1d..22aebf3c5b 100644 +index 2e57d83785..87fefba263 100644 --- a/Utilities/cmcurl/lib/vtls/sectransp.c +++ b/Utilities/cmcurl/lib/vtls/sectransp.c -@@ -76,6 +76,7 @@ +@@ -80,6 +80,7 @@ #define CURL_BUILD_MAC_10_9 MAC_OS_X_VERSION_MAX_ALLOWED >= 1090 #define CURL_BUILD_MAC_10_11 MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 #define CURL_BUILD_MAC_10_13 MAC_OS_X_VERSION_MAX_ALLOWED >= 101300 @@ -28,8 +28,7 @@ index 2fdf662a1d..22aebf3c5b 100644 #define CURL_BUILD_MAC_10_15 MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 /* These macros mean "the following code is present to allow runtime backward compatibility with at least this cat or earlier": - (You set this at build-time using the compiler command line option -@@ -1576,7 +1577,7 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn, +@@ -1838,7 +1839,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, } #endif /* CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS */ @@ -38,7 +37,7 @@ index 2fdf662a1d..22aebf3c5b 100644 if(conn->bits.tls_enable_alpn) { if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) { CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0, -@@ -2626,7 +2627,7 @@ sectransp_connect_step2(struct connectdata *conn, int sockindex) +@@ -2832,7 +2833,7 @@ sectransp_connect_step2(struct Curl_easy *data, struct connectdata *conn, break; } @@ -48,5 +47,5 @@ index 2fdf662a1d..22aebf3c5b 100644 if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) { CFArrayRef alpnArr = NULL; -- -2.26.0.windows.1 +2.37.0 (Apple Git-136)