Clean up old revisions.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key C6085806)

17 files changed, 0 insertions, 1073 deletions

diff --git a/gnome-base/gdm/files/3.4.1/gdm b/gnome-base/gdm/files/3.4.1/gdm
deleted file mode 100644
index bdce065aa2db..000000000000
--- a/gnome-base/gdm/files/3.4.1/gdm
+++ /dev/null
@@ -1,12 +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
-#Systemd=-session   optional		pam_systemd.so
-#Keyring=session    optional		pam_gnome_keyring.so auto_start
diff --git a/gnome-base/gdm/files/3.4.1/gdm-autologin b/gnome-base/gdm/files/3.4.1/gdm-autologin
deleted file mode 100644
index 26e3193baa08..000000000000
--- a/gnome-base/gdm/files/3.4.1/gdm-autologin
+++ /dev/null
@@ -1,11 +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
-#Systemd=-session   optional		pam_systemd.so
-# 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.4.1/gdm-fingerprint b/gnome-base/gdm/files/3.4.1/gdm-fingerprint
deleted file mode 100644
index 635fdd977a09..000000000000
--- a/gnome-base/gdm/files/3.4.1/gdm-fingerprint
+++ /dev/null
@@ -1,15 +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
-#Systemd=-session   optional		pam_systemd.so
diff --git a/gnome-base/gdm/files/3.4.1/gdm-password b/gnome-base/gdm/files/3.4.1/gdm-password
deleted file mode 100644
index bdce065aa2db..000000000000
--- a/gnome-base/gdm/files/3.4.1/gdm-password
+++ /dev/null
@@ -1,12 +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
-#Systemd=-session   optional		pam_systemd.so
-#Keyring=session    optional		pam_gnome_keyring.so auto_start
diff --git a/gnome-base/gdm/files/3.4.1/gdm-smartcard b/gnome-base/gdm/files/3.4.1/gdm-smartcard
deleted file mode 100644
index 64e960e07320..000000000000
--- a/gnome-base/gdm/files/3.4.1/gdm-smartcard
+++ /dev/null
@@ -1,16 +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
-#Systemd=-session   optional		pam_systemd.so
diff --git a/gnome-base/gdm/files/3.4.1/gdm-welcome b/gnome-base/gdm/files/3.4.1/gdm-welcome
deleted file mode 100644
index a409a63e428c..000000000000
--- a/gnome-base/gdm/files/3.4.1/gdm-welcome
+++ /dev/null
@@ -1,11 +0,0 @@
-#%PAM-1.0
-auth       required    pam_env.so
-# Allows greeter to list ldap users; bug #430740
-#LDAP=-auth      sufficient  pam_ldap.so try_first_pass ignore_authinfo_unavail
-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.4.1/gdm.service b/gnome-base/gdm/files/3.4.1/gdm.service
deleted file mode 100644
index 63bb08e90219..000000000000
--- a/gnome-base/gdm/files/3.4.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-automagic-libxklavier-support.patch b/gnome-base/gdm/files/gdm-2.32.0-automagic-libxklavier-support.patch
deleted file mode 100644
index 90c1cef3ffac..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-automagic-libxklavier-support.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 481fe43b653b443ecfa8d4f3aa88d734d17cccd5 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:21:27 +0100
-Subject: [PATCH 6/6] fix libxklavier automagic support
-
-libxklavier support is optional, make that fact explicit.
----
- configure.ac |   28 +++++++++++++++++++---------
- 1 files changed, 19 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 71d0247..10dbb72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,17 +129,26 @@ SIMPLE_GREETER_LIBS="$SIMPLE_GREETER_LIBS -lm"
- AC_SUBST(SIMPLE_GREETER_CFLAGS)
- AC_SUBST(SIMPLE_GREETER_LIBS)
- 
--PKG_CHECK_MODULES(LIBXKLAVIER,
--        libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
--        have_libxklavier=yes,
--        have_libxklavier=no)
--if test "x$have_libxklavier" = "xyes" ; then
--  AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
-+AC_ARG_ENABLE([libxklavier],
-+	AS_HELP_STRING([--enable-libxklavier],
-+		       [Enable libxklavier support @<:@default=yes@:>@]),
-+	enable_libxklavier=$enableval,
-+	enable_libxklavier=yes)
-+have_libxklavier=no
-+if test "x$enable_libxklavier" = "xyes"; then
-+   PKG_CHECK_MODULES(LIBXKLAVIER,
-+	  libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
-+          have_libxklavier=yes,
-+          have_libxklavier=no)
-+   if test "x$have_libxklavier" = "xyes" ; then
-+      AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
-+   fi
-+   AC_SUBST(HAVE_LIBXKLAVIER)
-+   AC_SUBST(LIBXKLAVIER_CFLAGS)
-+   AC_SUBST(LIBXKLAVIER_LIBS)
- fi
-+
- AM_CONDITIONAL(HAVE_LIBXKLAVIER, test x$have_libxklavier = xyes)
--AC_SUBST(HAVE_LIBXKLAVIER)
--AC_SUBST(LIBXKLAVIER_CFLAGS)
--AC_SUBST(LIBXKLAVIER_LIBS)
- 
- PKG_CHECK_MODULES(SIMPLE_CHOOSER,
-         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-@@ -1467,5 +1476,6 @@ echo \
-         SELinux support:          ${with_selinux}
-         ConsoleKit support:       ${use_console_kit}
-         UPower support:           ${have_upower}
-+        Libxklavier support:      ${have_libxklavier}
-         Build with RBAC:          ${msg_rbac_shutdown}
- "
--- 
-1.7.3.1
-
diff --git a/gnome-base/gdm/files/gdm-2.32.0-custom-session.patch b/gnome-base/gdm/files/gdm-2.32.0-custom-session.patch
deleted file mode 100644
index c48cb0743a2e..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-custom-session.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2dc0d268c7cc5d6133a9594adcd67dc543288b8f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:19:07 +0100
-Subject: [PATCH 4/6] make custom session work
-
-Gentoo bug: #216984
-
-fix custom sessions not doing sourcing in the proper order.
----
- data/Xsession.in |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/data/Xsession.in b/data/Xsession.in
-index b2d98f2..0da187d 100755
---- a/data/Xsession.in
-+++ b/data/Xsession.in
-@@ -153,15 +153,6 @@ if [ -n "$GDM_LANG" ]; then
-   export LANG
- fi
- 
--# run all system xinitrc shell scripts.
--if [ -d /etc/X11/xinit/xinitrc.d ]; then
--    for i in /etc/X11/xinit/xinitrc.d/* ; do
--        if [ -x "$i" -a ! -d "$i" ]; then
--	    . "$i"
--        fi
--    done
--fi
--
- if [ "x$command" = "xcustom" ] ; then
-   if [ -x "$HOME/.xsession" ]; then
-     command="$HOME/.xsession"
-@@ -189,6 +180,15 @@ if [ "x$command" = "xdefault" ] ; then
-   fi
- fi
- 
-+# run all system xinitrc shell scripts.
-+if [ -d /etc/X11/xinit/xinitrc.d ]; then
-+    for i in /etc/X11/xinit/xinitrc.d/* ; do
-+        if [ -x "$i" ]; then
-+	    . "$i"
-+        fi
-+    done
-+fi
-+
- # add ssh-agent if found
- sshagent="`gdmwhich ssh-agent`"
- if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
--- 
-1.7.3.1
-
diff --git a/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch
deleted file mode 100644
index 2ae7f610bd45..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 7f5104b242e6b36e6143183b14582d362763ff2a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:16:51 +0100
-Subject: [PATCH 2/6] daemonize so that the boot process can continue
-
-Gentoo bug: #236701
-
-Originally from: Dan Nicholson <dbn.lists@gmail.com>
-
-Fork gdm-binary, except when -nodaemon is used
- 
-gdm-binary now forks and the parent terminates, except when the
--nodaemon or --nodaemon options are used. This provides compatibility
-with xdm. Fixes bug #550170.
-
----
- daemon/main.c |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 64 insertions(+), 0 deletions(-)
-
-diff --git a/daemon/main.c b/daemon/main.c
-index 5b8d66b..191b6e3 100644
---- a/daemon/main.c
-+++ b/daemon/main.c
-@@ -513,6 +513,56 @@ is_debug_set (void)
-         return debug;
- }
- 
-+static void
-+dup_dev_null (int fd, int flags)
-+{
-+        int nullfd;
-+        int dupfd;
-+
-+        VE_IGNORE_EINTR (nullfd = open ("/dev/null", flags));
-+        if (G_UNLIKELY (nullfd < 0)) {
-+                gdm_fail (_("Cannot open /dev/null: %s!"),
-+                          strerror (errno));
-+                exit (EXIT_FAILURE);
-+        }
-+
-+        VE_IGNORE_EINTR (dupfd = dup2 (nullfd, fd));
-+        if (G_UNLIKELY (dupfd < 0)) {
-+                gdm_fail (_("Cannot duplicate /dev/null: %s!"),
-+                          strerror (errno));
-+                exit (EXIT_FAILURE);
-+        }
-+
-+        VE_IGNORE_EINTR (close (nullfd));
-+}
-+
-+static void
-+daemonify (void)
-+{
-+        pid_t pid;
-+
-+        pid = fork ();
-+
-+        /* terminate the parent */
-+        if (pid > 0)
-+                exit (EXIT_SUCCESS);
-+
-+        if (G_UNLIKELY (pid < 0)) {
-+                gdm_fail (_("fork () failed: %s!"), strerror (errno));
-+                exit (EXIT_FAILURE);
-+        }
-+
-+        if (G_UNLIKELY (setsid () < 0)) {
-+                gdm_fail (_("setsid () failed: %s!"), strerror (errno));
-+                exit (EXIT_FAILURE);
-+        }
-+
-+        /* reopen stdin, stdout, stderr with /dev/null */
-+        dup_dev_null (STDIN_FILENO, O_RDONLY);
-+        dup_dev_null (STDOUT_FILENO, O_RDWR);
-+        dup_dev_null (STDERR_FILENO, O_RDWR);
-+}
-+
- int
- main (int    argc,
-       char **argv)
-@@ -523,14 +573,17 @@ main (int    argc,
-         DBusGConnection    *connection;
-         GError             *error;
-         int                 ret;
-+        int                 i;
-         gboolean            res;
-         gboolean            xdmcp_enabled;
-         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 },
- 
-@@ -547,6 +600,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);
-@@ -617,6 +678,9 @@ main (int    argc,
-                 exit (-1);
-         }
- 
-+        if (no_daemon == FALSE)
-+                daemonify ();
-+
-         /* pid file */
-         delete_pid ();
-         write_pid ();
--- 
-1.7.3.1
-
diff --git a/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch
deleted file mode 100644
index e563aa42513f..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 41badd6d2ca652a875fec3eea420ae876023076d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:15:54 +0100
-Subject: [PATCH 1/6] remove unneeded linker directive for selinux
-
-Gentoo bug: #41022
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ed07dce..71d0247 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -873,7 +873,7 @@ if test "x$with_selinux" = "xyes" ; then
- 	AC_CHECK_LIB(selinux,setexeccon,/bin/true)
- 	AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
- 	AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux])
--	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
-+	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
- fi
- 
- dnl ---------------------------------------------------------------------------
--- 
-1.7.3.1
-
diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch
deleted file mode 100644
index ab8325f406d6..000000000000
--- a/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 91bd106c72362e51fbfa6966bc71dd0bb12d479d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 14 Sep 2011 22:09:56 -0400
-Subject: [PATCH] Disable a11y in gconf and gsettings defaults
-
----
- data/00-upstream-settings  |    6 +++---
- data/session-setup.entries |    4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/00-upstream-settings b/data/00-upstream-settings
-index 1511b7b..87410cb 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
-@@ -35,7 +35,7 @@ session-name='gdm-shell'
- 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/data/session-setup.entries b/data/session-setup.entries
-index b84e16f..a47d761 100644
---- a/data/session-setup.entries
-+++ b/data/session-setup.entries
-@@ -406,14 +406,14 @@
-     <entry>
-       <key>/desktop/gnome/interface/accessibility</key>
-       <value>
--        <bool>true</bool>
-+        <bool>false</bool>
-       </value>
-     </entry>
- 
-     <entry>
-       <key>/desktop/gnome/accessibility/keyboard/enable</key>
-       <value>
--        <bool>true</bool>
-+        <bool>false</bool>
-       </value>
-     </entry>
- 
--- 
-1.7.7
-
diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-pam-fix-1.patch b/gnome-base/gdm/files/gdm-3.2.1.1-pam-fix-1.patch
deleted file mode 100644
index 0fe399ee0376..000000000000
--- a/gnome-base/gdm/files/gdm-3.2.1.1-pam-fix-1.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 9c354795892b8c5fd661a35653991a88fabc76bf Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 24 Oct 2011 16:39:45 -0400
-Subject: [PATCH] daemon: Don't emit session-exited when non-authenticated
- worker fails
-
-Sometimes PAM modules are finicky and don't die when you tell them to.
-Instead they fail some seconds later.
-
-If a user successfully logs in with one stack and another stack is
-being troublesome, then we'll get notified about it finishing up
-after the user is already logged in.
-
-When that happens, we erroneously assume the stack finishing is the
-stack the user's session is running on and then proceed to log the
-user out.
-
-This commit makes us be a little more careful about our bookkeeping
-so we can ignore failures from slow PAM modules.
----
- daemon/gdm-session-direct.c |   23 ++++++++++++++---------
- 1 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index e178985..bb2bff8 100644
---- a/daemon/gdm-session-direct.c
-+++ b/daemon/gdm-session-direct.c
-@@ -91,10 +91,11 @@ struct _GdmSessionDirectPrivate
- 
-         GHashTable          *conversations;
- 
-+        GdmSessionConversation *session_conversation;
-+
-         GList               *pending_connections;
- 
-         GPid                 session_pid;
--        guint32              is_running : 1;
- 
-         /* object lifetime scope */
-         char                *id;
-@@ -1073,7 +1074,7 @@ gdm_session_direct_handle_session_started (GdmSessionDirect *session,
-                  pid);
- 
-         session->priv->session_pid = pid;
--        session->priv->is_running = TRUE;
-+        session->priv->session_conversation = conversation;
- 
-         _gdm_session_session_started (GDM_SESSION (session), conversation->service_name, pid);
- 
-@@ -1129,7 +1130,7 @@ gdm_session_direct_handle_session_exited (GdmSessionDirect *session,
-         g_debug ("GdmSessionDirect: Emitting 'session-exited' signal with exit code '%d'",
-                  code);
- 
--        session->priv->is_running = FALSE;
-+        session->priv->session_conversation = NULL;
-         _gdm_session_session_exited (GDM_SESSION (session), code);
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -1158,7 +1159,7 @@ gdm_session_direct_handle_session_died (GdmSessionDirect *session,
-         g_debug ("GdmSessionDirect: Emitting 'session-died' signal with signal number '%d'",
-                  code);
- 
--        session->priv->is_running = FALSE;
-+        session->priv->session_conversation = NULL;
-         _gdm_session_session_died (GDM_SESSION (session), code);
- 
-         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -1790,7 +1791,7 @@ worker_exited (GdmSessionWorkerJob *job,
-         g_debug ("GdmSessionDirect: Worker job exited: %d", code);
- 
-         g_object_ref (conversation->job);
--        if (conversation->session->priv->is_running) {
-+        if (conversation->session->priv->session_conversation == conversation) {
-                 _gdm_session_session_exited (GDM_SESSION (conversation->session), code);
-         }
- 
-@@ -1819,7 +1820,7 @@ worker_died (GdmSessionWorkerJob *job,
-         g_debug ("GdmSessionDirect: Worker job died: %d", signum);
- 
-         g_object_ref (conversation->job);
--        if (conversation->session->priv->is_running) {
-+        if (conversation->session->priv->session_conversation == conversation) {
-                 _gdm_session_session_died (GDM_SESSION (conversation->session), signum);
-         }
- 
-@@ -2442,6 +2443,10 @@ stop_all_other_conversations (GdmSessionDirect        *session,
-                                              g_strdup (conversation_to_keep->service_name),
-                                              conversation_to_keep);
-                 }
-+
-+                if (session->priv->session_conversation != conversation_to_keep) {
-+                        session->priv->session_conversation = NULL;
-+                }
-         }
- 
- }
-@@ -2456,7 +2461,7 @@ gdm_session_direct_start_session (GdmSession *session,
-         char             *program;
- 
-         g_return_if_fail (session != NULL);
--        g_return_if_fail (impl->priv->is_running == FALSE);
-+        g_return_if_fail (impl->priv->session_conversation == NULL);
- 
-         conversation = find_conversation_by_name (impl, service_name);
- 
-@@ -2504,7 +2509,7 @@ gdm_session_direct_close (GdmSession *session)
- 
-         g_debug ("GdmSessionDirect: Closing session");
- 
--        if (impl->priv->is_running) {
-+        if (impl->priv->session_conversation != NULL) {
-                 gdm_session_record_logout (impl->priv->session_pid,
-                                            impl->priv->selected_user,
-                                            impl->priv->display_hostname,
-@@ -2540,7 +2545,7 @@ gdm_session_direct_close (GdmSession *session)
-         g_hash_table_remove_all (impl->priv->environment);
- 
-         impl->priv->session_pid = -1;
--        impl->priv->is_running = FALSE;
-+        impl->priv->session_conversation = NULL;
- }
- 
- static void
--- 
-1.7.8.1
-
diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-pam-fix-2.patch b/gnome-base/gdm/files/gdm-3.2.1.1-pam-fix-2.patch
deleted file mode 100644
index 20e85399c9e9..000000000000
--- a/gnome-base/gdm/files/gdm-3.2.1.1-pam-fix-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9c874ee6f595906faf59f891f20492530888804b Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 24 Oct 2011 16:45:46 -0400
-Subject: [PATCH] worker: don't block SIGTERM
-
-If the slave tells us to go away, we should go away,
-not wait a PAM module decides to let us get back to the
-main loop.
----
- daemon/session-worker-main.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c
-index 9d40b8d..42fcd52 100644
---- a/daemon/session-worker-main.c
-+++ b/daemon/session-worker-main.c
-@@ -188,7 +188,6 @@ main (int    argc,
-         gdm_signal_handler_set_fatal_func (signal_handler,
-                                            (GDestroyNotify)g_main_loop_quit,
-                                            main_loop);
--        gdm_signal_handler_add (signal_handler, SIGTERM, signal_cb, NULL);
-         gdm_signal_handler_add (signal_handler, SIGINT, signal_cb, NULL);
-         gdm_signal_handler_add (signal_handler, SIGILL, signal_cb, NULL);
-         gdm_signal_handler_add (signal_handler, SIGBUS, signal_cb, NULL);
--- 
-1.7.8.1
-
diff --git a/gnome-base/gdm/files/gdm-3.4.1-dconf-0.13.patch b/gnome-base/gdm/files/gdm-3.4.1-dconf-0.13.patch
deleted file mode 100644
index 3915514ef862..000000000000
--- a/gnome-base/gdm/files/gdm-3.4.1-dconf-0.13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c0ad2d5b85b063bd7cb5dd2153f0755f4ebe3efb Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 19 Jul 2012 08:23:29 -0400
-Subject: [PATCH] Update the syntax of the dconf profile file
-
-We were using a deprecated syntax which stopped working in
-dconf 0.13.4 - without warning :-(. See
-http://live.gnome.org/dconf/SystemAdministrators
----
- data/dconf-profile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/dconf-profile b/data/dconf-profile
-index d5a90e5..68deb5a 100644
---- a/data/dconf-profile
-+++ b/data/dconf-profile
-@@ -1,2 +1,2 @@
--user
--gdm
-+user-db:user
-+systemd-db:gdm
--- 
-1.7.12
-
diff --git a/gnome-base/gdm/files/gdm-3.4.1-plymouth.patch b/gnome-base/gdm/files/gdm-3.4.1-plymouth.patch
deleted file mode 100644
index edd6220c8b5b..000000000000
--- a/gnome-base/gdm/files/gdm-3.4.1-plymouth.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-From c56fbb65277e8a17db5e0939f0b02e41c4ec784c Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Fri, 27 Nov 2009 18:52:54 -0500
-Subject: [PATCH] daemon: enable smooth transition between plymouth and X
-
-This commit adds optional support for interacting with plymouth
-from gdm. This feature can be enabled by passing --with-plymouth
-to configure.
-
-Hopefully, this will enable the various distributions that use
-plymouth to drop a patch.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=572173
----
- configure.ac              |   32 +++++++++++++
- daemon/gdm-server.c       |   60 +++++++++++++++++++++++++
- daemon/gdm-server.h       |    3 +
- daemon/gdm-simple-slave.c |  106 ++++++++++++++++++++++++++++++++++++++++++++-
- 4 files changed, 200 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 35e6e04..81ea23e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -264,6 +264,10 @@ AC_ARG_WITH(systemd,
-             AS_HELP_STRING([--with-systemd],
-                            [Add systemd support @<:@default=auto@:>@]),
-             [with_systemd=$withval], [with_systemd=auto])
-+AC_ARG_WITH(plymouth,
-+            AS_HELP_STRING([--with-plymouth],
-+                           [Add plymouth support @<:@default=auto@:>@]),
-+            [with_plymouth=$withval], [with_plymouth=auto])
- 
- AC_ARG_WITH(at-spi-registryd-directory,
-             AS_HELP_STRING([--with-at-spi-registryd-directory],
-@@ -952,6 +956,33 @@ AC_SUBST(SYSTEMD_X_SERVER)
- AC_DEFINE_UNQUOTED(SYSTEMD_X_SERVER,"$SYSTEMD_X_SERVER",[Path to systemd X server wrapper])
- 
- dnl ---------------------------------------------------------------------------
-+dnl - Check for plymouth support
-+dnl ---------------------------------------------------------------------------
-+PKG_CHECK_MODULES(PLYMOUTH,
-+                  [ply-boot-client],
-+                  [have_plymouth=yes], [have_plymouth=no])
-+
-+if test "x$with_plymouth" = "xauto" ; then
-+        if test x$have_plymouth = xno ; then
-+                use_plymouth=no
-+        else
-+                use_plymouth=yes
-+        fi
-+else
-+        use_plymouth="$with_plymouth"
-+fi
-+
-+if test "x$use_plymouth" != "xno" ; then
-+        if test "x$have_plymouth" = "xno"; then
-+                AC_MSG_ERROR([Plymouth support explicitly required, but plymouth not found])
-+        fi
-+
-+        AC_DEFINE(WITH_PLYMOUTH, 1, [Define to enable plymouth support])
-+fi
-+AC_SUBST(PLYMOUTH_CFLAGS)
-+AC_SUBST(PLYMOUTH_LIBS)
-+
-+dnl ---------------------------------------------------------------------------
- dnl - Check for D-Bus
- dnl ---------------------------------------------------------------------------
- 
-@@ -1537,6 +1568,7 @@ echo \
-         SELinux support:          ${with_selinux}
-         ConsoleKit support:       ${use_console_kit}
-         systemd support:          ${use_systemd}
-+        plymouth support:         ${use_plymouth}
-         UPower support:           ${have_upower}
-         Build with RBAC:          ${msg_rbac_shutdown}
- "
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index d0d8ff9..6f2a939 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -32,6 +32,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <signal.h>
-+#include <sys/ioctl.h>
- #include <sys/resource.h>
- 
- #ifdef HAVE_SYS_PRCTL_H
-@@ -42,6 +43,10 @@
- #include <systemd/sd-daemon.h>
- #endif
- 
-+#ifdef WITH_PLYMOUTH
-+#include <linux/vt.h>
-+#endif
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gstdio.h>
-@@ -751,6 +756,61 @@ gdm_server_spawn (GdmServer  *server,
-         return ret;
- }
- 
-+#ifdef WITH_PLYMOUTH
-+static int
-+get_active_vt (void)
-+{
-+        int console_fd;
-+        struct vt_stat console_state = { 0 };
-+
-+        console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
-+
-+        if (console_fd < 0) {
-+                goto out;
-+        }
-+
-+        if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
-+                goto out;
-+        }
-+
-+out:
-+        if (console_fd >= 0) {
-+                close (console_fd);
-+        }
-+
-+        return console_state.v_active;
-+}
-+
-+static char *
-+get_active_vt_as_string (void)
-+{
-+        int vt;
-+
-+        vt = get_active_vt ();
-+
-+        if (vt <= 0) {
-+                return NULL;
-+        }
-+
-+        return g_strdup_printf ("vt%d", vt);
-+}
-+
-+gboolean
-+gdm_server_start_on_active_vt (GdmServer *server)
-+{
-+        gboolean res;
-+        char *vt;
-+
-+        g_free (server->priv->command);
-+        server->priv->command = g_strdup (X_SERVER " -background none -logverbose 7");
-+        vt = get_active_vt_as_string ();
-+        res = gdm_server_spawn (server, vt);
-+        g_free (vt);
-+
-+        return res;
-+}
-+#endif
-+
- /**
-  * gdm_server_start:
-  * @disp: Pointer to a GdmDisplay structure
-diff --git a/daemon/gdm-server.h b/daemon/gdm-server.h
-index b53d68e..827f7fa 100644
---- a/daemon/gdm-server.h
-+++ b/daemon/gdm-server.h
-@@ -57,6 +57,9 @@ GdmServer *         gdm_server_new       (const char *display_id,
-                                           const char *seat_id,
-                                           const char *auth_file);
- gboolean            gdm_server_start     (GdmServer   *server);
-+#ifdef HAVE_PLYMOUTH
-+gboolean            gdm_server_start_on_active_vt (GdmServer   *server);
-+#endif
- gboolean            gdm_server_stop      (GdmServer   *server);
- char *              gdm_server_get_display_device (GdmServer *server);
- 
-diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index fc8649c..7c709a6 100644
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -93,6 +93,9 @@ struct GdmSimpleSlavePrivate
- #ifdef  HAVE_LOGINDEVPERM
-         gboolean           use_logindevperm;
- #endif
-+#ifdef  WITH_PLYMOUTH
-+        guint              plymouth_is_running : 1;
-+#endif
- };
- 
- enum {
-@@ -1204,6 +1207,74 @@ on_start_session_later (GdmGreeterServer *session,
-         slave->priv->start_session_when_ready = FALSE;
- }
- 
-+#ifdef  WITH_PLYMOUTH
-+static gboolean
-+plymouth_is_running (void)
-+{
-+        int      status;
-+        gboolean res;
-+        GError  *error;
-+
-+        error = NULL;
-+        res = g_spawn_command_line_sync ("/bin/plymouth --ping",
-+                                         NULL, NULL, &status, &error);
-+        if (! res) {
-+                g_debug ("Could not ping plymouth: %s", error->message);
-+                g_error_free (error);
-+                return FALSE;
-+        }
-+
-+        return WIFEXITED (status) && WEXITSTATUS (status) == 0;
-+}
-+
-+static void
-+plymouth_prepare_for_transition (GdmSimpleSlave *slave)
-+{
-+        gboolean res;
-+        GError  *error;
-+
-+        error = NULL;
-+        res = g_spawn_command_line_sync ("/bin/plymouth deactivate",
-+                                         NULL, NULL, NULL, &error);
-+        if (! res) {
-+                g_warning ("Could not deactivate plymouth: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
-+static void
-+plymouth_quit_with_transition (GdmSimpleSlave *slave)
-+{
-+        gboolean res;
-+        GError  *error;
-+
-+        error = NULL;
-+        res = g_spawn_command_line_sync ("/bin/plymouth quit --retain-splash",
-+                                         NULL, NULL, NULL, &error);
-+        if (! res) {
-+                g_warning ("Could not quit plymouth: %s", error->message);
-+                g_error_free (error);
-+        }
-+        slave->priv->plymouth_is_running = FALSE;
-+}
-+
-+static void
-+plymouth_quit_without_transition (GdmSimpleSlave *slave)
-+{
-+        gboolean res;
-+        GError  *error;
-+
-+        error = NULL;
-+        res = g_spawn_command_line_sync ("/bin/plymouth quit",
-+                                         NULL, NULL, NULL, &error);
-+        if (! res) {
-+                g_warning ("Could not quit plymouth: %s", error->message);
-+                g_error_free (error);
-+        }
-+        slave->priv->plymouth_is_running = FALSE;
-+}
-+#endif
-+
- static void
- setup_server (GdmSimpleSlave *slave)
- {
-@@ -1223,6 +1294,12 @@ setup_server (GdmSimpleSlave *slave)
-          */
-         gdm_slave_save_root_windows (GDM_SLAVE (slave));
- 
-+#ifdef WITH_PLYMOUTH
-+        /* Plymouth is waiting for the go-ahead to exit */
-+        if (slave->priv->plymouth_is_running) {
-+                plymouth_quit_with_transition (slave);
-+        }
-+#endif
- }
- 
- static void
-@@ -1426,6 +1503,12 @@ on_server_exited (GdmServer      *server,
-         g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code);
- 
-         gdm_slave_stopped (GDM_SLAVE (slave));
-+
-+#ifdef WITH_PLYMOUTH
-+        if (slave->priv->plymouth_is_running) {
-+                plymouth_quit_without_transition (slave);
-+        }
-+#endif
- }
- 
- static void
-@@ -1438,6 +1521,12 @@ on_server_died (GdmServer      *server,
-                  g_strsignal (signal_number));
- 
-         gdm_slave_stopped (GDM_SLAVE (slave));
-+
-+#ifdef WITH_PLYMOUTH
-+        if (slave->priv->plymouth_is_running) {
-+                plymouth_quit_without_transition (slave);
-+        }
-+#endif
- }
- 
- static gboolean
-@@ -1484,7 +1573,17 @@ gdm_simple_slave_run (GdmSimpleSlave *slave)
-                                   G_CALLBACK (on_server_ready),
-                                   slave);
- 
--                res = gdm_server_start (slave->priv->server);
-+#ifdef WITH_PLYMOUTH
-+                slave->priv->plymouth_is_running = plymouth_is_running ();
-+
-+                if (slave->priv->plymouth_is_running) {
-+                        plymouth_prepare_for_transition (slave);
-+                        res = gdm_server_start_on_active_vt (slave->priv->server);
-+                } else
-+#endif
-+                {
-+                        res = gdm_server_start (slave->priv->server);
-+                }
-                 if (! res) {
-                         g_warning (_("Could not start the X "
-                                      "server (your graphical environment) "
-@@ -1494,6 +1593,11 @@ gdm_simple_slave_run (GdmSimpleSlave *slave)
-                                      "In the meantime this display will be "
-                                      "disabled.  Please restart GDM when "
-                                      "the problem is corrected."));
-+#ifdef WITH_PLYMOUTH
-+                        if (slave->priv->plymouth_is_running) {
-+                                plymouth_quit_without_transition (slave);
-+                        }
-+#endif
-                         exit (1);
-                 }
- 
--- 
-1.7.8.6
-
diff --git a/gnome-base/gdm/files/gdm-3.4.1-save-root-window.patch b/gnome-base/gdm/files/gdm-3.4.1-save-root-window.patch
deleted file mode 100644
index 2d9c3148be11..000000000000
--- a/gnome-base/gdm/files/gdm-3.4.1-save-root-window.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From c93d98b646a9a4fce3052260a1f08808d62d7155 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Fri, 27 Nov 2009 18:27:53 -0500
-Subject: [PATCH] daemon: save root window to pixmap at _XROOTPMAP_ID
-
-This combined with starting the X server with
--background none will give distros using plymouth
-(or potentially other boot splashes) a a nice fade
-transition when g-s-d starts.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=572173
----
- daemon/gdm-simple-slave.c |    8 +++++
- daemon/gdm-slave.c        |   72 +++++++++++++++++++++++++++++++++++++++++++++
- daemon/gdm-slave.h        |    1 +
- 3 files changed, 81 insertions(+), 0 deletions(-)
-
-diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 9d1347a..fc8649c 100644
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -1215,6 +1215,14 @@ setup_server (GdmSimpleSlave *slave)
- 
-         /* Set the initial keyboard layout to something reasonable */
-         gdm_slave_set_initial_keyboard_layout (GDM_SLAVE (slave));
-+        /* The root window has a background that may be useful
-+         * to cross fade or transition from when setting the
-+         * login screen background.  We read it here, and stuff
-+         * it into the standard _XROOTPMAP_ID root window property,
-+         * so gnome-settings-daemon can get at it.
-+         */
-+        gdm_slave_save_root_windows (GDM_SLAVE (slave));
-+
- }
- 
- static void
-diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
-index a5ce62f..53633c0 100644
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
-@@ -43,6 +43,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- 
- #include <X11/Xlib.h> /* for Display */
-+#include <X11/Xatom.h> /* for XA_PIXMAP */
- #include <X11/cursorfont.h> /* for watch cursor */
- #include <X11/extensions/Xrandr.h>
- #include <X11/Xatom.h>
-@@ -364,6 +365,77 @@ gdm_slave_run_script (GdmSlave   *slave,
-         return ret;
- }
- 
-+static void
-+gdm_slave_save_root_window_of_screen (GdmSlave *slave,
-+                                      Atom      id_atom,
-+                                      int       screen_number)
-+{
-+        Window root_window;
-+        GC gc;
-+        XGCValues values;
-+        Pixmap pixmap;
-+        int width, height, depth;
-+
-+        root_window = RootWindow (slave->priv->server_display,
-+                                  screen_number);
-+
-+        width = DisplayWidth (slave->priv->server_display, screen_number);
-+        height = DisplayHeight (slave->priv->server_display, screen_number);
-+        depth = DefaultDepth (slave->priv->server_display, screen_number);
-+        pixmap = XCreatePixmap (slave->priv->server_display,
-+                                root_window,
-+                                width, height, depth);
-+
-+        values.function = GXcopy;
-+        values.plane_mask = AllPlanes;
-+        values.fill_style = FillSolid;
-+        values.subwindow_mode = IncludeInferiors;
-+
-+        gc = XCreateGC (slave->priv->server_display,
-+                        root_window,
-+                        GCFunction | GCPlaneMask | GCFillStyle | GCSubwindowMode,
-+                        &values);
-+
-+        if (XCopyArea (slave->priv->server_display,
-+                       root_window, pixmap, gc, 0, 0,
-+                       width, height, 0, 0)) {
-+
-+                long pixmap_as_long;
-+
-+                pixmap_as_long = (long) pixmap;
-+
-+                XChangeProperty (slave->priv->server_display,
-+                                 root_window, id_atom, XA_PIXMAP,
-+                                 32, PropModeReplace, (guchar *) &pixmap_as_long,
-+                                 1);
-+
-+        }
-+
-+        XFreeGC (slave->priv->server_display, gc);
-+}
-+
-+void
-+gdm_slave_save_root_windows (GdmSlave *slave)
-+{
-+        int i, number_of_screens;
-+        Atom atom;
-+
-+        number_of_screens = ScreenCount (slave->priv->server_display);
-+
-+        atom = XInternAtom (slave->priv->server_display,
-+                            "_XROOTPMAP_ID", False);
-+
-+        if (atom == 0) {
-+                return;
-+        }
-+
-+        for (i = 0; i < number_of_screens; i++) {
-+                gdm_slave_save_root_window_of_screen (slave, atom, i);
-+        }
-+
-+        XSync (slave->priv->server_display, False);
-+}
-+
- void
- gdm_slave_set_initial_keyboard_layout (GdmSlave *slave)
- {
-diff --git a/daemon/gdm-slave.h b/daemon/gdm-slave.h
-index 7af20ed..aaaa8f2 100644
---- a/daemon/gdm-slave.h
-+++ b/daemon/gdm-slave.h
-@@ -78,6 +78,7 @@ void                gdm_slave_set_initial_keyboard_layout (GdmSlave *slave);
- void                gdm_slave_set_initial_cursor_position (GdmSlave *slave);
- 
- void                gdm_slave_set_busy_cursor        (GdmSlave   *slave);
-+void                gdm_slave_save_root_windows      (GdmSlave   *slave);
- gboolean            gdm_slave_run_script             (GdmSlave   *slave,
-                                                       const char *dir,
-                                                       const char *username);
--- 
-1.7.8.6
-