gentoo resync : 21.05.2019

3 files changed, 0 insertions, 249 deletions

diff --git a/gnome-base/gdm/files/3.24.3-CVE-2018-14424.patch b/gnome-base/gdm/files/3.24.3-CVE-2018-14424.patch
deleted file mode 100644
index 4edb0670958f..000000000000
--- a/gnome-base/gdm/files/3.24.3-CVE-2018-14424.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 6060db704a19b0db68f2e9e6a2d020c0c78b6bba Mon Sep 17 00:00:00 2001
-From: Chris Coulson <chris.coulson@canonical.com>
-Date: Thu, 19 Jul 2018 18:26:05 +0100
-Subject: [PATCH] display-store: Pass the display object rather than the id in
- the removed signal
-
-By the time GdmDisplayStore emits the "display-removed" signal, the display
-is no longer in the store and gdm_display_store_lookup will not work in
-signal handlers.
-
-Change the "display-removed" parameter from the display id to the GdmDisplay
-object, so that signal handers can perform any cleanup they need to do
-
-CVE-2018-14424
-
-Closes: https://gitlab.gnome.org/GNOME/gdm/issues/401
----
- daemon/gdm-display-store.c         | 11 +++--------
- daemon/gdm-display-store.h         |  2 +-
- daemon/gdm-local-display-factory.c | 13 +++----------
- daemon/gdm-manager.c               | 19 +++++++++----------
- daemon/gdm-manager.h               |  3 ++-
- 5 files changed, 18 insertions(+), 30 deletions(-)
-
-diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c
-index af76f519..fd24334e 100644
---- a/daemon/gdm-display-store.c
-+++ b/daemon/gdm-display-store.c
-@@ -76,15 +76,10 @@ stored_display_new (GdmDisplayStore *store,
- static void
- stored_display_free (StoredDisplay *stored_display)
- {
--        char *id;
--
--        gdm_display_get_id (stored_display->display, &id, NULL);
--
-         g_signal_emit (G_OBJECT (stored_display->store),
-                        signals[DISPLAY_REMOVED],
-                        0,
--                       id);
--        g_free (id);
-+                       stored_display->display);
- 
-         g_debug ("GdmDisplayStore: Unreffing display: %p",
-                  stored_display->display);
-@@ -281,9 +276,9 @@ gdm_display_store_class_init (GdmDisplayStoreClass *klass)
-                               G_STRUCT_OFFSET (GdmDisplayStoreClass, display_removed),
-                               NULL,
-                               NULL,
--                              g_cclosure_marshal_VOID__STRING,
-+                              g_cclosure_marshal_VOID__OBJECT,
-                               G_TYPE_NONE,
--                              1, G_TYPE_STRING);
-+                              1, G_TYPE_OBJECT);
- 
-         g_type_class_add_private (klass, sizeof (GdmDisplayStorePrivate));
- }
-diff --git a/daemon/gdm-display-store.h b/daemon/gdm-display-store.h
-index 28359933..0aff8ee2 100644
---- a/daemon/gdm-display-store.h
-+++ b/daemon/gdm-display-store.h
-@@ -49,7 +49,7 @@ typedef struct
-         void          (* display_added)    (GdmDisplayStore *display_store,
-                                             const char      *id);
-         void          (* display_removed)  (GdmDisplayStore *display_store,
--                                            const char      *id);
-+                                            GdmDisplay      *display);
- } GdmDisplayStoreClass;
- 
- typedef enum
-diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
-index b29f5ac5..403921d3 100644
---- a/daemon/gdm-local-display-factory.c
-+++ b/daemon/gdm-local-display-factory.c
-@@ -558,18 +558,11 @@ on_display_added (GdmDisplayStore        *display_store,
- 
- static void
- on_display_removed (GdmDisplayStore        *display_store,
--                    const char             *id,
-+                    GdmDisplay             *display,
-                     GdmLocalDisplayFactory *factory)
- {
--        GdmDisplay *display;
--
--        display = gdm_display_store_lookup (display_store, id);
--
--        if (display != NULL) {
--                g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory);
--                g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory);
--
--        }
-+        g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory);
-+        g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory);
- }
- 
- static gboolean
-diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
-index 7539acf1..1943d89e 100644
---- a/daemon/gdm-manager.c
-+++ b/daemon/gdm-manager.c
-@@ -1700,19 +1700,18 @@ on_display_status_changed (GdmDisplay *display,
- 
- static void
- on_display_removed (GdmDisplayStore *display_store,
--                    const char      *id,
-+                    GdmDisplay      *display,
-                     GdmManager      *manager)
- {
--        GdmDisplay *display;
-+        char    *id;
- 
--        display = gdm_display_store_lookup (display_store, id);
--        if (display != NULL) {
--                g_dbus_object_manager_server_unexport (manager->priv->object_manager, id);
-+        gdm_display_get_id (display, &id, NULL);
-+        g_dbus_object_manager_server_unexport (manager->priv->object_manager, id);
-+        g_free (id);
- 
--                g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager);
-+        g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager);
- 
--                g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, id);
--        }
-+        g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, display);
- }
- 
- static void
-@@ -2694,9 +2693,9 @@ gdm_manager_class_init (GdmManagerClass *klass)
-                               G_STRUCT_OFFSET (GdmManagerClass, display_removed),
-                               NULL,
-                               NULL,
--                              g_cclosure_marshal_VOID__STRING,
-+                              g_cclosure_marshal_VOID__OBJECT,
-                               G_TYPE_NONE,
--                              1, G_TYPE_STRING);
-+                              1, G_TYPE_OBJECT);
- 
-         g_object_class_install_property (object_class,
-                                          PROP_XDMCP_ENABLED,
-diff --git a/daemon/gdm-manager.h b/daemon/gdm-manager.h
-index 41c68a7a..c8fb3f22 100644
---- a/daemon/gdm-manager.h
-+++ b/daemon/gdm-manager.h
-@@ -24,6 +24,7 @@
- 
- #include <glib-object.h>
- 
-+#include "gdm-display.h"
- #include "gdm-manager-glue.h"
- 
- G_BEGIN_DECLS
-@@ -50,7 +51,7 @@ typedef struct
-         void          (* display_added)    (GdmManager      *manager,
-                                             const char      *id);
-         void          (* display_removed)  (GdmManager      *manager,
--                                            const char      *id);
-+                                            GdmDisplay      *display);
- } GdmManagerClass;
- 
- typedef enum
--- 
-2.17.1
-
diff --git a/gnome-base/gdm/files/3.24.3-display-object-lifetime-fix.patch b/gnome-base/gdm/files/3.24.3-display-object-lifetime-fix.patch
deleted file mode 100644
index 47366ed686cb..000000000000
--- a/gnome-base/gdm/files/3.24.3-display-object-lifetime-fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 765b306c364885dd89d47fe9fe8618ce6a467bc1 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 19 Jul 2018 16:01:23 -0400
-Subject: [PATCH] display: tie skeleton handlers to object lifetime
-
-Right now we assume a display skeleton object won't
-outlive its associated display object.
-
-In theory that should be true, but if we accidentally
-leak the skeleton it could erroneously happen.
-
-If that does happen then we'll end accessing free'd
-memory, so the leak will turn into a crasher.
-
-This commit addresses this problem by ensuring
-the skeleton signal handlers are disconnected when the
-associated display object goes away.
-
-CVE-2018-14424
----
- daemon/gdm-display.c | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
-index 1b58781d..5e193f2f 100644
---- a/daemon/gdm-display.c
-+++ b/daemon/gdm-display.c
-@@ -1109,18 +1109,18 @@ register_display (GdmDisplay *self)
-         self->priv->object_skeleton = g_dbus_object_skeleton_new (self->priv->id);
-         self->priv->display_skeleton = GDM_DBUS_DISPLAY (gdm_dbus_display_skeleton_new ());
- 
--        g_signal_connect (self->priv->display_skeleton, "handle-get-id",
--                          G_CALLBACK (handle_get_id), self);
--        g_signal_connect (self->priv->display_skeleton, "handle-get-remote-hostname",
--                          G_CALLBACK (handle_get_remote_hostname), self);
--        g_signal_connect (self->priv->display_skeleton, "handle-get-seat-id",
--                          G_CALLBACK (handle_get_seat_id), self);
--        g_signal_connect (self->priv->display_skeleton, "handle-get-x11-display-name",
--                          G_CALLBACK (handle_get_x11_display_name), self);
--        g_signal_connect (self->priv->display_skeleton, "handle-is-local",
--                          G_CALLBACK (handle_is_local), self);
--        g_signal_connect (self->priv->display_skeleton, "handle-is-initial",
--                          G_CALLBACK (handle_is_initial), self);
-+        g_signal_connect_object (self->priv->display_skeleton, "handle-get-id",
-+                                 G_CALLBACK (handle_get_id), self, 0);
-+        g_signal_connect_object (self->priv->display_skeleton, "handle-get-remote-hostname",
-+                                 G_CALLBACK (handle_get_remote_hostname), self, 0);
-+        g_signal_connect_object (self->priv->display_skeleton, "handle-get-seat-id",
-+                                 G_CALLBACK (handle_get_seat_id), self, 0);
-+        g_signal_connect_object (self->priv->display_skeleton, "handle-get-x11-display-name",
-+                                 G_CALLBACK (handle_get_x11_display_name), self, 0);
-+        g_signal_connect_object (self->priv->display_skeleton, "handle-is-local",
-+                                 G_CALLBACK (handle_is_local), self, 0);
-+        g_signal_connect_object (self->priv->display_skeleton, "handle-is-initial",
-+                                 G_CALLBACK (handle_is_initial), self, 0);
- 
-         g_dbus_object_skeleton_add_interface (self->priv->object_skeleton,
-                                               G_DBUS_INTERFACE_SKELETON (self->priv->display_skeleton));
--- 
-2.17.1
-
diff --git a/gnome-base/gdm/files/gdm-3.8.4-logo.patch b/gnome-base/gdm/files/gdm-3.8.4-logo.patch
deleted file mode 100644
index 151d4bc77f42..000000000000
--- a/gnome-base/gdm/files/gdm-3.8.4-logo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bcc651df77a429a6bf9b13892f71fedb1b87a069 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Dec 2013 22:46:58 +0100
-Subject: [PATCH 4/4] Apply Gentoo branding
-
----
- data/org.gnome.login-screen.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.login-screen.gschema.xml.in b/data/org.gnome.login-screen.gschema.xml.in
-index 03da374..5e81bc0 100644
---- a/data/org.gnome.login-screen.gschema.xml.in
-+++ b/data/org.gnome.login-screen.gschema.xml.in
-@@ -31,7 +31,7 @@
-       </_description>
-     </key>
-     <key name="logo" type="s">
--      <default>''</default>
-+      <default>'/usr/share/pixmaps/gentoo-gdm.svg'</default>
-       <_summary>
-         Path to small image at top of user list
-       </_summary>
--- 
-1.8.5.1
-