system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 18:46:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Ports: Update curl to 7.78.0

Browse source
This commit is contained in:
Luke 2021-07-29 23:59:59 +01:00 committed by Gunnar Beutner
parent c126ffa9b8
commit dc34cbe28b
5 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

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

4
Ports/curl/package.sh
View file

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

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

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

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

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

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

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