Update to 3.4.0

Fix for CVE-2024-12084
Fix for CVE-2024-12085
Fix for CVE-2024-12086
Fix for CVE-2024-12087
Fix for CVE-2024-12088
Fix for CVE-2024-12747
This commit is contained in:
Jonathan Wright 2025-01-14 14:15:58 -06:00
parent dc34118ecc
commit 2079ce3f84
2 changed files with 18 additions and 15 deletions

View File

@ -1,12 +1,11 @@
diff --git a/runtests.sh.old b/runtests.sh diff --git a/runtests.sh b/runtests.sh
index ecb383e..1cd1d1a 100755 index 0c463be..eecf530 100755
--- a/runtests.sh.old --- a/runtests.sh
+++ b/runtests.sh +++ b/runtests.sh
@@ -276,6 +276,7 @@ do @@ -280,6 +280,7 @@ for testscript in $suitedir/$whichtests; do
case "$testscript" in case "$testscript" in
*hardlinks*) TESTRUN_TIMEOUT=600 ;; *hardlinks*) TESTRUN_TIMEOUT=600 ;;
+ *default-acls*) continue ;; + *default-acls*) continue ;;
*) TESTRUN_TIMEOUT=300 ;; *) TESTRUN_TIMEOUT=300 ;;
esac esac

View File

@ -8,7 +8,7 @@
Summary: A program for synchronizing files over a network Summary: A program for synchronizing files over a network
Name: rsync Name: rsync
Version: 3.3.0 Version: 3.4.0
Release: 1%{?prerelease}%{?dist} Release: 1%{?prerelease}%{?dist}
URL: https://rsync.samba.org/ URL: https://rsync.samba.org/
@ -40,7 +40,7 @@ Provides: bundled(zlib) = 1.2.8
#mentioned here as well. #mentioned here as well.
License: GPL-3.0-or-later License: GPL-3.0-or-later
Patch1: rsync-3.2.2-runtests.patch Patch0: rsync-3.2.2-runtests.patch
%description %description
Rsync uses a reliable algorithm to bring remote and host files into Rsync uses a reliable algorithm to bring remote and host files into
@ -64,16 +64,11 @@ package provides the anonymous rsync service.
# TAG: for pre versions use # TAG: for pre versions use
%if %isprerelease %if %isprerelease
%setup -q -n rsync-%{version}%{?prerelease} %autosetup -n rsync-%{version}%{?prerelease} -p1
%setup -q -b 1 -n rsync-%{version}%{?prerelease}
%else %else
%setup -q %autosetup -p1
%setup -q -b 1
%endif %endif
#%patch0 -p1 -b .verify-hostname
%patch1 -p1 -b .runtests
%build %build
%configure \ %configure \
--enable-openssl \ --enable-openssl \
@ -123,6 +118,15 @@ install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
%systemd_postun_with_restart rsyncd.service %systemd_postun_with_restart rsyncd.service
%changelog %changelog
* Tue Jan 14 2025 Jonathan Wright <jonathan@almalinux.org> - 3.4.0-1
- Update to 3.4.0
- Fix for CVE-2024-12084
- Fix for CVE-2024-12085
- Fix for CVE-2024-12086
- Fix for CVE-2024-12087
- Fix for CVE-2024-12088
- Fix for CVE-2024-12747
* Wed Apr 17 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 3.3.0-1 * Wed Apr 17 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 3.3.0-1
- New version 3.3.0 - New version 3.3.0