diff --git a/tigervnc-dont-print-xvnc-banner-before-parsing-args.patch b/tigervnc-dont-print-xvnc-banner-before-parsing-args.patch new file mode 100644 index 0000000..5d7ec9f --- /dev/null +++ b/tigervnc-dont-print-xvnc-banner-before-parsing-args.patch @@ -0,0 +1,47 @@ +From 1f1aaca09a1f9919f5169caea9c396b14c2af765 Mon Sep 17 00:00:00 2001 +From: Pierre Ossman +Date: Tue, 8 Apr 2025 14:41:04 +0200 +Subject: [PATCH] Don't print Xvnc banner before parsing args + +If we'll be running in inetd mode, then stdout and stderr will be a +client socket and not an appropriate place for logging. + +Mimic what Xorg does instead. +--- + unix/xserver/hw/vnc/xvnc.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c +index ddb249937..a13168c47 100644 +--- a/unix/xserver/hw/vnc/xvnc.c ++++ b/unix/xserver/hw/vnc/xvnc.c +@@ -446,7 +446,7 @@ ddxProcessArgument(int argc, char *argv[], int i) + } + + if (!strcmp(argv[i], "-showconfig") || !strcmp(argv[i], "-version")) { +- /* Already shown at start */ ++ vncPrintBanner(); + exit(0); + } + +@@ -1171,8 +1171,11 @@ InitOutput(ScreenInfo * scrInfo, int argc, char **argv) + int i; + int NumFormats = 0; + +- if (serverGeneration == 1) ++ if (serverGeneration == 1) { ++ vncPrintBanner(); ++ + LoadExtensionList(vncExtensions, ARRAY_SIZE(vncExtensions), TRUE); ++ } + + #if XORG_AT_LEAST(1, 20, 0) + xorgGlxCreateVendor(); +@@ -1266,7 +1269,5 @@ vncClientGone(int fd) + int + main(int argc, char *argv[], char *envp[]) + { +- vncPrintBanner(); +- + return dix_main(argc, argv, envp); + } diff --git a/tigervnc.spec b/tigervnc.spec index cae2928..264165d 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -5,7 +5,7 @@ Name: tigervnc Version: 1.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A TigerVNC remote display system %global _hardened_build 1 @@ -31,6 +31,7 @@ Patch3: tigervnc-add-option-allowing-to-connect-only-user-owning-session # Upstream patches Patch50: tigervnc-add-selinux-policy-rules-allowing-create-dirs-under-root-dir.patch Patch51: tigervnc-add-selinux-policy-rules-allowing-access-to-proc-sys-fs-nr-open.patch +Patch52: tigervnc-dont-print-xvnc-banner-before-parsing-args.patch # Upstreamable patches @@ -210,6 +211,7 @@ popd # Upstream patches %patch -P50 -p1 -b .add-selinux-policy-rules-allowing-create-dirs-under-root-dir %patch -P51 -p1 -b .add-selinux-policy-rules-allowing-access-to-proc-sys-fs-nr-open +%patch -P52 -p1 -b .dont-print-xvnc-banner-before-parsing-args # Upstreamable patches @@ -393,6 +395,10 @@ fi %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %changelog +* Wed Apr 16 2025 Jan Grulich - 1.15.0-2 +- Fix inetd mode not working + Resolves: RHEL-86511 + * Fri Mar 07 2025 Jan Grulich - 1.15.0-1 - 1.15.0 Resolves: RHEL-78617