[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
27/48: gnu: gdm: Update to 3.30.2.
|
From: |
guix-commits |
|
Subject: |
27/48: gnu: gdm: Update to 3.30.2. |
|
Date: |
Sat, 4 May 2019 04:10:04 -0400 (EDT) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit d23fe78576bb218c43920b7d262eb9a77dc1268b
Author: Ricardo Wurmus <address@hidden>
Date: Wed Dec 5 17:25:57 2018 +0100
gnu: gdm: Update to 3.30.2.
* gnu/packages/gnome.scm (gdm): Update to 3.30.2.
[arguments]: Add --with-udevdir configure flag.
[source]: Remove patch.
* gnu/packages/patches/gdm-CVE-2018-14424.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 8 +-
gnu/packages/patches/gdm-CVE-2018-14424.patch | 172 --------------------------
3 files changed, 5 insertions(+), 176 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a0f40d1..8379214 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -820,7 +820,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gd-CVE-2019-6978.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-freetype-test-failure.patch \
- %D%/packages/patches/gdm-CVE-2018-14424.patch \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch
\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 25e36df..16e9960 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5573,16 +5573,15 @@ libxml2.")
(define-public gdm
(package
(name "gdm")
- (version "3.28.2")
+ (version "3.30.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
- (patches (search-patches "gdm-CVE-2018-14424.patch"))
(sha256
(base32
- "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0"))))
+ "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y"))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:configure-flags
@@ -5598,6 +5597,9 @@ libxml2.")
;; systemd-specific '/etc/locale.conf'.
"--with-lang-file=/etc/environment"
+ ,(string-append "--with-udevdir="
+ (assoc-ref %outputs "out") "/lib/udev")
+
"--localstatedir=/var"
,(string-append "--with-default-path="
(string-join '("/run/setuid-programs"
diff --git a/gnu/packages/patches/gdm-CVE-2018-14424.patch
b/gnu/packages/patches/gdm-CVE-2018-14424.patch
deleted file mode 100644
index 88a71f4..0000000
--- a/gnu/packages/patches/gdm-CVE-2018-14424.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Fix CVE-2018-14424:
-
-https://gitlab.gnome.org/GNOME/gdm/issues/401
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14424
-
-Patch copied from upstream source repository:
-
-https://gitlab.gnome.org/GNOME/gdm/commit/1ac1697b3b019f50729a6e992065959586e170da
-
-From 1ac1697b3b019f50729a6e992065959586e170da Mon Sep 17 00:00:00 2001
-From: Chris Coulson <address@hidden>
-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 5f1ae89e..39f3e30a 100644
---- a/daemon/gdm-local-display-factory.c
-+++ b/daemon/gdm-local-display-factory.c
-@@ -805,18 +805,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 f17bd1a5..f6684a8b 100644
---- a/daemon/gdm-manager.c
-+++ b/daemon/gdm-manager.c
-@@ -1541,19 +1541,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
-@@ -2535,9 +2534,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
-
- 09/48: gnu: adwaita-icon-theme: Update to 3.30.1., (continued)
- 09/48: gnu: adwaita-icon-theme: Update to 3.30.1., guix-commits, 2019/05/04
- 01/48: gnu: glib: Update to 2.58.1., guix-commits, 2019/05/04
- 18/48: gnu: gnome-sudoku: Update to 3.30.0., guix-commits, 2019/05/04
- 14/48: gnu: vala: Update to 0.42.3., guix-commits, 2019/05/04
- 21/48: gnu: gtkmm: Update to 3.24.0., guix-commits, 2019/05/04
- 22/48: gnu: atkmm: Update to 2.28.0., guix-commits, 2019/05/04
- 24/48: gnu: gnome-system-monitor: Update to 3.30.0., guix-commits, 2019/05/04
- 20/48: gnu: glib: Install m4 macros., guix-commits, 2019/05/04
- 23/48: gnu: pangomm: Update to 2.42.0., guix-commits, 2019/05/04
- 42/48: gnu: libgnome-games-support: Update to 1.4.2., guix-commits, 2019/05/04
- 27/48: gnu: gdm: Update to 3.30.2.,
guix-commits <=
- 34/48: gnu: gvfs: Update to 1.38.1., guix-commits, 2019/05/04
- 45/48: gnu: gnome-maps: Update to 3.30.2.1., guix-commits, 2019/05/04
- 03/48: gnu: gmime: Update to 3.2.3., guix-commits, 2019/05/04
- 07/48: gnu: evince: Update to 3.30.2., guix-commits, 2019/05/04
- 41/48: gnu: yelp-xsl: Update to 3.30.1., guix-commits, 2019/05/04
- 43/48: gnu: evolution-data-server: Update to 3.30.2., guix-commits, 2019/05/04
- 19/48: gnu: gnome-terminal: Update to 3.30.2., guix-commits, 2019/05/04
- 26/48: gnu: network-manager-applet: Update to 1.8.18., guix-commits, 2019/05/04
- 30/48: gnu: network-manager: Update to 1.14.4., guix-commits, 2019/05/04
- 40/48: gnu: yelp: Update to 3.30.0., guix-commits, 2019/05/04