From c56fe70d3a95b205256bd94801c38c008a4bc026 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Sat, 2 Sep 2023 00:44:25 +0200 Subject: [PATCH] Ports/rsync: Update rsync to version 3.2.7 The openssl and lz4 dependencies have been added for the Clang build, and have been disabled for the GNU build. The openssl library is not detected correctly, and the lz4 library doesn't build on the GNU build. --- Ports/AvailablePorts.md | 2 +- Ports/rsync/package.sh | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index e49b9ccc118..f74b4bf23e1 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -276,7 +276,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`readline`](readline/) | GNU Readline Library | 8.2 | https://tiswww.case.edu/php/chet/readline/rltop.html | | [`RetroArch`](RetroArch/) | RetroArch | 1.12.0 | https://www.retroarch.com | | [`RISCVEmu`](RISCVEmu/) | A Basic C++ RISC-V Emulator | ad8ad6a | https://github.com/IdanHo/RISCVEmu | -| [`rsync`](rsync/) | rsync | 3.1.3 | https://rsync.samba.org/ | +| [`rsync`](rsync/) | rsync | 3.2.7 | https://rsync.samba.org/ | | [`rubberband`](rubberband/) | Rubberband | 3.3.0 | https://breakfastquay.com/rubberband/ | | [`ruby`](ruby/) | Ruby | 3.2.2 | https://www.ruby-lang.org/ | | [`rvvm`](rvvm/) | RVVM - The RISC-V Virtual Machine | 0.5 | https://github.com/LekKit/RVVM | diff --git a/Ports/rsync/package.sh b/Ports/rsync/package.sh index 4c8c7b3b17c..af4575def40 100755 --- a/Ports/rsync/package.sh +++ b/Ports/rsync/package.sh @@ -1,11 +1,23 @@ #!/usr/bin/env -S bash ../.port_include.sh port='rsync' -version='3.1.3' +version='3.2.7' useconfigure='true' use_fresh_config_sub='true' files=( - "https://download.samba.org/pub/rsync/src/rsync-${version}.tar.gz#55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" + "https://download.samba.org/pub/rsync/src/rsync-${version}.tar.gz#4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb" ) configopts=( "--target=${SERENITY_ARCH}-pc-serenity" + '--disable-xxhash' ) +if [ "${SERENITY_TOOLCHAIN}" = 'Clang' ]; then + depends=( + 'lz4' + 'openssl' + ) +else + configopts+=( + '--disable-lz4' + '--disable-openssl' + ) +fi