diff --git a/.gitignore b/.gitignore index 48f3c0d..3821d06 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /lightdm-1.25.1.tar.gz /lightdm-1.25.2.tar.gz /lightdm-1.26.0.tar.gz +/lightdm-1.28.0.tar.gz diff --git a/fix_double_free.patch b/fix_double_free.patch new file mode 100644 index 0000000..ae7b417 --- /dev/null +++ b/fix_double_free.patch @@ -0,0 +1,24 @@ +From 3daf46ccc5a18cb854e3cffb3438512d40401d21 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Thu, 30 Aug 2018 21:14:50 +1200 +Subject: [PATCH] Fix double free of GVariantIter + +Bug introduced in a95eded63 +--- + src/dm-tool.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/dm-tool.c b/src/dm-tool.c +index 5060109f..365a7a81 100644 +--- a/src/dm-tool.c ++++ b/src/dm-tool.c +@@ -353,9 +353,7 @@ main (int argc, char **argv) + g_print (" %s=%s\n", property_names[i], g_variant_print (value, FALSE)); + } + } +- g_variant_iter_free (session_iter); + } +- g_variant_iter_free (seat_iter); + + return EXIT_SUCCESS; + } diff --git a/fix_invalid_object_defines.patch b/fix_invalid_object_defines.patch deleted file mode 100644 index 9271d62..0000000 --- a/fix_invalid_object_defines.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 149d9d7dff76f1db1daac33031f5d2d0c5407443 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Fri, 11 May 2018 16:24:39 +1200 -Subject: [PATCH] Fix invalid object defines - ---- - liblightdm-gobject/lightdm/language.h | 2 +- - liblightdm-gobject/lightdm/layout.h | 2 +- - liblightdm-gobject/lightdm/session.h | 2 +- - liblightdm-gobject/lightdm/user.h | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/liblightdm-gobject/lightdm/language.h b/liblightdm-gobject/lightdm/language.h -index 9d45f0c4..c37a5dcf 100644 ---- a/liblightdm-gobject/lightdm/language.h -+++ b/liblightdm-gobject/lightdm/language.h -@@ -16,7 +16,7 @@ - G_BEGIN_DECLS - - #define LIGHTDM_TYPE_LANGUAGE (lightdm_language_get_type()) --#define LIGHTDM_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguage)); -+#define LIGHTDM_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguage)) - #define LIGHTDM_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass)) - #define LIGHTDM_IS_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LANGUAGE)) - #define LIGHTDM_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LANGUAGE)) -diff --git a/liblightdm-gobject/lightdm/layout.h b/liblightdm-gobject/lightdm/layout.h -index b36677d2..398ed641 100644 ---- a/liblightdm-gobject/lightdm/layout.h -+++ b/liblightdm-gobject/lightdm/layout.h -@@ -16,7 +16,7 @@ - G_BEGIN_DECLS - - #define LIGHTDM_TYPE_LAYOUT (lightdm_layout_get_type()) --#define LIGHTDM_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayout)); -+#define LIGHTDM_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LAYOUT, LightDMLayout)) - #define LIGHTDM_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LAYOUT, LightDMLayoutClass)) - #define LIGHTDM_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LAYOUT)) - #define LIGHTDM_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LAYOUT)) -diff --git a/liblightdm-gobject/lightdm/session.h b/liblightdm-gobject/lightdm/session.h -index 3cdeaef9..62e6fa8e 100644 ---- a/liblightdm-gobject/lightdm/session.h -+++ b/liblightdm-gobject/lightdm/session.h -@@ -16,7 +16,7 @@ - G_BEGIN_DECLS - - #define LIGHTDM_TYPE_SESSION (lightdm_session_get_type()) --#define LIGHTDM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_SESSION, LightDMSession)); -+#define LIGHTDM_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_SESSION, LightDMSession)) - #define LIGHTDM_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_SESSION, LightDMSessionClass)) - #define LIGHTDM_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_SESSION)) - #define LIGHTDM_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_SESSION)) -diff --git a/liblightdm-gobject/lightdm/user.h b/liblightdm-gobject/lightdm/user.h -index 94b8af3a..27ecfdfa 100644 ---- a/liblightdm-gobject/lightdm/user.h -+++ b/liblightdm-gobject/lightdm/user.h -@@ -16,7 +16,7 @@ - G_BEGIN_DECLS - - #define LIGHTDM_TYPE_USER_LIST (lightdm_user_list_get_type()) --#define LIGHTDM_USER_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserList)); -+#define LIGHTDM_USER_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER_LIST, LightDMUserList)) - #define LIGHTDM_USER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_USER_LIST, LightDMUserListClass)) - #define LIGHTDM_IS_USER_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_USER_LIST)) - #define LIGHTDM_IS_USER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER_LIST)) -@@ -26,7 +26,7 @@ typedef struct _LightDMUserList LightDMUserList; - typedef struct _LightDMUserListClass LightDMUserListClass; - - #define LIGHTDM_TYPE_USER (lightdm_user_get_type()) --#define LIGHTDM_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER, LightDMUser)); -+#define LIGHTDM_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_USER, LightDMUser)) - #define LIGHTDM_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_USER, LightDMUserClass)) - #define LIGHTDM_IS_USER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_USER)) - #define LIGHTDM_IS_USER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_USER)) diff --git a/fix_unfreed_gerror.patch b/fix_unfreed_gerror.patch deleted file mode 100644 index c647c56..0000000 --- a/fix_unfreed_gerror.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9cfe924bb7bdfbb293686f2d636f461017f7c9dc Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Fri, 11 May 2018 16:40:38 +1200 -Subject: [PATCH] Fix compile warning and unfreed GError from 733d175 - ---- - src/session-child.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/session-child.c b/src/session-child.c -index 468534cf..eef51e49 100644 ---- a/src/session-child.c -+++ b/src/session-child.c -@@ -765,12 +765,13 @@ session_child_run (int argc, char **argv) - privileges_drop (user_get_uid (user), user_get_gid (user)); - - g_autoptr(GError) error = NULL; -- gboolean result = x_authority_write (x_authority, XAUTH_WRITE_MODE_REMOVE, x_authority_filename, &error); -+ x_authority_write (x_authority, XAUTH_WRITE_MODE_REMOVE, x_authority_filename, &error); - if (drop_privileges) - privileges_reclaim (); - - if (error) - g_printerr ("Error removing X authority: %s\n", error->message); -+ g_clear_error (&error); - /* Ignore this error, don't exit, continue closing the session. */ - } - diff --git a/ignore_error_close_session.patch b/ignore_error_close_session.patch deleted file mode 100644 index c71f6c6..0000000 --- a/ignore_error_close_session.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 733d1758adc0003ebbdce31e6c6bb58b86816cbb Mon Sep 17 00:00:00 2001 -From: Ivan Zakharyaschev -Date: Fri, 23 Mar 2018 15:55:34 +0300 -Subject: [PATCH] in Remove X authority: Ignore any error & don't exit, - continue closing the session - ---- - src/session-child.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/session-child.c b/src/session-child.c -index 5d77c5a5..468534cf 100644 ---- a/src/session-child.c -+++ b/src/session-child.c -@@ -771,8 +771,7 @@ session_child_run (int argc, char **argv) - - if (error) - g_printerr ("Error removing X authority: %s\n", error->message); -- if (!result) -- _exit (EXIT_FAILURE); -+ /* Ignore this error, don't exit, continue closing the session. */ - } - - /* Close the Console Kit session */ diff --git a/lightdm.spec b/lightdm.spec index 4344f4f..9efa737 100644 --- a/lightdm.spec +++ b/lightdm.spec @@ -6,8 +6,8 @@ Name: lightdm Summary: A cross-desktop Display Manager -Version: 1.26.0 -Release: 2%{?dist} +Version: 1.28.0 +Release: 1%{?dist} # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+ License: (LGPLv2 or LGPLv3) and GPLv3+ @@ -30,14 +30,10 @@ Source24: 50-xserver-command.conf Source25: 50-disable-guest.conf # Upstreamed: -Patch0: %{giturl}/pull/3.patch#/%{name}-1.25.1-fix_transition_plymouth.patch -Patch1: %{giturl}/pull/5.patch#/%{name}-1.25.1-disable_dmrc.patch +Patch0: %{giturl}/pull/5.patch#/%{name}-1.25.1-disable_dmrc.patch # Upstream commits - -Patch2: %{giturl}/commit/733d1758adc0003ebbdce31e6c6bb58b86816cbb.patch#/ignore_error_close_session.patch -Patch3: %{giturl}/commit/9cfe924bb7bdfbb293686f2d636f461017f7c9dc.patch#/fix_unfreed_gerror.patch -Patch4: %{giturl}/commit/149d9d7dff76f1db1daac33031f5d2d0c5407443.patch#/fix_invalid_object_defines.patch +Patch1: %{giturl}/commit/3daf46c.patch#/fix_double_free.patch BuildRequires: gettext BuildRequires: gnome-common @@ -324,6 +320,9 @@ fi %changelog +* Sat Sep 01 2018 Leigh Scott - 1.28.0-1 +- lightdm-1.28.0 + * Fri Jul 13 2018 Fedora Release Engineering - 1.26.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7b5dec3..b065c52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lightdm-1.26.0.tar.gz) = 2e2a5e0e5d634665932b3c4f49d02b1868595793f3d9ac0860b330536f4ffa75d8983fecaf265a64bfd61e1d945a20e2631a4b7a49c84bcafc5cc1efcc041fa7 +SHA512 (lightdm-1.28.0.tar.gz) = de546fa94dd49ff030ff00934e9f65b2fa35e96f4fb23f86502bb351c9863c873104f0ef601d0f802c5df417ae0d8f969d97d9aeea42f2a10cd153083234d00a