From b4b2778937003895dfd83f956ce69a100ceaf4278a5ce25134b53f2488eaac04 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 29 Jun 2013 11:26:41 +0000 Subject: [PATCH 1/2] Accepting request 181074 from home:mgorse:GNOME:Factory - Fix snprintf in kdm patch for gcc 4.8. OBS-URL: https://build.opensuse.org/request/show/181074 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=181 --- gnome-session-kdm-support.patch | 18 ++++++++++-------- gnome-session.changes | 5 +++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gnome-session-kdm-support.patch b/gnome-session-kdm-support.patch index 796975d..2824f76 100644 --- a/gnome-session-kdm-support.patch +++ b/gnome-session-kdm-support.patch @@ -104,7 +104,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c return FALSE; } -@@ -299,13 +304,76 @@ gdm_init_protocol_connection (GdmProtoco +@@ -299,13 +304,78 @@ gdm_init_protocol_connection (GdmProtoco if (!gdm_authenticate_connection (data)) { g_warning ("Failed to authenticate with GDM"); @@ -123,6 +123,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c + char *dm_display; + char *dm_control; + char *p0 = NULL; ++ int width; + + g_assert (data->fd <= 0); + @@ -150,8 +151,9 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c + return FALSE; + } + ++ width = p0 ? p0 - dm_display : 512; + snprintf (addr.sun_path, sizeof (addr.sun_path), "%s/dmctl-%.*s/socket", -+ dm_control, p0 ? p0 - dm_display : 512, dm_display); ++ dm_control, width, dm_display); + addr.sun_family = AF_UNIX; + + g_free (dm_display); @@ -182,7 +184,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c static void gdm_parse_query_response (GdmProtocolData *data, const char *response) -@@ -360,7 +428,23 @@ gdm_parse_query_response (GdmProtocolDat +@@ -360,7 +430,23 @@ gdm_parse_query_response (GdmProtocolDat } static void @@ -207,7 +209,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c { time_t current_time; char *response; -@@ -373,26 +457,35 @@ gdm_update_logout_actions (GdmProtocolDa +@@ -373,26 +459,35 @@ gdm_update_logout_actions (GdmProtocolDa data->last_update = current_time; @@ -250,7 +252,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c return TRUE; } -@@ -400,7 +493,7 @@ gdm_is_available (void) +@@ -400,7 +495,7 @@ gdm_is_available (void) gboolean gdm_supports_logout_action (GdmLogoutAction action) { @@ -259,7 +261,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c return (gdm_protocol_data.available_actions & action) != 0; } -@@ -408,21 +501,15 @@ gdm_supports_logout_action (GdmLogoutAct +@@ -408,21 +503,15 @@ gdm_supports_logout_action (GdmLogoutAct GdmLogoutAction gdm_get_logout_action (void) { @@ -284,7 +286,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c switch (action) { case GDM_LOGOUT_ACTION_NONE: -@@ -439,16 +526,58 @@ gdm_set_logout_action (GdmLogoutAction a +@@ -439,16 +528,58 @@ gdm_set_logout_action (GdmLogoutAction a break; } @@ -346,7 +348,7 @@ Index: gnome-session-3.4.1/gnome-session/gdm.c } void -@@ -456,16 +585,16 @@ gdm_new_login (void) +@@ -456,16 +587,16 @@ gdm_new_login (void) { char *response; diff --git a/gnome-session.changes b/gnome-session.changes index b7733fd..c38daa4 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 26 17:31:51 UTC 2013 - mgorse@suse.com + +- Fix snprintf in kdm patch for gcc 4.8. + ------------------------------------------------------------------- Wed May 15 14:10:24 UTC 2013 - dimstar@opensuse.org From ea967825fb0d79a26719a6bb728173d087e8fe382e317d177c3e3a3094fcca1c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 29 Jun 2013 12:01:00 +0000 Subject: [PATCH 2/2] fix OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=182 --- gnome-session.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnome-session.changes b/gnome-session.changes index c38daa4..391b6fe 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Jun 26 17:31:51 UTC 2013 - mgorse@suse.com -- Fix snprintf in kdm patch for gcc 4.8. +- Fix gnome-session-kdm-support.patch: gcc 4.8 became stricter in + the use of snprintf. ------------------------------------------------------------------- Wed May 15 14:10:24 UTC 2013 - dimstar@opensuse.org