diff --git a/SOURCES/rsync-3.2.5-ssh-askpass.patch b/SOURCES/rsync-3.2.5-ssh-askpass.patch new file mode 100644 index 0000000..62c419c --- /dev/null +++ b/SOURCES/rsync-3.2.5-ssh-askpass.patch @@ -0,0 +1,15 @@ +diff --git a/main.c b/main.c +index 7222a83..630ca03 100644 +--- a/main.c ++++ b/main.c +@@ -1743,7 +1743,9 @@ int main(int argc,char *argv[]) + our_gid = MY_GID(); + am_root = our_uid == ROOT_UID; + +- unset_env_var("DISPLAY"); ++ // DISPLAY should only be cleared if SSH_ASKPASS is empty ++ if (!getenv("SSH_ASKPASS")) ++ unset_env_var("DISPLAY"); + + memset(&stats, 0, sizeof(stats)); + diff --git a/SPECS/rsync.spec b/SPECS/rsync.spec index 492779f..1a52c8a 100644 --- a/SPECS/rsync.spec +++ b/SPECS/rsync.spec @@ -10,7 +10,7 @@ Summary: A program for synchronizing files over a network Name: rsync Version: 3.2.5 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://rsync.samba.org/ Source0: https://download.samba.org/pub/rsync/src/rsync-%{version}%{?prerelease}.tar.gz @@ -50,6 +50,7 @@ Patch7: rsync-3.2.5-cve-2024-12747.patch # From RHEL10 this will have to be documented as a different # behaviour for compression. Patch8: rsync-3.2.5-default-compression.patch +Patch9: rsync-3.2.5-ssh-askpass.patch %description Rsync uses a reliable algorithm to bring remote and host files into @@ -89,14 +90,15 @@ may be used to setup a restricted rsync users via ssh logins. %setup -q -b 1 %endif -%patch1 -p1 -b .runtests -%patch2 -p1 -b .rrsync-man -%patch3 -p1 -b .filtering-rules -%patch4 -p1 -b .cve-2024-12085 -%patch5 -p1 -b .cve-2024-12087 -%patch6 -p1 -b .cve-2024-12088 -%patch7 -p1 -b .cve-2024-12747 -%patch8 -p1 -b .default-compression +%patch 1 -p1 -b .runtests +%patch 2 -p1 -b .rrsync-man +%patch 3 -p1 -b .filtering-rules +%patch 4 -p1 -b .cve-2024-12085 +%patch 5 -p1 -b .cve-2024-12087 +%patch 6 -p1 -b .cve-2024-12088 +%patch 7 -p1 -b .cve-2024-12747 +%patch 8 -p1 -b .default-compression +%patch 9 -p1 -b .ssh-askpass %build %configure --disable-xxhash --with-rrsync @@ -147,6 +149,9 @@ install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service %systemd_postun_with_restart rsyncd.service %changelog +* Thu Oct 09 2025 Michal Ruprich - 3.2.5-4 +- Resolves: RHEL-104404 - Do not clear DISPLAY unconditionally + * Wed Feb 05 2025 Michal Ruprich - 3.2.5-3 - Resolves: RHEL-70265 - Rebase rsync to 3.2.5