From 3f434651cd7c32af6606ab1143d76eaa05d57981 Mon Sep 17 00:00:00 2001
From: David King <dking@redhat.com>
Date: Wed, 10 Dec 2025 09:00:43 +0000
Subject: [PATCH] Fix SSH forwarding with csh (RHEL-4156)

Based on an earlier request by Orion Poplawski.

Additionally, mark the dbus package as empty for rpminspect.

Resolves: RHEL-4156
---
 dbus.spec            | 5 ++++-
 rpminspect.yaml      | 3 +++
 ssh-x-forwarding.csh | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 rpminspect.yaml

diff --git a/dbus.spec b/dbus.spec
index f4d354b..b2d0cfa 100644
--- a/dbus.spec
+++ b/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)
 
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..baf202b
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,3 @@
+emptyrpm:
+  expected_empty:
+    - dbus
diff --git a/ssh-x-forwarding.csh b/ssh-x-forwarding.csh
index 47424e5..b25a0b9 100644
--- a/ssh-x-forwarding.csh
+++ b/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"