Accepting request 77095 from X11:xfce

- added xfce4-session-4.8.1-disable-hostname-check.patch so
  hostname checks are only performed when TCP connections are
  enabled

OBS-URL: https://build.opensuse.org/request/show/77095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=40

xfce4-session-4.8.1-disable-hostname-check.patch

@@ -0,0 +1,31 @@
+commit ba231e2eee82c321f473687e425d455fb36205d9
+Author: Benedikt Meurer <benedikt.meurer@googlemail.com>
+Date:   Tue Jul 26 08:19:09 2011 +0200
+
+    Only perform hostname checks when TCP connections are enabled.
+
+    Based on a patch from Guido Berhoerster <gber@opensuse.org>.
+
+ xfce4-session/main.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/xfce4-session/main.c b/xfce4-session/main.c
+index 0466f48..8f7c003 100644
+--- a/xfce4-session/main.c
++++ b/xfce4-session/main.c
+@@ -247,9 +247,12 @@ main (int argc, char **argv)
+   dpy = gdk_display_get_default ();
+   init_display (manager, dpy, channel, opt_disable_tcp);
+
+-  /* verify that the DNS settings are ok */
+-  xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
+-  xfsm_dns_check ();
++  if (!opt_disable_tcp && xfconf_channel_get_bool (channel, "/security/EnableTcp", FALSE))
++    {
++      /* verify that the DNS settings are ok */
++      xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
++      xfsm_dns_check ();
++    }
+
+   xfsm_splash_screen_next (splash_screen, _("Loading session data"));
+

xfce4-session.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul 26 07:19:25 UTC 2011 - gber@opensuse.org
+
+- added xfce4-session-4.8.1-disable-hostname-check.patch so
+  hostname checks are only performed when TCP connections are
+  enabled
+
 -------------------------------------------------------------------
 Tue May 17 09:03:24 UTC 2011 - gber@opensuse.org
 

xfce4-session.spec

@@ -26,9 +26,11 @@ Url:            http://www.xfce.org/projects/xfce4-session/
 Group:          System/GUI/XFCE
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows
-Patch1:         xfce4-session-simple-splash-remove-shadows.patch
+Patch0:         xfce4-session-simple-splash-remove-shadows.patch
 # PATCH-FIX-UPSTREAM xfce4-session-4.8.1-fix-gdm_lang-usage.patch bnc#694203 bxo#7400 gber@opensuse.org -- Fixes GDM_LANG usage to be compatible with GDM3 (backported from upstream git)
-Patch2:         xfce4-session-4.8.1-fix-gdm_lang-usage.patch
+Patch1:         xfce4-session-4.8.1-fix-gdm_lang-usage.patch
+# PATCH-FIX-UPSTREAM xfce4-session-4.8.1-disable-hostname-check.patch gber@opensuse.org -- Only perform hostname checks when TCP connections are enabled (backported from upstream git)
+Patch2:         xfce4-session-4.8.1-disable-hostname-check.patch
 BuildRequires:  intltool
 BuildRequires:  perl-XML-Parser
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -88,6 +90,7 @@ This package provides the upstream look and feel for the Xfce Session Manager.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1