Skip to content

GitLab

Commit 081780a0 authored by Rex Dieter's avatar Rex Dieter
Browse files

Merge branch 'f23' into epel7

parents bb8baf23 e594a09d
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 081780a0
/lightdm-1.10.5.tar.xz
/lightdm-1.10.6.tar.xz
lightdm-1.10.5-listen.patch deleted 100644 → 0
View file @ bb8baf23
diff -up lightdm-1.10.5/src/x-server-local.c.listen lightdm-1.10.5/src/x-server-local.c
--- lightdm-1.10.5/src/x-server-local.c.listen 2014-09-10 20:07:11.000000000 -0500
+++ lightdm-1.10.5/src/x-server-local.c 2015-08-28 09:31:23.198260337 -0500
@@ -498,6 +498,8 @@ x_server_local_start (DisplayServer *dis
}
else if (!server->priv->allow_tcp)
g_string_append (command, " -nolisten tcp");
+ else
+ g_string_append (command, " -listen tcp");
if (server->priv->vt >= 0)
g_string_append_printf (command, " vt%d -novtswitch", server->priv->vt);
lightdm-1.10.2-fedora_config.patch → lightdm-1.10.6-fedora_config.patch
View file @ 081780a0
diff -up lightdm-1.10.2/data/lightdm.conf.fedora_config lightdm-1.10.2/data/lightdm.conf
--- lightdm-1.10.2/data/lightdm.conf.fedora_config 2014-09-10 20:07:11.000000000 -0500
+++ lightdm-1.10.2/data/lightdm.conf 2014-10-06 09:00:51.305080416 -0500
@@ -21,9 +21,9 @@
diff -up lightdm-1.10.6/data/lightdm.conf.fedora_config lightdm-1.10.6/data/lightdm.conf
--- lightdm-1.10.6/data/lightdm.conf.fedora_config 2015-10-27 22:30:50.000000000 -0500
+++ lightdm-1.10.6/data/lightdm.conf 2015-11-20 07:51:36.852243441 -0600
@@ -22,9 +22,9 @@
#start-default-seat=true
#greeter-user=lightdm
#minimum-display-number=0
......@@ -13,16 +13,16 @@ diff -up lightdm-1.10.2/data/lightdm.conf.fedora_config lightdm-1.10.2/data/ligh
#guest-account-script=guest-account
#logind-load-seats=false
#logind-check-graphical=false
@@ -84,7 +84,7 @@
@@ -87,7 +87,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-layout=
#xserver-config=
#xserver-allow-tcp=false
@@ -96,7 +96,7 @@
@@ -100,7 +100,7 @@
#xdmcp-key=
#unity-compositor-command=unity-system-compositor
#unity-compositor-timeout=60
......@@ -31,7 +31,7 @@ diff -up lightdm-1.10.2/data/lightdm.conf.fedora_config lightdm-1.10.2/data/ligh
#greeter-hide-users=false
#greeter-allow-guest=true
#greeter-show-manual-login=false
@@ -105,7 +105,7 @@
@@ -109,7 +109,7 @@
#allow-user-switching=true
#allow-guest=true
#guest-session=
......@@ -40,9 +40,9 @@ diff -up lightdm-1.10.2/data/lightdm.conf.fedora_config lightdm-1.10.2/data/ligh
#greeter-wrapper=
#guest-wrapper=
#display-setup-script=
diff -up lightdm-1.10.2/data/users.conf.fedora_config lightdm-1.10.2/data/users.conf
--- lightdm-1.10.2/data/users.conf.fedora_config 2014-05-19 15:11:31.000000000 -0500
+++ lightdm-1.10.2/data/users.conf 2014-10-06 08:59:37.425129841 -0500
diff -up lightdm-1.10.6/data/users.conf.fedora_config lightdm-1.10.6/data/users.conf
--- lightdm-1.10.6/data/users.conf.fedora_config 2014-05-19 15:11:31.000000000 -0500
+++ lightdm-1.10.6/data/users.conf 2015-11-20 07:50:40.104978136 -0600
@@ -9,6 +9,6 @@
# hidden-shells = Shells that indicate a user cannot login
#
......
lightdm-1.10.5-qtchooser.patch → lightdm-1.10.6-qtchooser.patch
View file @ 081780a0
diff -up lightdm-1.10.5/configure.ac.qtchooser lightdm-1.10.5/configure.ac
--- lightdm-1.10.5/configure.ac.qtchooser 2015-03-09 22:52:50.000000000 -0500
+++ lightdm-1.10.5/configure.ac 2015-09-08 22:05:51.908392265 -0500
diff -up lightdm-1.10.6/configure.ac.qtchooser lightdm-1.10.6/configure.ac
--- lightdm-1.10.6/configure.ac.qtchooser 2015-11-19 21:07:45.000000000 -0600
+++ lightdm-1.10.6/configure.ac 2015-11-25 10:15:58.362197081 -0600
@@ -107,7 +107,7 @@ if test x"$enable_liblightdm_qt4" = "xye
[compile_liblightdm_qt4=yes
AC_CHECK_TOOLS(MOC4, [moc-qt4 moc])
......@@ -22,10 +22,10 @@ diff -up lightdm-1.10.5/configure.ac.qtchooser lightdm-1.10.5/configure.ac
fi
],
[if test "x$enable_liblightdm_qt5" != xauto; then
diff -up lightdm-1.10.5/configure.qtchooser lightdm-1.10.5/configure
--- lightdm-1.10.5/configure.qtchooser 2015-09-08 22:05:51.946392497 -0500
+++ lightdm-1.10.5/configure 2015-09-08 22:07:22.799948066 -0500
@@ -16924,7 +16924,7 @@ esac
diff -up lightdm-1.10.6/configure.qtchooser lightdm-1.10.6/configure
--- lightdm-1.10.6/configure.qtchooser 2015-11-19 21:26:56.000000000 -0600
+++ lightdm-1.10.6/configure 2015-11-25 10:15:58.378197158 -0600
@@ -16938,7 +16938,7 @@ esac
fi
if test x"$(readlink $(which $MOC4))" = xqtchooser; then
......@@ -34,7 +34,7 @@ diff -up lightdm-1.10.5/configure.qtchooser lightdm-1.10.5/configure
fi
if test "x$compile_liblightdm_gobject" != xyes; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -17112,7 +17112,7 @@ fi
@@ -17126,7 +17126,7 @@ fi
fi
if test -z "$MOC5"; then
ac_ct_MOC5=$MOC5
......@@ -43,7 +43,7 @@ diff -up lightdm-1.10.5/configure.qtchooser lightdm-1.10.5/configure
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -17168,7 +17168,7 @@ esac
@@ -17182,7 +17182,7 @@ esac
fi
if test x"$(readlink $(which $MOC5))" = xqtchooser; then
......
lightdm.pam.f19 deleted 100644 → 0
View file @ bb8baf23
#%PAM-1.0
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
auth required pam_env.so
auth substack system-auth
-auth optional pam_gnome_keyring.so
-auth optional pam_mate_keyring.so
-auth optional pam_kwallet5.so
-auth optional pam_kwallet.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session optional pam_console.so
-session optional pam_ck_connector.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
-session optional pam_gnome_keyring.so auto_start
-session optional pam_mate_keyring.so auto_start
-session optional pam_kwallet5.so
-session optional pam_kwallet.so
session include system-auth
session optional pam_lastlog.so silent
session include postlogin
lightdm.spec
View file @ 081780a0
# Disable hardening, crashes https://bugzilla.redhat.com/956868
# seems to be ok on f23+ so, allow there at least -- rex
%if 0%{?fedora} < 23
%undefine _hardened_build
%endif
# FIXME: most tests currently fail
#define tests 1
Name: lightdm
Summary: A cross-desktop Display Manager
Version: 1.10.5
Release: 6%{?dist}
Version: 1.10.6
Release: 2%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
......@@ -13,14 +18,13 @@ URL: https://launchpad.net/lightdm/1.10
Source0: https://launchpad.net/lightdm/1.10/%{version}/+download/lightdm-%{version}.tar.xz
Source1: lightdm.pam
Source10: lightdm.pam.f19
Source2: lightdm-autologin.pam
Source3: lightdm-tmpfiles.conf
Source4: lightdm.service
Source6: lightdm.rules
## Downstream patches:
Patch10: lightdm-1.10.2-fedora_config.patch
Patch10: lightdm-1.10.6-fedora_config.patch
# hack in support for --nodaemon option
Patch11: lightdm-1.10.2-nodaemon_option.patch
# disable saving to ~/.dmrc (runs afoul of selinux, http://bugzilla.redhat.com/963238 )
......@@ -28,10 +32,7 @@ Patch12: lightdm-1.9.8-no_dmrc_save.patch
## upstreamable patches
# search for moc-qt5, use -qt=5|4 (instead of --qt=qt4|qt5)
Patch51: lightdm-1.10.5-qtchooser.patch
# Lightdm runs without -nolisten but X not listening
# https://bugzilla.redhat.com/show_bug.cgi?id=1255743
Patch52: lightdm-1.10.5-listen.patch
Patch51: lightdm-1.10.6-qtchooser.patch
# patch51
BuildRequires: gettext
......@@ -40,6 +41,7 @@ BuildRequires: gtk-doc itstool
BuildRequires: intltool
BuildRequires: libgcrypt-devel
BuildRequires: pam-devel
BuildRequires: pkgconfig(audit)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gio-2.0) >= 2.26
BuildRequires: pkgconfig(gio-unix-2.0)
......@@ -139,9 +141,6 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%patch12 -p1 -b .no_dmrc_save
%patch51 -p1 -b .qtchooser
%if 0%{?fedora} > 21
%patch52 -p1 -b .listen
%endif
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
......@@ -154,7 +153,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
--enable-liblightdm-qt \
--enable-liblightdm-qt5 \
--enable-introspection \
--enable-tests \
%{?tests:--enable-tests}%{!?tests:--disable-tests} \
--with-greeter-user=lightdm \
--with-greeter-session=lightdm-greeter
......@@ -173,11 +172,7 @@ rm -rfv %{buildroot}%{_sysconfdir}/apparmor.d/
rm -rfv %{buildroot}%{_sysconfdir}/init
# install pam file
%if 0%{?fedora} == 19
install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/lightdm
%else
install -Dpm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm
%endif
install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
install -Dpm 644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/lightdm.conf
......@@ -199,7 +194,9 @@ install -m644 -p -D %{SOURCE6} %{buildroot}%{_datadir}/polkit-1/rules.d/lightdm.
%check
# FIXME: most of these currently fail :( -- rex
%if 0%{?tests:1}
make check ||:
%endif
%pre
......@@ -287,6 +284,18 @@ exit 0
%changelog
* Wed Nov 25 2015 Rex Dieter <rdieter@fedoraproject.org> - 1.10.6-2
- enable libaudit support
- (re)enable hardening for f23+, at least (#956868)
- disable tests
- drop now-unused lightdm.pam.f19
* Fri Nov 20 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.6-1
- 1.10.6
* Mon Oct 12 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-7
- use upstream listen.patch instead
* Tue Oct 06 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-6
- drop listen.patch for < f22 (#1269247)
......
sources
View file @ 081780a0
5feefe4737ef8c85ab52c13954e00ea6 lightdm-1.10.5.tar.xz
90e9f81b6edb9a68d4021df6154ee387 lightdm-1.10.6.tar.xz
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