From 87d19dfa282c7394d4ac9f984414d901b802e845 Mon Sep 17 00:00:00 2001 From: Luke Wilde Date: Sat, 8 Jan 2022 02:05:26 +0000 Subject: [PATCH] Ports: Update curl port to version 7.81.0 --- Ports/AvailablePorts.md | 2 +- Ports/curl/package.sh | 4 +- .../disable-prototype-mismatch-check.patch | 42 ++++++++++--------- Ports/curl/patches/fix-autoconf.patch | 4 +- Ports/curl/patches/include-sys-select-h.patch | 8 ++-- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 45db5e189b3..2aa4c5e54e7 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -20,7 +20,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`cmake`](cmake/) | CMake | 3.22.1 | https://cmake.org/ | | [`cmatrix`](cmatrix/) | cmatrix | 3112b12 | https://github.com/abishekvashok/cmatrix | | [`composer`](composer/) | Composer | 2.1.3 | https://getcomposer.org/ | -| [`curl`](curl/) | curl | 7.78.0 | https://curl.se/ | +| [`curl`](curl/) | curl | 7.81.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 48afe7ae6a9..cb9e01b52a5 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.78.0 +version=7.81.0 useconfigure=true -files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 98530b317dc95ccb324bbe4f834f07bb642fbc393b794ddf3434f246a71ea44a" +files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 1e7a38d7018ec060f1f16df839854f0889e94e122c4cfa5d3a37c2dc56f1e258" auth_type=sha256 depends=("openssl" "zlib" "zstd") configopts=("--disable-ntlm-wb" "--with-openssl=${SERENITY_INSTALL_ROOT}/usr/local" "--disable-symbol-hiding") diff --git a/Ports/curl/patches/disable-prototype-mismatch-check.patch b/Ports/curl/patches/disable-prototype-mismatch-check.patch index 3e57240ff24..977a31f53b6 100644 --- a/Ports/curl/patches/disable-prototype-mismatch-check.patch +++ b/Ports/curl/patches/disable-prototype-mismatch-check.patch @@ -1,15 +1,15 @@ ---- 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 +--- curl-7.81.0/configure.orig 2022-01-08 01:39:27.339369369 +0000 ++++ curl-7.81.0/configure 2022-01-08 01:40:30.218717020 +0000 +@@ -19836,50 +19836,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.beam 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; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler halts on function prototype mismatch" >&5 +-printf %s "checking if compiler halts on function prototype mismatch... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -- -- + + -# include - int rand(int n); - int rand(int n) @@ -33,25 +33,27 @@ -} - -_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : +-if ac_fn_c_try_compile "$LINENO" +-then : - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } - as_fn_error $? "compiler does not halt on function prototype mismatch." "$LINENO" 5 - --else +-else $as_nop - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } - -fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports hiding library internal symbols" >&5 ---- 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 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports hiding library internal symbols" >&5 + printf %s "checking if compiler supports hiding library internal symbols... " >&6; } +--- curl-7.81.0/configure.ac.orig 2022-01-08 01:42:45.505315507 +0000 ++++ curl-7.81.0/configure.ac 2022-01-08 01:42:47.917290542 +0000 +@@ -420,7 +420,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 8a7c3b7520f..fa58287574a 100644 --- a/Ports/curl/patches/fix-autoconf.patch +++ b/Ports/curl/patches/fix-autoconf.patch @@ -1,5 +1,5 @@ ---- 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 +--- curl-7.81.0/config.sub.orig 2022-01-08 01:37:56.256315591 +0000 ++++ curl-7.81.0/config.sub 2022-01-08 01:38:02.352252211 +0000 @@ -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 3c0088e82b9..e48335145d1 100644 --- a/Ports/curl/patches/include-sys-select-h.patch +++ b/Ports/curl/patches/include-sys-select-h.patch @@ -1,11 +1,11 @@ ---- 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 @@ +--- curl-7.81.0/include/curl/curl.h.orig 2022-01-08 01:48:40.381648337 +0000 ++++ curl-7.81.0/include/curl/curl.h 2022-01-08 01:48:54.585501759 +0000 +@@ -71,7 +71,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(__NuttX__) || \ + defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || defined(__serenity__) || \ (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \ + (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \ defined(__VXWORKS__) - #include