diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:55:59 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:55:59 +0100 |
| commit | 1eb911922a7e818a6f314a68c0561bba008e6efd (patch) | |
| tree | 9b647e44195a0a0876b40cbf5fa42dca0641179f /main/lua-curl/fix-build-with-curl-7.62.0.patch | |
| parent | d420552f02af2ad6a15cf3a70b76bf86b222c07e (diff) | |
| download | aports-1eb911922a7e818a6f314a68c0561bba008e6efd.tar.bz2 aports-1eb911922a7e818a6f314a68c0561bba008e6efd.tar.xz | |
Remove stale patches in main/
Diffstat (limited to 'main/lua-curl/fix-build-with-curl-7.62.0.patch')
| -rw-r--r-- | main/lua-curl/fix-build-with-curl-7.62.0.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/main/lua-curl/fix-build-with-curl-7.62.0.patch b/main/lua-curl/fix-build-with-curl-7.62.0.patch deleted file mode 100644 index fbd129bdab..0000000000 --- a/main/lua-curl/fix-build-with-curl-7.62.0.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix build with curl 7.62.0 - -curl 7.62.0 deprecates the CURLE_SSL_CACERT error code, and unifies it -with CURLE_PEER_FAILED_VERIFICATION. Adjust the errors list to match. - -This fixes the following build failure: - -src/lcerr_easy.h: In function 'lcurl_err_easy_mnemo': -src/lcerror.c:32:22: error: duplicate case value - #define ERR_ENTRY(E) case CURLE_##E: return #E; - ^ -src/lcerr_easy.h:74:1: note: in expansion of macro 'ERR_ENTRY' - ERR_ENTRY ( SSL_CACERT ) - ^~~~~~~~~ -src/lcerror.c:32:22: note: previously used here - #define ERR_ENTRY(E) case CURLE_##E: return #E; - ^ -src/lcerr_easy.h:65:1: note: in expansion of macro 'ERR_ENTRY' - ERR_ENTRY ( PEER_FAILED_VERIFICATION ) - ^~~~~~~~~ ---- - src/lcerr_easy.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/lcerr_easy.h b/src/lcerr_easy.h -index 94ad143..895c6d8 100644 ---- a/src/lcerr_easy.h -+++ b/src/lcerr_easy.h -@@ -62,7 +62,11 @@ ERR_ENTRY ( UNKNOWN_TELNET_OPTION ) /* User specified an unknown option */ - #endif - ERR_ENTRY ( TELNET_OPTION_SYNTAX ) - ERR_ENTRY ( OBSOLETE50 ) -+#if LCURL_CURL_VER_GE(7,62,0) -+ERR_ENTRY ( OBSOLETE51 ) -+#else - ERR_ENTRY ( PEER_FAILED_VERIFICATION ) -+#endif - ERR_ENTRY ( GOT_NOTHING ) - ERR_ENTRY ( SSL_ENGINE_NOTFOUND ) - ERR_ENTRY ( SSL_ENGINE_SETFAILED ) -@@ -71,7 +75,11 @@ ERR_ENTRY ( RECV_ERROR ) - ERR_ENTRY ( OBSOLETE57 ) - ERR_ENTRY ( SSL_CERTPROBLEM ) - ERR_ENTRY ( SSL_CIPHER ) -+#if LCURL_CURL_VER_GE(7,62,0) -+ERR_ENTRY ( PEER_FAILED_VERIFICATION ) -+#else - ERR_ENTRY ( SSL_CACERT ) -+#endif - ERR_ENTRY ( BAD_CONTENT_ENCODING ) - ERR_ENTRY ( LDAP_INVALID_URL ) - ERR_ENTRY ( FILESIZE_EXCEEDED ) --- -2.19.2 - |