Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gdm/files: gdm-3.7.90-fix-daemonize-regression.patch gdm-3.7.3.1-disable-accessibility.patch
Date: Thu, 28 Mar 2013 22:47:38
Message-Id: 20130328224735.8F7EB2171E@flycatcher.gentoo.org
1 pacho 13/03/28 22:47:35
2
3 Added: gdm-3.7.90-fix-daemonize-regression.patch
4 gdm-3.7.3.1-disable-accessibility.patch
5 Log:
6 Version bump for Gnome 3.8
7
8 (Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
9
10 Revision Changes Path
11 1.1 gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch?rev=1.1&content-type=text/plain
15
16 Index: gdm-3.7.90-fix-daemonize-regression.patch
17 ===================================================================
18 From bda248c1e184f92aedf9f8d932ebd20746910d52 Mon Sep 17 00:00:00 2001
19 From: Sobhan Mohammadpour <sobhanmohammadpour1@×××××.fr>
20 Date: Mon, 4 Mar 2013 21:23:45 +0330
21 Subject: [PATCH] gdm-3.7.90 fix daemonize regression
22
23 ---
24 configure.ac | 4 ++++
25 daemon/Makefile.am | 1 +
26 daemon/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
27 3 files changed, 50 insertions(+)
28
29 diff --git a/configure.ac b/configure.ac
30 index 0918060..d4ea271 100644
31 --- a/configure.ac
32 +++ b/configure.ac
33 @@ -99,6 +99,10 @@ PKG_CHECK_MODULES(DAEMON,
34 AC_SUBST(DAEMON_CFLAGS)
35 AC_SUBST(DAEMON_LIBS)
36
37 +PKG_CHECK_MODULES(LIBDAEMON, libdaemon)
38 +AC_SUBST(LIBDAEMON_CFLAGS)
39 +AC_SUBST(LIBDAEMON_LIBS)
40 +
41 GLIB_GSETTINGS
42
43 PKG_CHECK_MODULES(NSS,
44 diff --git a/daemon/Makefile.am b/daemon/Makefile.am
45 index ead9096..b810089 100644
46 --- a/daemon/Makefile.am
47 +++ b/daemon/Makefile.am
48 @@ -385,6 +385,7 @@ gdm_LDADD = \
49 $(top_builddir)/common/libgdmcommon.la \
50 $(XLIB_LIBS) \
51 $(DAEMON_LIBS) \
52 + $(LIBDAEMON_LIBS) \
53 $(XDMCP_LIBS) \
54 $(LIBWRAP_LIBS) \
55 $(SYSTEMD_LIBS) \
56 diff --git a/daemon/main.c b/daemon/main.c
57 index 8176fe3..0151862 100644
58 --- a/daemon/main.c
59 +++ b/daemon/main.c
60 @@ -34,6 +34,8 @@
61 #include <locale.h>
62 #include <signal.h>
63
64 +#include <libdaemon/dfork.h>
65 +
66 #include <glib.h>
67 #include <glib/gi18n.h>
68 #include <glib/gstdio.h>
69 @@ -329,8 +331,10 @@ main (int argc,
70 static gboolean do_timed_exit = FALSE;
71 static gboolean print_version = FALSE;
72 static gboolean fatal_warnings = FALSE;
73 + static gboolean no_daemon = FALSE;
74 static GOptionEntry entries [] = {
75 { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL },
76 + { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL },
77 { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL },
78 { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL },
79
80 @@ -343,6 +347,15 @@ main (int argc,
81
82 ret = 1;
83
84 + /* preprocess the arguments to support the xdm style
85 + * -nodaemon option
86 + */
87 + int i;
88 + for ( i = 0; i < argc; i++) {
89 + if (strcmp (argv[i], "-nodaemon") == 0)
90 + argv[i] = "--nodaemon";
91 + }
92 +
93 context = g_option_context_new (_("GNOME Display Manager"));
94 g_option_context_add_main_entries (context, entries, NULL);
95 g_option_context_set_ignore_unknown_options (context, TRUE);
96 @@ -369,6 +382,33 @@ main (int argc,
97 g_log_set_always_fatal (fatal_mask);
98 }
99
100 + if (!no_daemon) {
101 + pid_t pid;
102 + if (daemon_retval_init () < 0) {
103 + g_warning ("Failed to create pipe");
104 + exit (-1);
105 + }
106 + if ((pid = daemon_fork ()) < 0) {
107 + /* Fork failed */
108 + daemon_retval_done ();
109 + exit (1);
110 + } else if (pid) {
111 + /* Parent process: wait 20s for daemon_retval_send() in the daemon process */
112 + if ((ret = daemon_retval_wait (20)) < 0) {
113 + g_warning ("Timed out waiting for daemon process: %s", strerror(errno));
114 + exit (255);
115 + } else if (ret > 0) {
116 + g_warning ("Daemon process returned error code %d", ret);
117 + exit (ret);
118 + }
119 + exit (0);
120 + }
121 + /* Daemon process */
122 + daemon_close_all (-1);
123 + /* Start a new process group so that killing the daemon will kill the processes that it spawned */
124 + setsid ();
125 + }
126 +
127 gdm_log_init ();
128
129 settings = gdm_settings_new ();
130 @@ -418,6 +458,9 @@ main (int argc,
131 g_timeout_add_seconds (30, (GSourceFunc) timed_exit_cb, main_loop);
132 }
133
134 + if (!no_daemon)
135 + daemon_retval_send (0);
136 +
137 g_main_loop_run (main_loop);
138
139 g_debug ("GDM finished, cleaning up...");
140 @@ -433,6 +476,8 @@ main (int argc,
141 ret = 0;
142
143 out:
144 + if (!no_daemon)
145 + daemon_retval_send (ret);
146 if (error) {
147 g_printerr ("%s\n", error->message);
148 g_clear_error (&error);
149 --
150 1.8.1.2
151
152
153
154
155 1.1 gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch
156
157 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch?rev=1.1&view=markup
158 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch?rev=1.1&content-type=text/plain
159
160 Index: gdm-3.7.3.1-disable-accessibility.patch
161 ===================================================================
162 From 07fb1b31d818f308beb1c3800c4b90830b57d01b Mon Sep 17 00:00:00 2001
163 From: Sobhan Mohammadpour <sobhanmohammadpour1@×××××.fr>
164 Date: Fri, 25 Jan 2013 10:03:31 +0330
165 Subject: [PATCH] don't load accessbility
166
167 ---
168 data/00-upstream-settings | 4 ++--
169 1 file changed, 2 insertions(+), 2 deletions(-)
170
171 diff --git a/data/00-upstream-settings b/data/00-upstream-settings
172 index 660a295..3993786 100644
173 --- a/data/00-upstream-settings
174 +++ b/data/00-upstream-settings
175 @@ -7,7 +7,7 @@
176 #
177
178 [org/gnome/desktop/a11y/keyboard]
179 -enable=true
180 +enable=false
181
182 [org/gnome/desktop/background]
183 show-desktop-icons=false
184 @@ -16,7 +16,7 @@ show-desktop-icons=false
185 exec='/bin/true'
186
187 [org/gnome/desktop/interface]
188 -toolkit-accessibility=true
189 +toolkit-accessibility=false
190
191 [org/gnome/desktop/lockdown]
192 disable-application-handlers=true
193 --
194 1.8.1
Report Message
Find on MARC Find on Google Groups