From dc34cbe28bd7f592c8a8c8224dbda8f7c0405c44 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 29 Jul 2021 23:59:59 +0100 Subject: [PATCH] Ports: Update curl to 7.78.0 --- Ports/AvailablePorts.md | 2 +- Ports/curl/package.sh | 4 ++-- .../disable-prototype-mismatch-check.patch | 23 ++++++++----------- Ports/curl/patches/fix-autoconf.patch | 5 ++-- Ports/curl/patches/include-sys-select-h.patch | 13 +++++------ 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 570e948e6c..3b012beb60 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -19,7 +19,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`cmake`](cmake/) | CMake | 3.19.4 | https://cmake.org/ | | [`cmatrix`](cmatrix/) | cmatrix | | https://github.com/abishekvashok/cmatrix | | [`composer`](composer/) | Composer | 2.1.3 | https://getcomposer.org/ | -| [`curl`](curl/) | curl | 7.77.0 | https://curl.se/ | +| [`curl`](curl/) | curl | 7.78.0 | https://curl.se/ | | [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash | | [`dialog`](dialog/) | Dialog | 1.3-20210324 | https://invisible-island.net/dialog/ | | [`diffutils`](diffutils/) | GNU Diffutils | 3.7 | https://www.gnu.org/software/diffutils/ | diff --git a/Ports/curl/package.sh b/Ports/curl/package.sh index 6522306b14..9b0b13c96b 100755 --- a/Ports/curl/package.sh +++ b/Ports/curl/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port=curl -version=7.77.0 +version=7.78.0 useconfigure=true -files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 6c0c28868cb82593859fc43b9c8fdb769314c855c05cf1b56b023acf855df8ea" +files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 98530b317dc95ccb324bbe4f834f07bb642fbc393b794ddf3434f246a71ea44a" auth_type=sha256 depends="openssl zlib" configopts="--disable-ntlm-wb --with-openssl=${SERENITY_INSTALL_ROOT}/usr/local" diff --git a/Ports/curl/patches/disable-prototype-mismatch-check.patch b/Ports/curl/patches/disable-prototype-mismatch-check.patch index 11b7b1d457..3e57240ff2 100644 --- a/Ports/curl/patches/disable-prototype-mismatch-check.patch +++ b/Ports/curl/patches/disable-prototype-mismatch-check.patch @@ -1,11 +1,9 @@ -diff -Nru curl-7.77.0/configure curl-7.77.0-patched/configure ---- curl-7.77.0/configure 2021-05-25 12:57:08.000000000 +0200 -+++ curl-7.77.0-patched/configure 2021-05-27 08:37:58.177939141 +0200 -@@ -19371,51 +19371,6 @@ - fi +--- curl-7.78.0/configure 2021-07-19 13:47:17.000000000 +0100 ++++ curl-7.78.0.serenity/configure 2021-07-29 23:44:57.345323249 +0100 +@@ -18920,48 +18920,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler halts on function prototype mismatch" >&5 -$as_echo_n "checking if compiler halts on function prototype mismatch... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -48,15 +46,12 @@ diff -Nru curl-7.77.0/configure curl-7.77.0-patched/configure - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports hiding library internal symbols" >&5 - $as_echo_n "checking if compiler supports hiding library internal symbols... " >&6; } - supports_symbol_hiding="no" -diff -Nru curl-7.77.0/configure.ac curl-7.77.0-patched/configure.ac ---- curl-7.77.0/configure.ac 2021-05-25 12:50:36.000000000 +0200 -+++ curl-7.77.0-patched/configure.ac 2021-05-27 08:37:16.162807155 +0200 -@@ -400,7 +400,6 @@ +--- curl-7.78.0/configure.ac 2021-07-19 08:19:57.000000000 +0100 ++++ curl-7.78.0.serenity/configure.ac 2021-07-29 23:45:23.365054651 +0100 +@@ -402,7 +402,6 @@ CURL_CHECK_COMPILER_HALT_ON_ERROR CURL_CHECK_COMPILER_ARRAY_SIZE_NEGATIVE diff --git a/Ports/curl/patches/fix-autoconf.patch b/Ports/curl/patches/fix-autoconf.patch index 04309dbf75..8a7c3b7520 100644 --- a/Ports/curl/patches/fix-autoconf.patch +++ b/Ports/curl/patches/fix-autoconf.patch @@ -1,6 +1,5 @@ -diff -Nru curl-7.77.0/config.sub curl-7.77.0-patched/config.sub ---- curl-7.77.0/config.sub 2021-05-18 09:07:51.000000000 +0200 -+++ curl-7.77.0-patched/config.sub 2021-05-27 08:28:58.201762746 +0200 +--- curl-7.78.0/config.sub 2021-07-07 17:17:59.000000000 +0100 ++++ curl-7.78.0.serenity/config.sub 2021-07-29 23:43:17.210357809 +0100 @@ -1368,7 +1368,7 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ diff --git a/Ports/curl/patches/include-sys-select-h.patch b/Ports/curl/patches/include-sys-select-h.patch index 95d8b25f51..3c0088e82b 100644 --- a/Ports/curl/patches/include-sys-select-h.patch +++ b/Ports/curl/patches/include-sys-select-h.patch @@ -1,12 +1,11 @@ -diff -ru curl-7.77.0/include/curl/curl.h curl-7.77.0-patched/include/curl/curl.h ---- curl-7.77.0/include/curl/curl.h 2021-05-25 10:00:20.000000000 +0200 -+++ curl-7.77.0-patched/include/curl/curl.h 2021-05-27 08:40:23.460428478 +0200 +--- curl-7.78.0/include/curl/curl.h 2021-07-19 08:19:57.000000000 +0100 ++++ curl-7.78.0.serenity/include/curl/curl.h 2021-07-29 23:52:44.532510736 +0100 @@ -74,7 +74,7 @@ #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \ -- defined(__CYGWIN__) || defined(AMIGA) || \ -+ defined(__CYGWIN__) || defined(AMIGA) || defined(__serenity__) || \ - (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) +- defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \ ++ defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || defined(__serenity__) || \ + (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \ + defined(__VXWORKS__) #include - #endif