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.87.0

Browse source 
This also removes the tiny patch we had since it's been upstreamed.
This commit is contained in:
Kenneth Myhra 2022-12-21 10:12:16 +01:00 committed by Sam Atkins
parent 29733e65f8
commit fe478be91b
4 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -37,7 +37,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`composer`](composer/) | Composer | 2.4.3 | https://getcomposer.org/ |
| [`coreutils`](coreutils/) | GNU core utilities | 9.1 | https://www.gnu.org/software/coreutils/ |
| [`cpio`](cpio/) | GNU cpio archive utility | 2.13 | https://www.gnu.org/software/cpio/ |
| [`curl`](curl/) | curl | 7.86.0 | https://curl.se/ |
| [`curl`](curl/) | curl | 7.87.0 | https://curl.se/ |
| [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash |
| [`dialog`](dialog/) | Dialog | 1.3-20220526 | https://invisible-island.net/dialog/ |
| [`diffutils`](diffutils/) | GNU Diffutils | 3.8 | 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.86.0
version=7.87.0
useconfigure=true
files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 f5ca69db03eea17fa8705bdfb1a9f58d76a46c9010518109bb38f313137e0a28"
files="https://curl.se/download/curl-${version}.tar.bz2 curl-${version}.tar.bz2 5d6e128761b7110946d1276aff6f0f266f2b726f5e619f7e0a057a474155f307"
auth_type=sha256
depends=("ca-certificates" "openssl" "zlib" "zstd")
configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")

23
Ports/curl/patches/0001-Teach-curl.h-about-serenity-s-sys-select.h-include.patch
View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luke Wilde <lukew@serenityos.org>
Date: Sun, 13 Mar 2022 16:50:19 +0000
Subject: [PATCH] Teach curl.h about serenity's <sys/select.h> include
Co-Authored-By: Andreas Kling <kling@serenityos.org>
---
include/curl/curl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 3a2c2ea..2b7c86b 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -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))
#include <sys/select.h>

7
Ports/curl/patches/ReadMe.md
View file

@ -1,7 +0,0 @@
# Patches for curl on SerenityOS
## `0001-Teach-curl.h-about-serenity-s-sys-select.h-include.patch`
Teach curl.h about serenity's <sys/select.h> include