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

Ports: Bump curl to 7.77.0 :^)

Browse source
This commit is contained in:
Andreas Kling 2021-05-27 08:46:23 +02:00
parent 49dd4e5193
commit 993211f184
Notes: sideshowbarker 2024-07-18 17:21:02 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/993211f184a
6 changed files with 90 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -16,7 +16,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`chester`](chester/) | Chester Gameboy Emulator | | https://github.com/veikkos/chester |
| [`cmake`](cmake/) | CMake | 3.19.4 | https://cmake.org/ |
| [`cmatrix`](cmatrix/) | cmatrix | | https://github.com/abishekvashok/cmatrix |
| [`curl`](curl/) | curl | 7.65.3 | https://curl.se/ |
| [`curl`](curl/) | curl | 7.77.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.5 | https://www.gnu.org/software/diffutils/ |

2
Ports/curl/package.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=curl
version=7.65.3
version=7.77.0
useconfigure=true
configopts="--disable-ntlm-wb --with-ssl"
files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2

14
Ports/curl/patches/disable-nbio.patch
View file

@ -1,14 +0,0 @@
diff -Naur curl-7.65.3/lib/nonblock.c curl-7.65.3.serenity/lib/nonblock.c
--- curl-7.65.3/lib/nonblock.c 2021-04-12 18:25:48.687757722 +0200
+++ curl-7.65.3.serenity/lib/nonblock.c 2021-04-12 18:22:32.390375039 +0200
@@ -39,6 +39,10 @@
#include "nonblock.h"
+#ifdef __serenity__
+#define USE_BLOCKING_SOCKETS
+#endif
+
/*
* curlx_nonblock() set the given socket to either blocking or non-blocking
* mode based on the 'nonblock' boolean argument. This function is highly

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

@ -0,0 +1,66 @@
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
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
-/* end confdefs.h. */
-
-
-# include <stdlib.h>
- int rand(int n);
- int rand(int n)
- {
- if(n)
- return ++n;
- else
- return n;
- }
-
-int main (void)
-{
-
- int i[2]={0,0};
- int j = rand(i[0]);
- if(j)
- return j;
-
- ;
- return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "compiler does not halt on function prototype mismatch." "$LINENO" 5
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-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_CHECK_COMPILER_HALT_ON_ERROR
CURL_CHECK_COMPILER_ARRAY_SIZE_NEGATIVE
-CURL_CHECK_COMPILER_PROTOTYPE_MISMATCH
CURL_CHECK_COMPILER_SYMBOL_HIDING
CURL_CHECK_CURLDEBUG

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

@ -1,89 +1,12 @@
Only in curl-serenity/: config.log
diff -ru curl-7.65.3/config.sub curl-serenity/config.sub
--- curl-7.65.3/config.sub 2019-07-19 00:41:42.000000000 +0200
+++ curl-serenity/config.sub 2019-08-29 11:03:53.901037128 +0200
@@ -1364,6 +1364,7 @@
# Each alternative MUST end in a * to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -serenity* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
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
@@ -1368,7 +1368,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
diff -ru curl-7.65.3/configure curl-serenity/configure
--- curl-7.65.3/configure 2019-07-19 00:41:41.000000000 +0200
+++ curl-serenity/configure 2019-08-29 11:06:24.076073666 +0200
@@ -18181,51 +18181,6 @@
fi
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
-/* end confdefs.h. */
-
-
-# include <stdlib.h>
- int rand(int n);
- int rand(int n)
- {
- if(n)
- return ++n;
- else
- return n;
- }
-
-int main (void)
-{
-
- int i[2]={0,0};
- int j = rand(i[0]);
- if(j)
- return j;
-
- ;
- return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "compiler does not halt on function prototype mismatch." "$LINENO" 5
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-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 -ru curl-7.65.3/configure.ac curl-serenity/configure.ac
--- curl-7.65.3/configure.ac 2019-07-16 12:24:31.000000000 +0200
+++ curl-serenity/configure.ac 2019-08-29 11:05:47.679343943 +0200
@@ -287,7 +287,6 @@
CURL_CHECK_COMPILER_HALT_ON_ERROR
CURL_CHECK_COMPILER_ARRAY_SIZE_NEGATIVE
-CURL_CHECK_COMPILER_PROTOTYPE_MISMATCH
CURL_CHECK_COMPILER_SYMBOL_HIDING
CURL_CHECK_CURLDEBUG
diff -ru curl-7.65.3/include/curl/curl.h curl-serenity/include/curl/curl.h
--- curl-7.65.3/include/curl/curl.h 2019-07-19 00:23:35.000000000 +0200
+++ curl-serenity/include/curl/curl.h 2019-08-29 11:10:37.863071640 +0200
@@ -75,6 +75,7 @@
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
defined(__CYGWIN__) || \
+ defined(__serenity__) || \
(defined(__FreeBSD_version) && (__FreeBSD_version < 800000))
#include <sys/select.h>
#endif
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* | -sortix* \
+ | -aos* | -aros* | -cloudabi* | -sortix* | -serenity* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -knetbsd* | -mirbsd* | -netbsd* \

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

@ -0,0 +1,12 @@
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
@@ -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))
#include <sys/select.h>
#endif