From 2f86b3986e2c0faf0d49b3f6ab977682e1f0b79e433acc055d221280bea96d6c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 31 May 2011 12:46:35 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/xfce4-session revision 39.0 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=d9f3cb17d4947bd0fe94d275d81c1dfc --- xfce4-session.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xfce4-session.spec b/xfce4-session.spec index bffcaf3..724e6ec 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -19,7 +19,7 @@ Name: xfce4-session Version: 4.8.1 -Release: 1 +Release: 11 License: GPLv2+ Summary: Xfce Session manager Url: http://www.xfce.org/projects/xfce4-session/ @@ -28,7 +28,7 @@ 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 # 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 +Patch2: xfce4-session-4.8.1-fix-gdm_lang-usage.patch BuildRequires: intltool BuildRequires: perl-XML-Parser BuildRequires: pkgconfig(dbus-glib-1) From d22419da37aeb50792026e213da531b2e4af658158b134212f71bc016fd74715 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Tue, 26 Jul 2011 07:41:09 +0000 Subject: [PATCH 2/3] - added xfce4-session-4.8.1-disable-hostname-check.patch OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=59 --- ...session-4.8.1-disable-hostname-check.patch | 31 +++++++++++++++++++ xfce4-session.changes | 5 +++ xfce4-session.spec | 7 +++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 xfce4-session-4.8.1-disable-hostname-check.patch diff --git a/xfce4-session-4.8.1-disable-hostname-check.patch b/xfce4-session-4.8.1-disable-hostname-check.patch new file mode 100644 index 0000000..ae8d442 --- /dev/null +++ b/xfce4-session-4.8.1-disable-hostname-check.patch @@ -0,0 +1,31 @@ +commit ba231e2eee82c321f473687e425d455fb36205d9 +Author: Benedikt Meurer +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 . + + 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")); + diff --git a/xfce4-session.changes b/xfce4-session.changes index a54841d..ce48bc4 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 26 07:19:25 UTC 2011 - gber@opensuse.org + +- added xfce4-session-4.8.1-disable-hostname-check.patch + ------------------------------------------------------------------- Tue May 17 09:03:24 UTC 2011 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 724e6ec..65d6ab8 100644 --- a/xfce4-session.spec +++ b/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 From bcb047b2ee2be6017d3ddee362e83c8cf4a525fca117ce94b319d5ad0ab017ee Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Tue, 26 Jul 2011 07:42:35 +0000 Subject: [PATCH 3/3] Corrected changelog entry OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=60 --- xfce4-session.changes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xfce4-session.changes b/xfce4-session.changes index ce48bc4..a9c6bc2 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- Tue Jul 26 07:19:25 UTC 2011 - gber@opensuse.org -- added xfce4-session-4.8.1-disable-hostname-check.patch +- 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