From 0b53c7e945edac2919de84c7f7b29f67823ae8a5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 29 2019 15:25:43 +0000
Subject: import gdm-3.28.2-11.el7


---

diff --git a/SOURCES/0001-configure-don-t-assume-x-server-defaults-to-local-on.patch b/SOURCES/0001-configure-don-t-assume-x-server-defaults-to-local-on.patch
new file mode 100644
index 0000000..4ed8c8e
--- /dev/null
+++ b/SOURCES/0001-configure-don-t-assume-x-server-defaults-to-local-on.patch
@@ -0,0 +1,86 @@
+From 56e545ff4c87685f50ee9c77e0faab0c44b4ee3c Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 3 Dec 2018 13:58:47 -0500
+Subject: [PATCH] configure: don't assume x server defaults to local only
+
+it doesn't in rhel.
+---
+ configure.ac | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ad55df84..4ed53027f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1243,68 +1243,60 @@ elif test -x /usr/X11R6/bin/X; then
+    X_PATH="/usr/X11R6/bin"
+    X_SERVER_PATH="/usr/X11R6/bin"
+    X_SERVER="/usr/X11R6/bin/X"
+ elif test -x /usr/bin/Xorg; then
+    X_PATH="/usr/bin"
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/Xorg"
+ elif test -x /usr/X11/bin/X; then
+    X_PATH="/usr/X11/bin"
+    X_SERVER_PATH="/usr/X11/bin"
+    X_SERVER="/usr/X11/bin/X"
+ elif test -x /usr/openwin/bin/Xsun; then
+    # Do not add /usr/openwin/bin here because on Solaris you need
+    # /usr/openwin/bin in your PATH even if you are using the Xorg
+    # Xserver.  We add this to the path below.
+    X_PATH="/usr/openwin/bin"
+    X_SERVER_PATH="/usr/openwin/bin"
+    X_SERVER="/usr/openwin/bin/Xsun"
+ elif test -x /opt/X11R6/bin/X; then
+    X_PATH="/opt/X11R6/bin"
+    X_SERVER_PATH="/opt/X11R6/bin"
+    X_SERVER="/opt/X11R6/bin/X"
+ else
+    # what to do, what to do, this is wrong, but this just sets the
+    # defaults, perhaps this user is cross compiling or some such
+    X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
+    X_SERVER_PATH="/usr/bin"
+    X_SERVER="/usr/bin/X"
+ fi
+ 
+-dnl ---------------------------------------------------------------------------
+-dnl - Check if Xorg is new enough to require '-listen tcp' (1.17)
+-dnl ---------------------------------------------------------------------------
+-
+-if $PKG_CONFIG --atleast-version=1.17 xorg-server; then
+-   AC_DEFINE([HAVE_XSERVER_THAT_DEFAULTS_TO_LOCAL_ONLY], [], [XServer disables tcp access by default])
+-fi
+-
+ dnl ---------------------------------------------------------------------------
+ dnl - Expand vars
+ dnl ---------------------------------------------------------------------------
+ 
+ AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
+ AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ AS_AC_EXPAND(DATADIR, $datadir)
+ AS_AC_EXPAND(BINDIR, $bindir)
+ AS_AC_EXPAND(SBINDIR, $sbindir)
+ AS_AC_EXPAND(LIBDIR, $libdir)
+ AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - runtime directory
+ dnl ---------------------------------------------------------------------------
+ 
+ AC_ARG_WITH([run-dir],
+             AS_HELP_STRING([--with-run-dir=<file>],
+                            [runtime directory]))
+ 
+ if ! test -z "$with_run_dir"; then
+    GDM_RUN_DIR=$with_run_dir
+ else
+    GDM_RUN_DIR=${localstatedir}/run/gdm
+ fi
+ 
+ AC_SUBST([GDM_RUN_DIR])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - PID file
+-- 
+2.17.1
+
diff --git a/SPECS/gdm.spec b/SPECS/gdm.spec
index 65bb8d6..eb277d0 100644
--- a/SPECS/gdm.spec
+++ b/SPECS/gdm.spec
@@ -10,7 +10,7 @@
 Name: gdm
 Epoch: 1
 Version: 3.28.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
@@ -47,6 +47,7 @@ Patch92: 0001-gdm.conf-custom.in-strip-out-reference-to-wayland.patch
 Patch93: system-dconf.patch
 Patch94: classic-session.patch
 Patch95: 0001-data-drop-pam_gdm-reintroduce-pam_env-postlogin.patch
+Patch96: 0001-configure-don-t-assume-x-server-defaults-to-local-on.patch
 
 BuildRequires: pam-devel >= 0:%{pam_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
@@ -358,6 +359,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
+* Mon Dec 03 2018 Ray Strode <rstrode@redhat.com> - 3.28.2-11
+- Don't assume X server defaults to local only
+  Resolves: #1647621
+
 * Fri Oct 05 2018 Ray Strode <rstrode@redhat.com> - 3.28.2-10
 - another user switching fix
   Resolves: #1489977