diff options
Diffstat (limited to 'gnome-base/gdm/files')
| -rw-r--r-- | gnome-base/gdm/files/3.2.1.1/gdm | 11 | ||||
| -rw-r--r-- | gnome-base/gdm/files/3.2.1.1/gdm-autologin | 10 | ||||
| -rw-r--r-- | gnome-base/gdm/files/3.2.1.1/gdm-fingerprint | 14 | ||||
| -rw-r--r-- | gnome-base/gdm/files/3.2.1.1/gdm-password | 11 | ||||
| -rw-r--r-- | gnome-base/gdm/files/3.2.1.1/gdm-smartcard | 15 | ||||
| -rw-r--r-- | gnome-base/gdm/files/3.2.1.1/gdm-welcome | 9 | ||||
| -rw-r--r-- | gnome-base/gdm/files/3.2.1.1/gdm.service | 11 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch | 195 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-3.3.92.1-disable-accessibility.patch | 30 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-3.6.0-fix-daemonize-regression.patch | 192 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch | 27 | ||||
| -rwxr-xr-x | gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch | 34 | ||||
| -rwxr-xr-x | gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch | 134 |
13 files changed, 0 insertions, 693 deletions
diff --git a/gnome-base/gdm/files/3.2.1.1/gdm b/gnome-base/gdm/files/3.2.1.1/gdm deleted file mode 100644 index d965ecac53bc..000000000000 --- a/gnome-base/gdm/files/3.2.1.1/gdm +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth optional pam_env.so -auth include system-login -auth required pam_nologin.so - -account include system-login - -password include system-login - -session include system-auth -#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-autologin b/gnome-base/gdm/files/3.2.1.1/gdm-autologin deleted file mode 100644 index 9d165d6d9cc5..000000000000 --- a/gnome-base/gdm/files/3.2.1.1/gdm-autologin +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth optional pam_env.so -auth required pam_nologin.so -auth required pam_permit.so -account include system-login -password include system-login -session include system-auth -# For the keyring to unlock with autologin, you need to set an empty -# password on the keyring. -#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-fingerprint b/gnome-base/gdm/files/3.2.1.1/gdm-fingerprint deleted file mode 100644 index 7d38de945fd3..000000000000 --- a/gnome-base/gdm/files/3.2.1.1/gdm-fingerprint +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 -# Note: no pam_gnome_keyring.so support since the login password is not used -auth optional pam_env.so -auth required pam_tally2.so onerr=succeed -auth required pam_shells.so -auth required pam_nologin.so -auth required pam_fprintd.so -auth optional pam_permit.so - -account include system-login - -password required pam_deny.so - -session include system-auth diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-password b/gnome-base/gdm/files/3.2.1.1/gdm-password deleted file mode 100644 index d965ecac53bc..000000000000 --- a/gnome-base/gdm/files/3.2.1.1/gdm-password +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth optional pam_env.so -auth include system-login -auth required pam_nologin.so - -account include system-login - -password include system-login - -session include system-auth -#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-smartcard b/gnome-base/gdm/files/3.2.1.1/gdm-smartcard deleted file mode 100644 index 5cf884da8713..000000000000 --- a/gnome-base/gdm/files/3.2.1.1/gdm-smartcard +++ /dev/null @@ -1,15 +0,0 @@ -#%PAM-1.0 -auth optional pam_env.so -auth required pam_tally2.so onerr=succeed -auth required pam_shells.so -auth required pam_nologin.so -auth [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card card_only -auth optional pam_permit.so - -account include system-login - -password optional pam_pkcs11.so -password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -password optional pam_permit.so - -session include system-auth diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-welcome b/gnome-base/gdm/files/3.2.1.1/gdm-welcome deleted file mode 100644 index 932eefee357f..000000000000 --- a/gnome-base/gdm/files/3.2.1.1/gdm-welcome +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so -account required pam_nologin.so -account include system-services -password include system-services -session required pam_loginuid.so -session optional pam_keyinit.so force revoke -session include system-services diff --git a/gnome-base/gdm/files/3.2.1.1/gdm.service b/gnome-base/gdm/files/3.2.1.1/gdm.service deleted file mode 100644 index 63bb08e90219..000000000000 --- a/gnome-base/gdm/files/3.2.1.1/gdm.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=GNOME Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/bin/gdm --nodaemon -Type=dbus -BusName=org.gnome.DisplayManager - -[Install] -WantedBy=graphical.target diff --git a/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch b/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch deleted file mode 100644 index f219a1490874..000000000000 --- a/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 64002e623fea54ab10040206d164c5fdee4a43d2 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan <nirbheek@gentoo.org> -Date: Fri, 15 Apr 2011 22:13:44 +0530 -Subject: [PATCH] Fix VT grab race with getty causing X to grab the wrong VT - -On bootup, if X is spawned without any args, it'll take up the first unused VT. -If GDM starts up before gettys are spawned, X takes up VT1 or VT2 depending on -the init system and bootsplash. - -This is problematic because afterwards getty will come up underneath X, and -cause keyboard problems and eventually crash X. - -So we read /etc/inittab, check for open VTs, compare the two values, and take -the conservative one. ---- - configure.ac | 4 ++ - daemon/Makefile.am | 1 + - daemon/gdm-server.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 110 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ca0f8bb..b9e7462 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -302,6 +302,10 @@ AC_CHECK_TYPE(socklen_t,, - AC_CHECK_HEADERS(sys/sockio.h) - AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv]) - -+dnl Needed for querying the kernel for free VTs -+AC_CHECK_HEADERS(sys/vt.h) -+AC_CHECK_HEADERS(sys/ioctl.h) -+ - dnl checks needed for Darwin compatibility to linux **environ. - AC_CHECK_HEADERS(crt_externs.h) - AC_CHECK_FUNCS(_NSGetEnviron) -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index da18835..c1b6bda 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOGDIR=\"$(logdir)\" \ - -DSBINDIR=\"$(sbindir)\" \ -+ -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ - -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ -diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 339f3cc..29d16dc 100644 ---- a/daemon/gdm-server.c -+++ b/daemon/gdm-server.c -@@ -26,6 +26,8 @@ - #include <unistd.h> - #include <string.h> - #include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/vt.h> - #include <sys/wait.h> - #include <errno.h> - #include <ctype.h> -@@ -42,6 +44,7 @@ - #include <glib/gi18n.h> - #include <glib/gstdio.h> - #include <glib-object.h> -+#include <gio/gio.h> - - #include <X11/Xlib.h> /* for Display */ - -@@ -54,6 +57,8 @@ extern char **environ; - - #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate)) - -+#define INITTAB SYSCONFDIR"/inittab" -+ - /* These are the servstat values, also used as server - * process exit codes */ - #define SERVER_TIMEOUT 2 /* Server didn't start */ -@@ -674,6 +679,105 @@ gdm_server_spawn (GdmServer *server, - } - - /** -+ * Parse the inittab file used by getty to spawn VTs to find unused ttys -+ */ -+static int -+get_free_vt_from_inittab () -+{ -+ GFile *gfile; -+ GFileInputStream *contents; -+ GDataInputStream *dstream; -+ GRegex *getty; -+ GMatchInfo *tty_match = NULL; -+ GSList *tty_list = NULL; -+ GError *error = NULL; -+ gchar *temp = NULL; -+ int vtno = 0; -+ -+ gfile = g_file_new_for_path (INITTAB); -+ contents = g_file_read (gfile, NULL, &error); -+ g_object_unref (gfile); -+ if (!contents) { -+ if (error) { -+ g_debug ("Unable to open file %s", INITTAB); -+ g_error_free (error); -+ } -+ goto out; -+ } -+ -+ dstream = g_data_input_stream_new (G_INPUT_STREAM (contents)); -+ getty = g_regex_new ("^c[0-9]+:.+getty.+tty([0-9]+)", 0, 0, NULL); -+ g_object_unref (contents); -+ -+ while (1) { -+ temp = g_data_input_stream_read_line (dstream, NULL, NULL, &error); -+ if (!temp) -+ break; -+ if (!g_regex_match (getty, temp, 0, &tty_match)) -+ continue; -+ g_free (temp); -+ temp = g_match_info_fetch (tty_match, 1); -+ if (!temp) -+ continue; -+ tty_list = g_slist_insert_sorted (tty_list, temp, (GCompareFunc)g_strcmp0); -+ g_match_info_free (tty_match); -+ } -+ -+ if (error) { -+ g_debug ("Unable to read line from %s", INITTAB); -+ g_error_free (error); -+ goto free; -+ } -+ -+ /* Ignore holes in vt allocation, just take the last one */ -+ temp = g_slist_last (tty_list)->data; -+ if (temp) -+ vtno = (int) g_ascii_strtoull (temp, NULL, 10) + 1; -+ -+free: -+ g_object_unref (dstream); -+ g_regex_unref (getty); -+ g_slist_free_full (tty_list, g_free); -+ g_free (error); -+out: -+ return vtno; -+} -+ -+/** -+ * Query the VT_* kernel ioctls to find an empty tty -+ */ -+static int -+get_free_vt_from_kernel() -+{ -+ int fd, vtno = 0; -+ -+ fd = open ("/dev/tty0", O_WRONLY, 0); -+ if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { -+ vtno = 0; -+ g_debug ("Unable to find a free vt, falling back to Xorg autodetect"); -+ } -+ return vtno; -+} -+ -+static gchar* -+get_free_vt () -+{ -+ int inittab_vtno, kernel_vtno; -+ gchar* vt = NULL; -+ -+ inittab_vtno = get_free_vt_from_inittab(); -+ if (inittab_vtno > 0) -+ g_debug ("Inittab says vt%i is free\n", inittab_vtno); -+ kernel_vtno = get_free_vt_from_kernel(); -+ if (kernel_vtno > 0) -+ g_debug ("Kernel says vt%i is free\n", kernel_vtno); -+ /* Select the greater of the two because getty will use the others */ -+ if (kernel_vtno != 0 && inittab_vtno != 0) -+ vt = g_strdup_printf ("vt%i", kernel_vtno > inittab_vtno ? kernel_vtno : inittab_vtno); -+ return vt; -+} -+ -+/** - * gdm_server_start: - * @disp: Pointer to a GdmDisplay structure - * -@@ -686,7 +790,7 @@ gdm_server_start (GdmServer *server) - gboolean res; - - /* fork X server process */ -- res = gdm_server_spawn (server, NULL); -+ res = gdm_server_spawn (server, get_free_vt()); - - return res; - } --- -1.7.3.4 - diff --git a/gnome-base/gdm/files/gdm-3.3.92.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.3.92.1-disable-accessibility.patch deleted file mode 100644 index 1df7e583e675..000000000000 --- a/gnome-base/gdm/files/gdm-3.3.92.1-disable-accessibility.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur gdm-3.3.92.1//data/00-upstream-settings gdm-3.3.92.1.new//data/00-upstream-settings ---- gdm-3.3.92.1//data/00-upstream-settings 2012-02-08 04:50:32.000000000 +0530 -+++ gdm-3.3.92.1.new//data/00-upstream-settings 2012-03-25 14:24:01.387842352 +0530 -@@ -7,7 +7,7 @@ - # - - [org/gnome/desktop/a11y/keyboard] --enable=true -+enable=false - - [org/gnome/desktop/background] - show-desktop-icons=false -@@ -16,7 +16,7 @@ - exec='/bin/true' - - [org/gnome/desktop/interface] --toolkit-accessibility=true -+toolkit-accessibility=false - - [org/gnome/desktop/lockdown] - disable-application-handlers=true -@@ -35,7 +35,7 @@ - event-sounds=true - - [org/gnome/settings-daemon/plugins/a11y-keyboard] --active=true -+active=false - - [org/gnome/settings-daemon/plugins/a11y-settings] - active=false diff --git a/gnome-base/gdm/files/gdm-3.6.0-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-3.6.0-fix-daemonize-regression.patch deleted file mode 100644 index 27f207970a8f..000000000000 --- a/gnome-base/gdm/files/gdm-3.6.0-fix-daemonize-regression.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 722d31dc8823090b651b103f0194b6380f2d458e Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Tue, 25 Sep 2012 22:30:29 -0400 -Subject: [PATCH] daemonize so that the boot process can continue - -Gentoo bug: #236701 - -Based on original patch by Dan Nicholson <dbn.lists@gmail.com> and -Gilles Dartiguelongue <eva@gentoo.org>. - -Fork gdm-binary, except when -nodaemon is used - -Makes the gdm main binary fork and daemonize unless the -nodaemon or ---nodaemon options are used. Provides compatibility with xdm. Fixes -bug #550170. - -In daemonized mode, start a new process group, and kill it in our signal -handlers, so that killing gdm kills its spawned processes, and so that -"/etc/init.d/xdm stop" actually works. ---- - configure.ac | 4 ++++ - daemon/Makefile.am | 1 + - daemon/main.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 65 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 61a43d6..a851ba5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,6 +99,10 @@ PKG_CHECK_MODULES(DAEMON, - AC_SUBST(DAEMON_CFLAGS) - AC_SUBST(DAEMON_LIBS) - -+PKG_CHECK_MODULES(LIBDAEMON, libdaemon) -+AC_SUBST(LIBDAEMON_CFLAGS) -+AC_SUBST(LIBDAEMON_LIBS) -+ - GLIB_GSETTINGS - - PKG_CHECK_MODULES(NSS, -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index bb84765..cf89b47 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -380,6 +380,7 @@ gdm_binary_LDADD = \ - $(top_builddir)/common/libgdmcommon.la \ - $(XLIB_LIBS) \ - $(DAEMON_LIBS) \ -+ $(LIBDAEMON_LIBS) \ - $(XDMCP_LIBS) \ - $(LIBWRAP_LIBS) \ - $(SYSTEMD_LIBS) \ -diff --git a/daemon/main.c b/daemon/main.c -index 3b8572c..c2fe4fe 100644 ---- a/daemon/main.c -+++ b/daemon/main.c -@@ -34,6 +34,8 @@ - #include <locale.h> - #include <signal.h> - -+#include <libdaemon/dfork.h> -+ - #include <glib.h> - #include <glib/gi18n.h> - #include <glib/gstdio.h> -@@ -336,16 +338,26 @@ signal_cb (int signo, - gpointer data) - { - int ret; -+ static gboolean ignore_signals = FALSE; - - g_debug ("Got callback for signal %d", signo); - - ret = TRUE; - -+ /* don't commit suicide before killing everyone in our process group */ -+ if (ignore_signals) -+ return ret; -+ - switch (signo) { - case SIGFPE: - case SIGPIPE: - /* let the fatal signals interrupt us */ - g_debug ("Caught signal %d, shutting down abnormally.", signo); -+ /* if we daemonized, kill all the processes we spawned */ -+ ignore_signals = TRUE; -+ kill (-getpid (), signo); -+ ignore_signals = FALSE; -+ - ret = FALSE; - - break; -@@ -354,6 +366,11 @@ signal_cb (int signo, - case SIGTERM: - /* let the fatal signals interrupt us */ - g_debug ("Caught signal %d, shutting down normally.", signo); -+ /* if we daemonized, kill all the processes we spawned */ -+ ignore_signals = TRUE; -+ kill (-getpid (), signo); -+ ignore_signals = FALSE; -+ - ret = FALSE; - - break; -@@ -418,13 +435,16 @@ main (int argc, - GOptionContext *context; - GError *error; - int ret; -+ int i; - gboolean res; - GdmSignalHandler *signal_handler; - static gboolean do_timed_exit = FALSE; - static gboolean print_version = FALSE; - static gboolean fatal_warnings = FALSE; -+ static gboolean no_daemon = FALSE; - static GOptionEntry entries [] = { - { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL }, -+ { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL }, - { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL }, - { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL }, - -@@ -439,6 +459,14 @@ main (int argc, - - g_type_init (); - -+ /* preprocess the arguments to support the xdm style -+ * -nodaemon option -+ */ -+ for (i = 0; i < argc; i++) { -+ if (strcmp (argv[i], "-nodaemon") == 0) -+ argv[i] = "--nodaemon"; -+ } -+ - context = g_option_context_new (_("GNOME Display Manager")); - g_option_context_add_main_entries (context, entries, NULL); - g_option_context_set_ignore_unknown_options (context, TRUE); -@@ -465,6 +493,33 @@ main (int argc, - g_log_set_always_fatal (fatal_mask); - } - -+ if (!no_daemon) { -+ pid_t pid; -+ if (daemon_retval_init () < 0) { -+ g_warning ("Failed to create pipe"); -+ exit (-1); -+ } -+ if ((pid = daemon_fork ()) < 0) { -+ /* Fork failed */ -+ daemon_retval_done (); -+ exit (1); -+ } else if (pid) { -+ /* Parent process: wait 20s for daemon_retval_send() in the daemon process */ -+ if ((ret = daemon_retval_wait (20)) < 0) { -+ g_warning ("Timed out waiting for daemon process: %s", strerror(errno)); -+ exit (255); -+ } else if (ret > 0) { -+ g_warning ("Daemon process returned error code %d", ret); -+ exit (ret); -+ } -+ exit (0); -+ } -+ /* Daemon process */ -+ daemon_close_all (-1); -+ /* Start a new process group so that killing the daemon will kill the processes that it spawned */ -+ setsid (); -+ } -+ - gdm_log_init (); - - settings = gdm_settings_new (); -@@ -519,6 +574,9 @@ main (int argc, - g_timeout_add_seconds (30, (GSourceFunc) timed_exit_cb, main_loop); - } - -+ if (!no_daemon) -+ daemon_retval_send (0); -+ - g_main_loop_run (main_loop); - - g_debug ("GDM finished, cleaning up..."); -@@ -535,6 +593,8 @@ main (int argc, - ret = 0; - - out: -+ if (!no_daemon) -+ daemon_retval_send (ret); - - return ret; - } --- -1.7.12 - diff --git a/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch b/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch deleted file mode 100644 index 2863b752961a..000000000000 --- a/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 72fd8c8da02b47403992945a61d2514d6ee78cf4 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Fri, 28 Dec 2012 18:50:37 -0500 -Subject: [PATCH] daemon: remove spurious unicode characters from dbus - introspection file - -https://bugzilla.gnome.org/show_bug.cgi?id=690842 ---- - daemon/gdm-slave.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/daemon/gdm-slave.xml b/daemon/gdm-slave.xml -index 547c44e..d055252 100644 ---- a/daemon/gdm-slave.xml -+++ b/daemon/gdm-slave.xml -@@ -14,6 +14,6 @@ - <arg name="address" type="s" direction="out" /> - </method> - -- <property name="session_id" type="s" access="read"/>• -- </interface>• -+ <property name="session_id" type="s" access="read"/> -+ </interface> - </node> --- -1.8.0.2 - diff --git a/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch deleted file mode 100755 index bf684640a16d..000000000000 --- a/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 07fb1b31d818f308beb1c3800c4b90830b57d01b Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> -Date: Fri, 25 Jan 2013 10:03:31 +0330 -Subject: [PATCH] don't load accessbility - ---- - data/00-upstream-settings | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/00-upstream-settings b/data/00-upstream-settings -index 660a295..3993786 100644 ---- a/data/00-upstream-settings -+++ b/data/00-upstream-settings -@@ -7,7 +7,7 @@ - # - - [org/gnome/desktop/a11y/keyboard] --enable=true -+enable=false - - [org/gnome/desktop/background] - show-desktop-icons=false -@@ -16,7 +16,7 @@ show-desktop-icons=false - exec='/bin/true' - - [org/gnome/desktop/interface] --toolkit-accessibility=true -+toolkit-accessibility=false - - [org/gnome/desktop/lockdown] - disable-application-handlers=true --- -1.8.1 - diff --git a/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch deleted file mode 100755 index 810bd6e83646..000000000000 --- a/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch +++ /dev/null @@ -1,134 +0,0 @@ -From bda248c1e184f92aedf9f8d932ebd20746910d52 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> -Date: Mon, 4 Mar 2013 21:23:45 +0330 -Subject: [PATCH] gdm-3.7.90 fix daemonize regression - ---- - configure.ac | 4 ++++ - daemon/Makefile.am | 1 + - daemon/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 50 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 0918060..d4ea271 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,6 +99,10 @@ PKG_CHECK_MODULES(DAEMON, - AC_SUBST(DAEMON_CFLAGS) - AC_SUBST(DAEMON_LIBS) - -+PKG_CHECK_MODULES(LIBDAEMON, libdaemon) -+AC_SUBST(LIBDAEMON_CFLAGS) -+AC_SUBST(LIBDAEMON_LIBS) -+ - GLIB_GSETTINGS - - PKG_CHECK_MODULES(NSS, -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index ead9096..b810089 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -385,6 +385,7 @@ gdm_LDADD = \ - $(top_builddir)/common/libgdmcommon.la \ - $(XLIB_LIBS) \ - $(DAEMON_LIBS) \ -+ $(LIBDAEMON_LIBS) \ - $(XDMCP_LIBS) \ - $(LIBWRAP_LIBS) \ - $(SYSTEMD_LIBS) \ -diff --git a/daemon/main.c b/daemon/main.c -index 8176fe3..0151862 100644 ---- a/daemon/main.c -+++ b/daemon/main.c -@@ -34,6 +34,8 @@ - #include <locale.h> - #include <signal.h> - -+#include <libdaemon/dfork.h> -+ - #include <glib.h> - #include <glib/gi18n.h> - #include <glib/gstdio.h> -@@ -329,8 +331,10 @@ main (int argc, - static gboolean do_timed_exit = FALSE; - static gboolean print_version = FALSE; - static gboolean fatal_warnings = FALSE; -+ static gboolean no_daemon = FALSE; - static GOptionEntry entries [] = { - { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL }, -+ { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL }, - { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL }, - { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL }, - -@@ -343,6 +347,15 @@ main (int argc, - - ret = 1; - -+ /* preprocess the arguments to support the xdm style -+ * -nodaemon option -+ */ -+ int i; -+ for ( i = 0; i < argc; i++) { -+ if (strcmp (argv[i], "-nodaemon") == 0) -+ argv[i] = "--nodaemon"; -+ } -+ - context = g_option_context_new (_("GNOME Display Manager")); - g_option_context_add_main_entries (context, entries, NULL); - g_option_context_set_ignore_unknown_options (context, TRUE); -@@ -369,6 +382,33 @@ main (int argc, - g_log_set_always_fatal (fatal_mask); - } - -+ if (!no_daemon) { -+ pid_t pid; -+ if (daemon_retval_init () < 0) { -+ g_warning ("Failed to create pipe"); -+ exit (-1); -+ } -+ if ((pid = daemon_fork ()) < 0) { -+ /* Fork failed */ -+ daemon_retval_done (); -+ exit (1); -+ } else if (pid) { -+ /* Parent process: wait 20s for daemon_retval_send() in the daemon process */ -+ if ((ret = daemon_retval_wait (20)) < 0) { -+ g_warning ("Timed out waiting for daemon process: %s", strerror(errno)); -+ exit (255); -+ } else if (ret > 0) { -+ g_warning ("Daemon process returned error code %d", ret); -+ exit (ret); -+ } -+ exit (0); -+ } -+ /* Daemon process */ -+ daemon_close_all (-1); -+ /* Start a new process group so that killing the daemon will kill the processes that it spawned */ -+ setsid (); -+ } -+ - gdm_log_init (); - - settings = gdm_settings_new (); -@@ -418,6 +458,9 @@ main (int argc, - g_timeout_add_seconds (30, (GSourceFunc) timed_exit_cb, main_loop); - } - -+ if (!no_daemon) -+ daemon_retval_send (0); -+ - g_main_loop_run (main_loop); - - g_debug ("GDM finished, cleaning up..."); -@@ -433,6 +476,8 @@ main (int argc, - ret = 0; - - out: -+ if (!no_daemon) -+ daemon_retval_send (ret); - if (error) { - g_printerr ("%s\n", error->message); - g_clear_error (&error); --- -1.8.1.2 - |