system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-01 11:35:37 +00:00
Code Issues Projects Releases Wiki Activity

Ports: Update curl to 8.7.1

Browse Source
This commit is contained in:
Kenneth Myhra 2024-03-27 13:18:33 +01:00 committed by Jelle Raaijmakers
parent 1e1906865c
commit 5cbb18ac90
4 changed files with 3 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ports/AvailablePorts.md
View File

@ -47,7 +47,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`coreutils`](coreutils/) | GNU core utilities | 9.4 | https://www.gnu.org/software/coreutils/ |
| [`cowsay`](cowsay/) | cowsay | 3.04 | https://github.com/tnalpgge/rank-amateur-cowsay |
| [`cpio`](cpio/) | GNU cpio archive utility | 2.14 | https://www.gnu.org/software/cpio/ |
| [`curl`](curl/) | curl | 8.6.0 | https://curl.se/ |
| [`curl`](curl/) | curl | 8.7.1 | https://curl.se/ |
| [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash |
| [`deutex`](deutex/) | DeuTex | 5.2.2 | https://github.com/Doom-Utils/deutex |
| [`devilutionX`](devilutionX/) | DevilutionX | 1.5.2 | https://github.com/diasurgical/devilutionX |

4
Ports/curl/package.sh
View File

@ -1,9 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='curl'
version='8.6.0'
version='8.7.1'
useconfigure='true'
files=(
"https://curl.se/download/curl-${version}.tar.bz2#b4785f2d8877fa92c0e45d7155cf8cc6750dbda961f4b1a45bcbec990cf2fa9b"
"https://curl.se/download/curl-${version}.tar.bz2#05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76"
)
depends=(
'ca-certificates'

49
Ports/curl/patches/0001-Backport-CMake-fix-from-upstream.patch
View File

@ -1,49 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@gmta.nl>
Date: Wed, 21 Feb 2024 20:15:07 +0100
Subject: [PATCH] Backport CMake fix from upstream
Patch from:
https://github.com/curl/curl/commit/b2497a8d15284dfef4fa7f032572e07b0b4b4720
This commit should be removed as soon as the fix has landed in a
release.
---
docs/libcurl/CMakeLists.txt | 7 +++++--
docs/libcurl/opts/CMakeLists.txt | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/docs/libcurl/CMakeLists.txt b/docs/libcurl/CMakeLists.txt
index 6f0aa6490224d6f4c20e72fea1955ccc4e4f6e5a..0bc35fc97321a4e23504462b9a1504167899c157 100644
--- a/docs/libcurl/CMakeLists.txt
+++ b/docs/libcurl/CMakeLists.txt
@@ -62,8 +62,11 @@ add_custom_command(OUTPUT libcurl-symbols.md
add_manual_pages(man_MANS)
add_custom_target(man ALL DEPENDS ${man_MANS})
if(NOT CURL_DISABLE_INSTALL)
- install(FILES "$<LIST:TRANSFORM,${man_MANS},PREPEND,${CMAKE_CURRENT_BINARY_DIR}/>"
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ unset(_src)
+ foreach(_f ${man_MANS})
+ list(APPEND _src "${CMAKE_CURRENT_BINARY_DIR}/${_f}")
+ endforeach()
+ install(FILES ${_src} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
endif()
add_subdirectory(opts)
diff --git a/docs/libcurl/opts/CMakeLists.txt b/docs/libcurl/opts/CMakeLists.txt
index 82844a2251ae8b0ef6ed29fe832481c35bf0e7d6..a20d0b9bf9ee9e0dc0e4820a0a20685f63aaf40a 100644
--- a/docs/libcurl/opts/CMakeLists.txt
+++ b/docs/libcurl/opts/CMakeLists.txt
@@ -29,6 +29,9 @@ add_manual_pages(man_MANS)
add_custom_target(opts-man DEPENDS ${man_MANS})
add_dependencies(man opts-man)
if(NOT CURL_DISABLE_INSTALL)
- install(FILES "$<LIST:TRANSFORM,${man_MANS},PREPEND,${CMAKE_CURRENT_BINARY_DIR}/>"
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ unset(_src)
+ foreach(_f ${man_MANS})
+ list(APPEND _src "${CMAKE_CURRENT_BINARY_DIR}/${_f}")
+ endforeach()
+ install(FILES ${_src} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
endif()

12
Ports/curl/patches/ReadMe.md
View File

@ -1,12 +0,0 @@
# Patches for curl on SerenityOS
## `0001-Backport-CMake-fix-from-upstream.patch`
Backport CMake fix from upstream
Patch from:
https://github.com/curl/curl/commit/b2497a8d15284dfef4fa7f032572e07b0b4b4720
This commit should be removed as soon as the fix has landed in a
release.