[packages/gdm] Start update to 3.20.0 (does not work with our default Xwrapper.config)

megabajt megabajt at pld-linux.org
Mon Mar 28 20:43:25 CEST 2016


commit 336213b1de1628b798be4c44098469dfc09d6930
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Mon Mar 28 20:37:03 2016 +0200

    Start update to 3.20.0 (does not work with our default Xwrapper.config)
    
    Currently gdm fails to start with Xwrapper.config configured to use pam
    (works fine with allowed_users set to 'console'):
    
    Xorg.wrap[2062]: pam_console(xserver:auth): user xdm not a console user

 gdm-defaults.patch          |  2 +-
 gdm-launch-environment.pamd |  2 +-
 gdm.spec                    | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/gdm.spec b/gdm.spec
index c9562c9..ac4310d 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,13 +16,13 @@ Summary(pt_BR.UTF-8):	Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	3.16.1.1
-Release:	1
+Version:	3.20.0
+Release:	0.1
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.16/%{name}-%{version}.tar.xz
-# Source0-md5:	0b315af5fe0ee66055edb6f301510820
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.20/%{name}-%{version}.tar.xz
+# Source0-md5:	e3fa034ca4040a6db4f09eee93a2ea43
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -217,8 +217,10 @@ touch data/gdm.schemas.in.in
 	SYSTEMD_X_SERVER=/lib/systemd/systemd-multi-seat-x \
 	%{?debug:--enable-debug} \
 	--disable-console-helper \
+	--enable-gdm-xsession \
 	--disable-silent-rules \
 	%{__with_without systemd systemd} \
+	--with-initial-vt=9 \
 	--with-console-kit \
 	--enable-authentication-scheme=pam \
 	--with-pam-prefix=/etc \
@@ -331,7 +333,7 @@ fi
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
 %dir %{_sysconfdir}/gdm/PostLogin
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
+%attr(640,root,xdm) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/gdm.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gdm-*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.gdm
diff --git a/gdm-defaults.patch b/gdm-defaults.patch
index 729b917..3f62889 100644
--- a/gdm-defaults.patch
+++ b/gdm-defaults.patch
@@ -6,7 +6,7 @@
  
 +X_PATH="/usr/bin"
 +X_SERVER_PATH="/usr/bin"
-+X_SERVER="/usr/bin/Xorg vt9"
++X_SERVER="/usr/bin/X"
 +
  dnl ---------------------------------------------------------------------------
  dnl - Check for Xnest / Xephyr support
diff --git a/gdm-launch-environment.pamd b/gdm-launch-environment.pamd
index e1d6f39..ee7304a 100644
--- a/gdm-launch-environment.pamd
+++ b/gdm-launch-environment.pamd
@@ -9,7 +9,7 @@ auth        required    pam_permit.so
 password    required    pam_deny.so
 
 session     required    pam_loginuid.so
-session     required    pam_systemd.so kill-session-processes=1
+session     required    pam_systemd.so
 session     optional    pam_keyinit.so force revoke
 session     required    pam_succeed_if.so audit quiet_success user = xdm
 session     required    pam_permit.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdm.git/commitdiff/336213b1de1628b798be4c44098469dfc09d6930



More information about the pld-cvs-commit mailing list