From a4dff1765fc6bdb991c3dd7c7043ab22c7f96fd6 Mon Sep 17 00:00:00 2001
From: wency_cn <wency.cn@gmail.com>
Date: Thu, 11 Dec 2025 14:44:52 +0800
Subject: [PATCH] Update code from upstream

---
 rsync-3.4.1-ssh-askpass.patch | 15 +++++++++++++++
 rsync.spec                    |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 rsync-3.4.1-ssh-askpass.patch

diff --git a/rsync-3.4.1-ssh-askpass.patch b/rsync-3.4.1-ssh-askpass.patch
new file mode 100644
index 0000000..8941495
--- /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 da13bf6..7deae3d 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 <mruprich@redhat.com> - 3.4.1-3
+- Resolves: RHEL-118549 - Do not clear DISPLAY unconditionally
+
 * Fri Feb 21 2025 yangxinyu <yangxinyu@nfschina.com> - 3.4.1-1
 - New version 3.4.1
 
-- 
Gitee