diff --git a/rsync-3.4.1-ssh-askpass.patch b/rsync-3.4.1-ssh-askpass.patch new file mode 100644 index 0000000000000000000000000000000000000000..8941495b757e5dd65e1945a8b2efc20d664384e5 --- /dev/null +++ b/rsync-3.4.1-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"); + + #if defined USE_OPENSSL && defined SET_OPENSSL_CONF + #define TO_STR2(x) #x diff --git a/rsync.spec b/rsync.spec index da13bf60c79452a707de7fb1b9fe0ab0fe27d197..7deae3dfc8468a66461ff2818e26e943436cfa8e 100644 --- a/rsync.spec +++ b/rsync.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 3 Name: rsync Version: 3.4.1 @@ -13,6 +13,7 @@ Source3: rsyncd.service Source4: rsyncd.conf Source5: rsyncd.sysconfig Source6: rsyncd@.service +Patch3: rsync-3.4.1-ssh-askpass.patch BuildRequires: make vim BuildRequires: gcc @@ -108,6 +109,9 @@ chmod -x support/* %{_unitdir}/rsyncd@.service %changelog +* Thu Oct 09 2025 Michal Ruprich - 3.4.1-3 +- Resolves: RHEL-118549 - Do not clear DISPLAY unconditionally + * Fri Feb 21 2025 yangxinyu - 3.4.1-1 - New version 3.4.1