From 5cbb18ac90b9c63140ca0ac6ce42513301ef5b48 Mon Sep 17 00:00:00 2001 From: Kenneth Myhra Date: Wed, 27 Mar 2024 13:18:33 +0100 Subject: [PATCH] Ports: Update curl to 8.7.1 --- Ports/AvailablePorts.md | 2 +- Ports/curl/package.sh | 4 +- ...001-Backport-CMake-fix-from-upstream.patch | 49 ------------------- Ports/curl/patches/ReadMe.md | 12 ----- 4 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 Ports/curl/patches/0001-Backport-CMake-fix-from-upstream.patch delete mode 100644 Ports/curl/patches/ReadMe.md diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 51b694cf1cd..f8898ff83a5 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -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 | diff --git a/Ports/curl/package.sh b/Ports/curl/package.sh index bddbe5a63dc..fcbc430f620 100755 --- a/Ports/curl/package.sh +++ b/Ports/curl/package.sh @@ -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' diff --git a/Ports/curl/patches/0001-Backport-CMake-fix-from-upstream.patch b/Ports/curl/patches/0001-Backport-CMake-fix-from-upstream.patch deleted file mode 100644 index 0d272e4fbde..00000000000 --- a/Ports/curl/patches/0001-Backport-CMake-fix-from-upstream.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jelle Raaijmakers -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 "$" -- 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 "$" -- 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() diff --git a/Ports/curl/patches/ReadMe.md b/Ports/curl/patches/ReadMe.md deleted file mode 100644 index 2c0aa1a75fc..00000000000 --- a/Ports/curl/patches/ReadMe.md +++ /dev/null @@ -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. -