Commit ac3b6cab authored by Björn Esser's avatar Björn Esser
Browse files

lightdm-1.22.0 (#1421671)

parent d087d8c8
/lightdm-1.18.3.tar.xz
/lightdm-1.22.0.tar.xz
diff -up lightdm-1.18.0/data/lightdm.conf.fedora_config lightdm-1.18.0/data/lightdm.conf
--- lightdm-1.18.0/data/lightdm.conf.fedora_config 2015-11-02 21:26:23.000000000 -0600
+++ lightdm-1.18.0/data/lightdm.conf 2016-04-02 11:09:21.477204293 -0500
@@ -21,9 +21,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
#logind-check-graphical=false
#log-directory=/var/log/lightdm
@@ -88,7 +88,7 @@
#pam-service=lightdm
#pam-autologin-service=lightdm-autologin
#pam-greeter-service=lightdm-greeter
-#xserver-command=X
+#xserver-command=X -background none
#xmir-command=Xmir
#xserver-config=
#xserver-layout=
@@ -110,7 +110,7 @@
#allow-user-switching=true
#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.18.0/data/users.conf.fedora_config lightdm-1.18.0/data/users.conf
--- lightdm-1.18.0/data/users.conf.fedora_config 2015-08-09 18:30:00.000000000 -0500
+++ lightdm-1.18.0/data/users.conf 2016-04-02 11:09:21.477204293 -0500
@@ -9,6 +9,6 @@
# hidden-shells = Shells that indicate a user cannot login
#
[UserList]
-minimum-uid=500
+minimum-uid=1000
hidden-users=nobody nobody4 noaccess
hidden-shells=/bin/false /usr/sbin/nologin
diff -up lightdm-1.18.0/src/lightdm.c.fedora_config lightdm-1.18.0/src/lightdm.c
--- lightdm-1.18.0/src/lightdm.c.fedora_config 2015-11-18 17:15:37.000000000 -0600
+++ lightdm-1.18.0/src/lightdm.c 2016-04-02 11:09:21.478204320 -0500
@@ -1372,10 +1372,12 @@ main (int argc, char **argv)
g_free (config_path);
/* Set default values */
+ if (!config_has_key (config_get_instance (), "LightDM", "user-authority-in-system-dir"))
+ config_set_boolean (config_get_instance (), "LightDM", "user-authority-in-system-dir", TRUE);
if (!config_has_key (config_get_instance (), "LightDM", "start-default-seat"))
config_set_boolean (config_get_instance (), "LightDM", "start-default-seat", TRUE);
if (!config_has_key (config_get_instance (), "LightDM", "minimum-vt"))
- config_set_integer (config_get_instance (), "LightDM", "minimum-vt", 7);
+ config_set_integer (config_get_instance (), "LightDM", "minimum-vt", 1);
if (!config_has_key (config_get_instance (), "LightDM", "guest-account-script"))
config_set_string (config_get_instance (), "LightDM", "guest-account-script", "guest-account");
if (!config_has_key (config_get_instance (), "LightDM", "greeter-user"))
@@ -1393,7 +1395,7 @@ main (int argc, char **argv)
if (!config_has_key (config_get_instance (), "Seat:*", "pam-greeter-service"))
config_set_string (config_get_instance (), "Seat:*", "pam-greeter-service", "lightdm-greeter");
if (!config_has_key (config_get_instance (), "Seat:*", "xserver-command"))
- config_set_string (config_get_instance (), "Seat:*", "xserver-command", "X");
+ config_set_string (config_get_instance (), "Seat:*", "xserver-command", "X -background none");
if (!config_has_key (config_get_instance (), "Seat:*", "xmir-command"))
config_set_string (config_get_instance (), "Seat:*", "xmir-command", "Xmir");
if (!config_has_key (config_get_instance (), "Seat:*", "xserver-share"))
@@ -1415,7 +1417,7 @@ main (int argc, char **argv)
if (!config_has_key (config_get_instance (), "Seat:*", "user-session"))
config_set_string (config_get_instance (), "Seat:*", "user-session", USER_SESSION);
if (!config_has_key (config_get_instance (), "Seat:*", "session-wrapper"))
- config_set_string (config_get_instance (), "Seat:*", "session-wrapper", "lightdm-session");
+ config_set_string (config_get_instance (), "Seat:*", "session-wrapper", "/etc/X11/xinit/Xsession");
if (!config_has_key (config_get_instance (), "LightDM", "log-directory"))
config_set_string (config_get_instance (), "LightDM", "log-directory", default_log_dir);
g_free (default_log_dir);
# FIXME: most tests currently fail
#define tests 1
#global tests 1
%global major 1.22
%global minor 0
Name: lightdm
Summary: A cross-desktop Display Manager
Version: 1.18.3
Release: 3%{?dist}
Version: %{major}.%{minor}
Release: 1%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
URL: https://launchpad.net/lightdm/1.18
Source0: https://launchpad.net/lightdm/1.18/%{version}/+download/lightdm-%{version}.tar.xz
URL: https://launchpad.net/%{name}/%{major}
Source0: %{url}/%{version}/+download/%{name}-%{version}.tar.xz
Source1: lightdm.pam
Source2: lightdm-autologin.pam
......@@ -150,6 +153,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%build
%configure \
--disable-silent-rules \
--disable-static \
--enable-gtk-doc \
--enable-libaudit \
......@@ -161,15 +165,16 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
--with-greeter-user=lightdm \
--with-greeter-session=lightdm-greeter
make %{?_smp_mflags} V=1
%make_build
%install
make install DESTDIR=%{buildroot} INSTALL='install -p'
%make_install INSTALL='install -p'
## unpackaged files
# libtool cruft
rm -fv %{buildroot}%{_libdir}/lib*.la
find %{buildroot}%{_libdir} -type f -name '*.a' -print -delete
find %{buildroot}%{_libdir} -type f -name '*.la' -print -delete
# We don't ship AppAmor
rm -rfv %{buildroot}%{_sysconfdir}/apparmor.d/
# omit upstart support
......@@ -299,6 +304,9 @@ exit 0
%changelog
* Thu May 18 2017 Leigh Scott <leigh123linux@gmail.com> - 1.22.0-1
- lightdm-1.22.0 (#1421671)
* Sat Apr 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.18.3-3
- own %%{_datadir}/xgreeters
......
SHA512 (lightdm-1.18.3.tar.xz) = dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
SHA512 (lightdm-1.22.0.tar.xz) = 58be4428465dda66be8ba1cf4718ece40888af810bfd83d8ae059b3f5432ab7053373af2ecdcafd5e1fade77f0194eae7ded7d6c28e9c4be4aef56d9b432f0cc
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