From d18b003386627bd2aedb96471eba86c7ff267d27 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Tue, 5 May 2026 06:29:24 -0400
Subject: [PATCH] import CS git dbus-1.12.8-28.el8_10

---
 SOURCES/ssh-x-forwarding.csh | 1 +
 SPECS/dbus.spec              | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/SOURCES/ssh-x-forwarding.csh b/SOURCES/ssh-x-forwarding.csh
index 47424e5..b25a0b9 100644
--- a/SOURCES/ssh-x-forwarding.csh
+++ b/SOURCES/ssh-x-forwarding.csh
@@ -2,6 +2,7 @@
 if ( $?SSH_CONNECTION == 0 ) exit
 if ( $?XDG_SESSION_ID == 0) exit
 if ( $?DISPLAY == 0 ) exit
+if ( $DISPLAY =~ :* ) exit
 if ( $SHLVL > 1 ) exit
 
 set DBUS_SESSIONS = "${XDG_RUNTIME_DIR}/dbus-1/sessions"
diff --git a/SPECS/dbus.spec b/SPECS/dbus.spec
index f4d354b..b2d0cfa 100644
--- a/SPECS/dbus.spec
+++ b/SPECS/dbus.spec
@@ -19,7 +19,7 @@
 Name:    dbus
 Epoch:   1
 Version: 1.12.8
-Release: 27%{?dist}
+Release: 28%{?dist}
 Summary: D-BUS message bus
 
 Group:   System Environment/Libraries
@@ -425,6 +425,9 @@ popd
 %{_includedir}/*
 
 %changelog
+* Wed Dec 10 2025 David King <dking@redhat.com> - 1:1.12.8-28
+- Fix SSH forwarding with csh (RHEL-4156)
+
 * Thu May 29 2025 Milan Crha <mcrha@redhat.com> - 1.12.8-27
 - Resolves: RHEL-65330 (Crash on configuration reload)