Unverified Commit 7ac28c6c authored by Björn Esser's avatar Björn Esser
Browse files

lightdm-1.25.0

Enable smooth transition from plymouth to the greeter
Enable coredumps from Xserver
Change source url to github
Explicitly require a greeter
Enable explicit internal Requires
parent 0fc78afd
/lightdm-1.18.3.tar.xz
/lightdm-1.22.0.tar.xz
/lightdm-1.24.0.tar.xz
/lightdm-1.25.0.tar.gz
[Seat:*]
xserver-command=X -background none
xserver-command=X -core -noreset
diff -up lightdm-1.18.0/configure.ac.qtchooser lightdm-1.18.0/configure.ac
--- lightdm-1.18.0/configure.ac.qtchooser 2016-03-22 21:12:54.000000000 -0500
+++ lightdm-1.18.0/configure.ac 2016-04-02 15:23:04.781774155 -0500
@@ -116,9 +116,9 @@ if test x"$enable_liblightdm_qt5" != "xn
Qt5Gui
],
[compile_liblightdm_qt5=yes
- AC_CHECK_TOOLS(MOC5, [moc])
+ AC_CHECK_TOOLS(MOC5, [moc-qt5 moc])
if test x"$(readlink $(which $MOC5))" = xqtchooser; then
- MOC5="$MOC5 --qt=qt5"
+ MOC5="$MOC5 --qt=5"
fi
],
[if test "x$enable_liblightdm_qt5" != xauto; then
diff -up lightdm-1.18.0/configure.qtchooser lightdm-1.18.0/configure
--- lightdm-1.18.0/configure.qtchooser 2016-03-22 21:28:47.000000000 -0500
+++ lightdm-1.18.0/configure 2016-04-02 15:24:31.062312669 -0500
@@ -17693,7 +17693,7 @@ esac
fi
if test x"$(readlink $(which $MOC4))" = xqtchooser; then
- MOC4="$MOC4 --qt=qt4"
+ MOC4="$MOC4 --qt=4"
fi
fi
@@ -17875,7 +17875,7 @@ fi
fi
if test -z "$MOC5"; then
ac_ct_MOC5=$MOC5
- for ac_prog in moc
+ for ac_prog in moc-qt5 moc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -17931,7 +17931,7 @@ esac
fi
if test x"$(readlink $(which $MOC5))" = xqtchooser; then
- MOC5="$MOC5 --qt=qt5"
+ MOC5="$MOC5 --qt=5"
fi
fi
Index: lightdm-1.25.0/Makefile.am
===================================================================
--- lightdm-1.25.0.orig/Makefile.am
+++ lightdm-1.25.0/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
SUBDIRS = common liblightdm-gobject liblightdm-qt
if COMPILE_TESTS
SUBDIRS += tests
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
Index: lightdm-1.25.0/common/dmrc.c
===================================================================
--- lightdm-1.25.0.orig/common/dmrc.c
+++ lightdm-1.25.0/common/dmrc.c
@@ -70,6 +70,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
data = g_key_file_to_data (dmrc_file, &length, NULL);
......@@ -10,12 +11,10 @@ diff -up lightdm-1.9.8/common/dmrc.c.no_dmrc_save lightdm-1.9.8/common/dmrc.c
path = g_build_filename (common_user_get_home_directory (user), ".dmrc", NULL);
@@ -81,6 +82,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
g_file_set_contents (path, data, length, NULL);
if (drop_privileges)
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 -up lightdm-1.10.2/src/lightdm.c.nodaemon_option lightdm-1.10.2/src/lightdm.c
--- lightdm-1.10.2/src/lightdm.c.nodaemon_option 2014-09-17 06:42:48.681674585 -0500
+++ lightdm-1.10.2/src/lightdm.c 2014-09-17 06:44:03.021901180 -0500
@@ -1135,7 +1135,7 @@ main (int argc, char **argv)
Index: lightdm-1.25.0/src/lightdm.c
===================================================================
--- lightdm-1.25.0.orig/src/lightdm.c
+++ lightdm-1.25.0/src/lightdm.c
@@ -659,7 +659,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");
......
Index: lightdm-1.25.0/configure.ac
===================================================================
--- lightdm-1.25.0.orig/configure.ac
+++ lightdm-1.25.0/configure.ac
@@ -107,7 +107,7 @@ if test x"$enable_liblightdm_qt4" != "xn
fi
if test x"$MOC4" = xmoc; then
if test x"$(readlink $(which $MOC4))" = xqtchooser; then
- MOC4="$MOC4 --qt=qt4"
+ MOC4="$MOC4 --qt=4"
fi
fi
fi
@@ -141,7 +141,7 @@ if test x"$enable_liblightdm_qt5" != "xn
fi
if test x"$MOC5" = xmoc; then
if test x"$(readlink $(which $MOC5))" = xqtchooser; then
- MOC5="$MOC5 --qt=qt5"
+ MOC5="$MOC5 --qt=5"
fi
fi
fi
Index: lightdm-1.25.0/src/seat-local.c
===================================================================
--- lightdm-1.25.0.orig/src/seat-local.c
+++ lightdm-1.25.0/src/seat-local.c
@@ -169,6 +169,8 @@ get_vt (SeatLocal *seat, DisplayServer *
g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK (display_server_ready_cb), seat);
g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK (display_server_transition_plymouth_cb), seat);
plymouth_deactivate ();
+
+ return vt;
}
else
l_debug (seat, "Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());
Index: lightdm-1.25.0/src/x-server-local.c
===================================================================
--- lightdm-1.25.0.orig/src/x-server-local.c
+++ lightdm-1.25.0/src/x-server-local.c
@@ -511,6 +511,9 @@ x_server_local_start (DisplayServer *dis
if (server->priv->vt >= 0)
g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);
+ if (!server->priv->background)
+ x_server_local_set_background (server, "none");
+
if (server->priv->background)
g_string_append_printf (command, " -background %s", server->priv->background);
[Unit]
Description=Light Display Manager
Documentation=man:lightdm(1)
# Replaces getty.
Conflicts=getty@tty1.service
After=systemd-user-sessions.service getty@tty1.service dbus.service plymouth-quit.service livesys-late.service
After=getty@tty1.service
# Replaces plymouth-quit since it quits plymouth on its own.
Conflicts=plymouth-quit.service
After=plymouth-quit.service
# We need all the dependencies of the services we are replacing.
# Pulled from getty@.service and plymouth-quit.service (except
# for plymouth-quit-wait.service since it waits until plymouth
# is quit, which we do).
After=rc-local.service plymouth-start.service systemd-user-sessions.service livesys-late.service
# We need DBus to be present.
Requires=dbus.service
# LighDM takes responsibility for stopping plymouth, so if it fails
# for any reason, make sure plymouth still stops.
OnFailure=plymouth-quit.service
[Service]
ExecStart=/usr/sbin/lightdm
......
# leaving this disabled, means greeters will have to
# require lightdm too, instead of relying on -gobject,
# -qt to pull it in.
%bcond_with internal_deps
# FIXME: most tests currently fail
%bcond_with tests
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo "2.10")
%global major 1.24
%global minor 0
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo "2.10")
%global giturl https://github.com/CanonicalLtd/%{name}
Name: lightdm
Summary: A cross-desktop Display Manager
Version: %{major}.%{minor}
Version: 1.25.0
Release: 1%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
URL: https://launchpad.net/%{name}/%{major}
Source0: %{url}/%{version}/+download/%{name}-%{version}.tar.xz
URL: https://www.freedesktop.org/wiki/Software/LightDM/
Source0: %{giturl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source10: %{name}.pam
Source11: %{name}-autologin.pam
......@@ -39,13 +31,17 @@ Source25: 50-disable-guest.conf
## Downstream patches:
# hack in support for --nodaemon option
Patch0: %{name}-1.10.2-nodaemon_option.patch
Patch0: %{name}-1.25.0-nodaemon_option.patch
# disable saving to ~/.dmrc (runs afoul of selinux, http://bugzilla.redhat.com/963238 )
Patch1: %{name}-1.9.8-no_dmrc_save.patch
Patch1: %{name}-1.25.0-no_dmrc_save.patch
## upstreamable patches
# search for moc-qt5, use -qt=5|4 (instead of --qt=qt4|qt5)
Patch2: %{name}-1.18-qtchooser.patch
# use -qt=5|4 (instead of --qt=qt4|qt5)
Patch2: %{name}-1.25.0-qtchooser.patch
# add ACLOCAL_AMFLAGS to Makefile.am
Patch3: %{name}-1.25.0-Automake_ACLOCAL_AMFLAGS.patch
# stop plymouth when the greeter is ready
Patch4: %{name}-1.25.0-stop_plymouth_on_greeter.patch
BuildRequires: gettext
BuildRequires: gnome-common
......@@ -79,9 +75,7 @@ Requires: polkit-js-engine
Requires: systemd
Requires: xorg-x11-xinit
%if %{with internal_deps}
Requires: %{name}-greeter = 1.2
%endif
%{?systemd_requires}
......@@ -100,9 +94,7 @@ Lightdm is a display manager that:
%package gobject
Summary: LightDM GObject client library
%if !%{with internal_deps}
Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
Requires: glib2%{?_isa} >= %{glib2_version}
%description gobject
......@@ -120,9 +112,7 @@ Requires: %{name}-gobject%{?_isa} = %{version}-%{release}
%package qt
Summary: LightDM Qt4 client library
%if !%{with internal_deps}
Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description qt
......@@ -141,9 +131,7 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
%package qt5
Summary: LightDM Qt5 client library
%if !%{with internal_deps}
Requires: %{name}%{?_isa} = %{version}-%{release}
%endif
%{?_qt5:Requires: %{?_qt5}%{?_isa} >= %{_qt5_version}}
%description qt5
......@@ -162,8 +150,11 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%prep
%autosetup -p 1
# rpath hack
%{__sed} -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
# Make libtoolize happy.
%{__cat} %{_datadir}/aclocal/intltool.m4 > aclocal.m4
# Bootstrap
NOCONFIGURE=1 ./autogen.sh
%build
......@@ -223,8 +214,8 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%find_lang %{name} --with-gnome
%check
%if %{with tests}
%check
%make_build check ||:
%endif
......@@ -337,6 +328,14 @@ exit 0
%changelog
* Mon Nov 27 2017 Björn Esser <besser82@fedoraproject.org> - 1.25.0-1
- lightdm-1.25.0
- Enable smooth transition from plymouth to the greeter
- Enable coredumps from Xserver
- Change source url to github
- Explicitly require a greeter
- Enable explicit internal Requires
* Tue Sep 05 2017 Björn Esser <besser82@fedoraproject.org> - 1.24.0-1
- lightdm-1.24.0 (rhbz#1488270)
- Disable guest login as system default preset (CVE-2017-8900)
......
SHA512 (lightdm-1.24.0.tar.xz) = 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
SHA512 (lightdm-1.25.0.tar.gz) = 06db68d60c7973b0eb1d57bb4d57ce63a9c398443873bcbc0725da5b5884a75e6a935aa867c676c87d2c49e95bf0dd53220565d0f362f957f376c49daceadc28
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment