Attachment 886405 Details for Bug 1077562 – LightDM 1.10.0 update

LightDM 1.10.0 update

lightdm-1.10.0-update.patch (text/plain), 10.13 KB, created by poma on 2014-04-15 09:25:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: poma

Created: 2014-04-15 09:25:07 UTC

Size: 10.13 KB

patch

obsolete

>diff --git a/lightdm-1.9.11-fedora_config.patch b/lightdm-1.9.11-fedora_config.patch
>deleted file mode 100644
>index 59bd7b7..0000000
>--- a/lightdm-1.9.11-fedora_config.patch
>+++ /dev/null
>@@ -1,53 +0,0 @@
>-diff -up lightdm-1.9.11/data/lightdm.conf.fedora_config lightdm-1.9.11/data/lightdm.conf
>---- lightdm-1.9.11/data/lightdm.conf.fedora_config	2014-03-12 14:56:34.000000000 -0500
>-+++ lightdm-1.9.11/data/lightdm.conf	2014-03-13 07:15:20.266046171 -0500
>-@@ -19,9 +19,9 @@
>- #start-default-seat=true
>- #greeter-user=lightdm
>- #minimum-display-number=0
>--#minimum-vt=7
>-+minimum-vt=1
>- #lock-memory=true
>--#user-authority-in-system-dir=false
>-+user-authority-in-system-dir=true
>- #guest-account-script=guest-account
>- #log-directory=/var/log/lightdm
>- #run-directory=/var/run/lightdm
>-@@ -73,7 +73,7 @@
>- [SeatDefaults]
>- #type=xlocal
>- #xdg-seat=seat0
>--#xserver-command=X
>-+xserver-command=X -background none
>- #xserver-layout=
>- #xserver-config=
>- #xserver-allow-tcp=false
>-@@ -85,7 +85,7 @@
>- #xdmcp-key=
>- #unity-compositor-command=unity-system-compositor
>- #unity-compositor-timeout=60
>--#greeter-session=example-gtk-gnome
>-+greeter-session=lightdm-greeter
>- #greeter-hide-users=false
>- #greeter-allow-guest=true
>- #greeter-show-manual-login=false
>-@@ -93,7 +93,7 @@
>- #user-session=default
>- #allow-guest=true
>- #guest-session=
>--#session-wrapper=lightdm-session
>-+session-wrapper=/etc/X11/xinit/Xsession
>- #greeter-wrapper=
>- #guest-wrapper=
>- #display-setup-script=
>-diff -up lightdm-1.9.11/data/users.conf.fedora_config lightdm-1.9.11/data/users.conf
>---- lightdm-1.9.11/data/users.conf.fedora_config	2013-07-30 09:09:28.000000000 -0500
>-+++ lightdm-1.9.11/data/users.conf	2014-03-13 07:13:28.320086064 -0500
>-@@ -9,6 +9,6 @@
>- # hidden-shells = Shells that indicate a user cannot login
>- #
>- [UserAccounts]
>--minimum-uid=500
>-+minimum-uid=1000
>- hidden-users=nobody nobody4 noaccess
>- hidden-shells=/bin/false /usr/sbin/nologin
>diff --git a/lightdm-1.9.8-no_dmrc_save.patch b/lightdm-1.9.8-no_dmrc_save.patch
>deleted file mode 100644
>index 3b49eb0..0000000
>--- a/lightdm-1.9.8-no_dmrc_save.patch
>+++ /dev/null
>@@ -1,21 +0,0 @@
>-diff -up lightdm-1.9.8/common/dmrc.c.no_dmrc_save lightdm-1.9.8/common/dmrc.c
>---- lightdm-1.9.8/common/dmrc.c.no_dmrc_save	2014-02-19 18:22:51.000000000 -0600
>-+++ lightdm-1.9.8/common/dmrc.c	2014-02-20 06:30:41.503707318 -0600
>-@@ -68,6 +68,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
>- 
>-     data = g_key_file_to_data (dmrc_file, &length, NULL);
>- 
>-+#if 0
>-     /* Update the users .dmrc */
>-     path = g_build_filename (common_user_get_home_directory (user), ".dmrc", NULL);
>- 
>-@@ -81,6 +82,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
>-         privileges_reclaim ();
>- 
>-     g_free (path);
>-+#endif
>- 
>-     /* Update the .dmrc cache */
>-     cache_dir = config_get_string (config_get_instance (), "LightDM", "cache-directory");
>-diff -up lightdm-1.9.8/common/user-list.c.no_dmrc_save lightdm-1.9.8/common/user-list.c
>-diff -up lightdm-1.9.8/src/accounts.c.no_dmrc_save lightdm-1.9.8/src/accounts.c
>diff --git a/lightdm-1.9.9-FD_leak.patch b/lightdm-1.9.9-FD_leak.patch
>index f5abf78..e55a96c 100644
>--- a/lightdm-1.9.9-FD_leak.patch
>+++ b/lightdm-1.9.9-FD_leak.patch
>@@ -1,18 +1,21 @@
> diff -up lightdm-1.9.9/src/greeter.c.FD_leak lightdm-1.9.9/src/greeter.c
> --- lightdm-1.9.9/src/greeter.c.FD_leak	2014-02-23 18:03:55.000000000 -0600
> +++ lightdm-1.9.9/src/greeter.c	2014-03-11 08:26:37.667341382 -0500
>-@@ -969,9 +969,15 @@ greeter_finalize (GObject *object)
>+@@ -969,9 +969,15 @@
>          g_object_unref (self->priv->authentication_session);
>      }
>      if (self->priv->to_greeter_channel)
>+-        g_io_channel_unref (self->priv->to_greeter_channel);
>+-    if (self->priv->from_greeter_channel)
>+-        g_io_channel_unref (self->priv->from_greeter_channel);
> +    {
> +        close(g_io_channel_unix_get_fd(self->priv->to_greeter_channel));
>-         g_io_channel_unref (self->priv->to_greeter_channel);
>++         g_io_channel_unref (self->priv->to_greeter_channel);
> +    }
>-     if (self->priv->from_greeter_channel)
>++     if (self->priv->from_greeter_channel)
> +    {
> +        close(g_io_channel_unix_get_fd(self->priv->from_greeter_channel)); 
>-         g_io_channel_unref (self->priv->from_greeter_channel);
>++         g_io_channel_unref (self->priv->from_greeter_channel);
> +    }
>      if (self->priv->from_greeter_watch)
>          g_source_remove (self->priv->from_greeter_watch);
>@@ -20,7 +23,7 @@ diff -up lightdm-1.9.9/src/greeter.c.FD_leak lightdm-1.9.9/src/greeter.c
> diff -up lightdm-1.9.9/src/session.c.FD_leak lightdm-1.9.9/src/session.c
> --- lightdm-1.9.9/src/session.c.FD_leak	2014-03-05 21:35:03.000000000 -0600
> +++ lightdm-1.9.9/src/session.c	2014-03-11 08:26:37.667341382 -0500
>-@@ -450,6 +450,8 @@ session_watch_cb (GPid pid, gint status,
>+@@ -450,6 +450,8 @@
>      if (session->priv->is_guest)
>          guest_account_cleanup (session->priv->username);
>  
>diff --git a/lightdm-nodaemon_option.patch b/lightdm-nodaemon_option.patch
>deleted file mode 100644
>index b634d1c..0000000
>--- a/lightdm-nodaemon_option.patch
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-diff -up lightdm-1.7.11/src/lightdm.c.nodaemon_option lightdm-1.7.11/src/lightdm.c
>---- lightdm-1.7.11/src/lightdm.c.nodaemon_option	2013-08-25 21:32:17.000000000 -0500
>-+++ lightdm-1.7.11/src/lightdm.c	2013-08-27 19:46:41.100258556 -0500
>-@@ -994,7 +994,7 @@ main (int argc, char **argv)
>-         g_printerr (/* Text printed out when an unknown command-line argument provided */
>-                     _("Run '%s --help' to see a full list of available command line options."), argv[0]);
>-         g_printerr ("\n");
>--        return EXIT_FAILURE;
>-+    /*  return EXIT_FAILURE; */
>-     }
>- 
>-     if (show_version)
>diff --git a/lightdm.spec b/lightdm.spec
>index e263abb..06dc4ae 100644
>--- a/lightdm.spec
>+++ b/lightdm.spec
>@@ -4,13 +4,13 @@
> 
> Name:    lightdm
> Summary: Lightweight Display Manager
>-Version: 1.9.13
>-Release: 2%{?dist}
>+Version: 1.10.0
>+Release: 1%{?dist}
> 
> # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
> License: (LGPLv2 or LGPLv3) and GPLv3+
> URL:     https://launchpad.net/lightdm/
>-Source0: https://launchpad.net/lightdm/1.9/%{version}/+download/lightdm-%{version}.tar.xz
>+Source0: https://launchpad.net/lightdm/1.10/%{version}/+download/lightdm-%{version}.tar.xz
> 
> Source1: lightdm.pam
> Source2: lightdm-autologin.pam
>@@ -19,11 +19,9 @@ Source4: lightdm.service
> Source6: lightdm.rules
> 
> ## Downstream patches:
>-Patch10: lightdm-1.9.11-fedora_config.patch
>+Patch10: lightdm-1.10.0-fedora_config.patch
> # hack in support for --nodaemon option
>-Patch11: lightdm-nodaemon_option.patch
>-# disable saving to ~/.dmrc (runs afoul of selinux, http://bugzilla.redhat.com/963238 )
>-Patch12: lightdm-1.9.8-no_dmrc_save.patch
>+Patch11: lightdm-1.10.0-nodaemon_option.patch
> 
> ## upstreamable patches
> # https://bugzilla.redhat.com/show_bug.cgi?id=973584
>@@ -118,7 +116,6 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
> 
> %patch10 -p1 -b .fedora_config
> %patch11 -p1 -b .nodaemon_option
>-%patch12 -p1 -b .no_dmrc_save
> %patch50 -p1 -b .FD_leak
> 
> # rpath hack
>@@ -248,6 +245,9 @@ exit 0
> 
> 
> %changelog
>+* Tue Apr 08 2014 poma <poma@gmail.com> 1.10.0-1
>+- lightdm-1.10.0
>+
> * Thu Mar 27 2014 Rex Dieter <rdieter@fedoraproject.org> 1.9.13-2
> - Could not create user data directory /var/lib/lightdm-data/lightdm (#1081426)
> 
>diff --git a/sources b/sources
>index 0dd6f1a..1cd7c16 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-8aeb818064e112ec1a4c7119627ed8e0  lightdm-1.9.13.tar.xz
>+004a9b70674a37d0c950ac54f87d686f  lightdm-1.10.0.tar.xz
>diff --git a/lightdm-1.10.0-fedora_config.patch b/lightdm-1.10.0-fedora_config.patch
>new file mode 100644
>index 0000000..59bd7b7
>--- /dev/null
>+++ b/lightdm-1.10.0-fedora_config.patch
>@@ -0,0 +1,53 @@
>+diff -up lightdm-1.9.11/data/lightdm.conf.fedora_config lightdm-1.9.11/data/lightdm.conf
>+--- lightdm-1.9.11/data/lightdm.conf.fedora_config	2014-03-12 14:56:34.000000000 -0500
>++++ lightdm-1.9.11/data/lightdm.conf	2014-03-13 07:15:20.266046171 -0500
>+@@ -19,9 +19,9 @@
>+ #start-default-seat=true
>+ #greeter-user=lightdm
>+ #minimum-display-number=0
>+-#minimum-vt=7
>++minimum-vt=1
>+ #lock-memory=true
>+-#user-authority-in-system-dir=false
>++user-authority-in-system-dir=true
>+ #guest-account-script=guest-account
>+ #log-directory=/var/log/lightdm
>+ #run-directory=/var/run/lightdm
>+@@ -73,7 +73,7 @@
>+ [SeatDefaults]
>+ #type=xlocal
>+ #xdg-seat=seat0
>+-#xserver-command=X
>++xserver-command=X -background none
>+ #xserver-layout=
>+ #xserver-config=
>+ #xserver-allow-tcp=false
>+@@ -85,7 +85,7 @@
>+ #xdmcp-key=
>+ #unity-compositor-command=unity-system-compositor
>+ #unity-compositor-timeout=60
>+-#greeter-session=example-gtk-gnome
>++greeter-session=lightdm-greeter
>+ #greeter-hide-users=false
>+ #greeter-allow-guest=true
>+ #greeter-show-manual-login=false
>+@@ -93,7 +93,7 @@
>+ #user-session=default
>+ #allow-guest=true
>+ #guest-session=
>+-#session-wrapper=lightdm-session
>++session-wrapper=/etc/X11/xinit/Xsession
>+ #greeter-wrapper=
>+ #guest-wrapper=
>+ #display-setup-script=
>+diff -up lightdm-1.9.11/data/users.conf.fedora_config lightdm-1.9.11/data/users.conf
>+--- lightdm-1.9.11/data/users.conf.fedora_config	2013-07-30 09:09:28.000000000 -0500
>++++ lightdm-1.9.11/data/users.conf	2014-03-13 07:13:28.320086064 -0500
>+@@ -9,6 +9,6 @@
>+ # hidden-shells = Shells that indicate a user cannot login
>+ #
>+ [UserAccounts]
>+-minimum-uid=500
>++minimum-uid=1000
>+ hidden-users=nobody nobody4 noaccess
>+ hidden-shells=/bin/false /usr/sbin/nologin
>diff --git a/lightdm-1.10.0-nodaemon_option.patch b/lightdm-1.10.0-nodaemon_option.patch
>new file mode 100644
>index 0000000..b634d1c
>--- /dev/null
>+++ b/lightdm-1.10.0-nodaemon_option.patch
>@@ -0,0 +1,12 @@
>+diff -up lightdm-1.7.11/src/lightdm.c.nodaemon_option lightdm-1.7.11/src/lightdm.c
>+--- lightdm-1.7.11/src/lightdm.c.nodaemon_option	2013-08-25 21:32:17.000000000 -0500
>++++ lightdm-1.7.11/src/lightdm.c	2013-08-27 19:46:41.100258556 -0500
>+@@ -994,7 +994,7 @@ main (int argc, char **argv)
>+         g_printerr (/* Text printed out when an unknown command-line argument provided */
>+                     _("Run '%s --help' to see a full list of available command line options."), argv[0]);
>+         g_printerr ("\n");
>+-        return EXIT_FAILURE;
>++    /*  return EXIT_FAILURE; */
>+     }
>+ 
>+     if (show_version)

Actions: View

Attachments on bug 1077562: 886405 | 886451