beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Ports: Update curl port to version 7.81.0

Browse source
This commit is contained in:
Luke Wilde 2022-01-08 02:05:26 +00:00 committed by Ali Mohammad Pur
parent e65052a208
commit 87d19dfa28
Notes: sideshowbarker 2024-07-18 02:13:10 +09:00 
Author: https://github.com/Lubrsi
Commit: https://github.com/SerenityOS/serenity/commit/87d19dfa282
Pull-request: https://github.com/SerenityOS/serenity/pull/11715
5 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -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/ |

4
Ports/curl/package.sh
View file

@ -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")

42
Ports/curl/patches/disable-prototype-mismatch-check.patch
View file

@ -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 <stdlib.h>
- 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

4
Ports/curl/patches/fix-autoconf.patch
View file

@ -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* \

8
Ports/curl/patches/include-sys-select-h.patch
View file

@ -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 <sys/select.h>