[xfce4-session] Add patch for hostname issue. Fixes bug #706563
Kevin Fenzi
kevin at fedoraproject.org
Wed Jul 27 22:31:33 UTC 2011
commit 66e0e22087f6a4a0ca7b86ff560cc51e7ea19cd3
Author: Kevin Fenzi <kevin at scrye.com>
Date: Wed Jul 27 16:31:11 2011 -0600
Add patch for hostname issue. Fixes bug #706563
xfce4-session-4.8.1-hostname.patch | 29 +++++++++++++++++++++++++++++
xfce4-session.spec | 10 ++++++++--
2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/xfce4-session-4.8.1-hostname.patch b/xfce4-session-4.8.1-hostname.patch
new file mode 100644
index 0000000..e7e1127
--- /dev/null
+++ b/xfce4-session-4.8.1-hostname.patch
@@ -0,0 +1,29 @@
+From ba231e2eee82c321f473687e425d455fb36205d9 Mon Sep 17 00:00:00 2001
+From: Benedikt Meurer <benedikt.meurer at googlemail.com>
+Date: Tue, 26 Jul 2011 06:19:09 +0000
+Subject: Only perform hostname checks when TCP connections are enabled.
+
+Based on a patch from Guido Berhoerster <gber at opensuse.org>.
+---
+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"));
+
+--
+cgit
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 38d7fa6..42db790 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -2,7 +2,7 @@
Name: xfce4-session
Version: 4.8.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Xfce session manager
Group: User Interface/Desktops
@@ -16,6 +16,8 @@ Patch0: xfce4-session-4.7.2-hide-tips.patch
# http://patches.ubuntu.com/x/xfce4-session/extracted/01_correct_shadows.patch
Patch1: xfce4-session-4.6.1-correct-shadows.patch
Patch2: xfce4-session-4.8.1-gdmlang.patch
+# Upstream already
+Patch3: xfce4-session-4.8.1-hostname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildRequires: dbus-devel
@@ -67,7 +69,8 @@ Additional splash screen engines for the Xfce Session Manager.
%setup -q
%patch0 -p1 -b .hide-tips
%patch1 -p1 -b .correct-shadows
-%patch2 -p1 -b .gdm-lang
+%patch2 -p1 -b .gdmlang
+%patch3 -p1 -b .hostname
%build
@@ -160,6 +163,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/themes/Default/balou/
%changelog
+* Wed Jul 27 2011 Kevin Fenzi <kevin at scrye.com> - 4.8.1-5
+- Add patch for hostname issue. Fixes bug #706563
+
* Sat Apr 16 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-4
- Autostart polkit-gnome-authentication-agent-1 (#693152)
- Remove --enable-gen-doc configure option as it requires network access
More information about the scm-commits
mailing list