avatar
tremod has added 209a402257
Update to 3.26.2.1
... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,2 +1,2 @@
1 1
sources:
2
  gdm-3.12.2.tar.xz: de86dad27515539ed5b1d05c487b1caac4278511
2
  gdm-3.26.2.1.tar.xz: f0ecbe867bd0ef2b085ef79a56655f51bbef3193
view file @ 638a745cc8
... ... --- a/0301-Novell-Look-at-the-current-runlevel-before-managing-.patch
... ... +++ /dev/null
... ... @@ -1,73 +0,0 @@
0
From d179dc69375d73d10c212c428afb23d7b232c890 Mon Sep 17 00:00:00 2001
1
From: Colin Guthrie <colin@mageia.org>
2
Date: Tue, 30 Aug 2011 20:27:14 +0100
3
Subject: [PATCH 301/303] Novell: Look at the current runlevel before managing
4
 the display again, so we don't do this when
5
 shutting down or rebooting
6
7
Mageia Note: This will need rewritten for systemd.
8
bnc540482 bgo599180 vuntz@opensuse.org
9
---
10
 daemon/gdm-static-display.c | 32 +++++++++++++++++++++++++++++---
11
 1 file changed, 29 insertions(+), 3 deletions(-)
12
13
diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c
14
index 3065ce6..a61ec1f 100644
15
--- a/daemon/gdm-static-display.c
16
+++ b/daemon/gdm-static-display.c
17
@@ -26,6 +26,7 @@
18
 #include <fcntl.h>
19
 #include <pwd.h>
20
 #include <unistd.h>
21
+#include <utmp.h>
22
 #include <string.h>
23
 #include <signal.h>
24
 #include <sys/stat.h>
25
@@ -92,6 +93,29 @@ gdm_static_display_manage (GdmDisplay *display)
26
 }
27
 
28
 static gboolean
29
+gdm_static_display_should_manage_again (void)
30
+{
31
+        struct utmp *ut;
32
+
33
+        setutent();
34
+        while ((ut = getutent()) != NULL) {
35
+                if (ut->ut_type == RUN_LVL) {
36
+                        char current;
37
+                        current = ut->ut_pid % 256;
38
+                        endutent();
39
+
40
+                        if (current == '0' || current == '6')
41
+                                return FALSE;
42
+                        return TRUE;
43
+                }
44
+        }
45
+
46
+        endutent();
47
+
48
+        return TRUE;
49
+}
50
+
51
+static gboolean
52
 gdm_static_display_finish (GdmDisplay *display)
53
 {
54
         int status;
55
@@ -104,9 +128,11 @@ gdm_static_display_finish (GdmDisplay *display)
56
         /* restart static displays */
57
         gdm_display_unmanage (display);
58
 
59
-        status = gdm_display_get_status (display);
60
-        if (status != GDM_DISPLAY_FAILED) {
61
-                gdm_display_manage (display);
62
+        if (gdm_static_display_should_manage_again ()) {
63
+                status = gdm_display_get_status (display);
64
+                if (status != GDM_DISPLAY_FAILED) {
65
+                        gdm_display_manage (display);
66
+                }
67
         }
68
 
69
         return TRUE;
... ... ---
70
1.7.11.4
71
view file @ 638a745cc8
... ... --- a/0302-Fix-gdm-pam.d-configs-3.12.2.patch
... ... +++ /dev/null
... ... @@ -1,153 +0,0 @@
0
diff -urN gdm-3.12.2.orig/data/pam-redhat/gdm-autologin.pam gdm-3.12.2/data/pam-redhat/gdm-autologin.pam
1
--- gdm-3.12.2.orig/data/pam-redhat/gdm-autologin.pam	2014-05-29 16:20:27.379182435 +0400
2
+++ gdm-3.12.2/data/pam-redhat/gdm-autologin.pam	2014-05-29 16:41:36.000000000 +0400
3
@@ -1,14 +1,11 @@
4
- #%PAM-1.0
5
+#%PAM-1.0
6
 auth       required    pam_env.so
7
 auth       required    pam_permit.so
8
 account    required    pam_nologin.so
9
 account    include     system-auth
10
 password   include     system-auth
11
-session    required    pam_selinux.so close
12
 session    required    pam_loginuid.so
13
 session    optional    pam_console.so
14
--session    optional    pam_ck_connector.so
15
-session    required    pam_selinux.so open
16
 session    optional    pam_keyinit.so force revoke
17
 session    required    pam_namespace.so
18
 session    include     system-auth
19
diff -urN gdm-3.12.2.orig/data/pam-redhat/gdm-fingerprint.pam gdm-3.12.2/data/pam-redhat/gdm-fingerprint.pam
20
--- gdm-3.12.2.orig/data/pam-redhat/gdm-fingerprint.pam	2014-05-29 16:20:27.379182435 +0400
21
+++ gdm-3.12.2/data/pam-redhat/gdm-fingerprint.pam	2014-05-29 16:41:36.000000000 +0400
22
@@ -1,15 +1,20 @@
23
-auth        substack      fingerprint-auth
24
+# Sample PAM file for doing fingerprint authentication.
25
+# Distros should replace this with what makes sense for them.
26
+auth        required      pam_env.so
27
+auth        required      pam_fprintd.so
28
+auth        sufficient    pam_succeed_if.so uid >= 500 quiet
29
+auth        required      pam_deny.so
30
 
31
-account     required      pam_nologin.so
32
-account     include       fingerprint-auth
33
+account     required      pam_unix.so
34
+account     sufficient    pam_localuser.so
35
+account     sufficient    pam_succeed_if.so uid < 500 quiet
36
+account     required      pam_permit.so
37
 
38
-password    include       fingerprint-auth
39
+password    required      pam_deny.so
40
 
41
-session     required      pam_selinux.so close
42
 session     required      pam_loginuid.so
43
 session     optional      pam_console.so
44
--session    optional    pam_ck_connector.so
45
-session     required      pam_selinux.so open
46
 session     optional      pam_keyinit.so force revoke
47
 session     required      pam_namespace.so
48
-session     include       fingerprint-auth
49
+session     required      pam_limits.so
50
+session     required      pam_unix.so
51
diff -urN gdm-3.12.2.orig/data/pam-redhat/gdm-launch-environment.pam gdm-3.12.2/data/pam-redhat/gdm-launch-environment.pam
52
--- gdm-3.12.2.orig/data/pam-redhat/gdm-launch-environment.pam	2014-05-29 16:20:27.379182435 +0400
53
+++ gdm-3.12.2/data/pam-redhat/gdm-launch-environment.pam	2014-05-29 16:41:36.000000000 +0400
54
@@ -4,5 +4,6 @@
55
 account    required    pam_nologin.so
56
 account    include     system-auth
57
 password   include     system-auth
58
+session    optional    pam_console.so
59
 session    optional    pam_keyinit.so force revoke
60
 session    include     system-auth
61
diff -urN gdm-3.12.2.orig/data/pam-redhat/gdm.pam gdm-3.12.2/data/pam-redhat/gdm.pam
62
--- gdm-3.12.2.orig/data/pam-redhat/gdm.pam	2014-05-29 16:20:27.379182435 +0400
63
+++ gdm-3.12.2/data/pam-redhat/gdm.pam	2014-05-29 16:41:36.000000000 +0400
64
@@ -1,10 +1,14 @@
65
 #%PAM-1.0
66
 auth       required    pam_env.so
67
 auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
68
-auth       include     system-auth
69
+auth       substack    system-auth
70
+auth       optional    pam_gnome_keyring.so
71
+account    required    pam_nologin.so
72
 account    include     system-auth
73
 password   include     system-auth
74
-session    optional    pam_keyinit.so force revoke
75
-session    include     system-auth
76
 session    required    pam_loginuid.so
77
 session    optional    pam_console.so
78
+session    optional    pam_keyinit.so force revoke
79
+session    required    pam_namespace.so
80
+session    include     system-auth
81
+session    optional    pam_gnome_keyring.so auto_start
82
diff -urN gdm-3.12.2.orig/data/pam-redhat/gdm-password.pam gdm-3.12.2/data/pam-redhat/gdm-password.pam
83
--- gdm-3.12.2.orig/data/pam-redhat/gdm-password.pam	2014-05-29 16:20:27.379182435 +0400
84
+++ gdm-3.12.2/data/pam-redhat/gdm-password.pam	2014-05-29 16:41:36.000000000 +0400
85
@@ -1,19 +1,15 @@
86
-auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
87
-auth        substack      password-auth
88
-auth        optional      pam_gnome_keyring.so
89
-
90
-account     required      pam_nologin.so
91
-account     include       password-auth
92
-
93
-password    substack       password-auth
94
--password   optional       pam_gnome_keyring.so use_authtok
95
-
96
-session     required      pam_selinux.so close
97
-session     required      pam_loginuid.so
98
-session     optional      pam_console.so
99
--session    optional    pam_ck_connector.so
100
-session     required      pam_selinux.so open
101
-session     optional      pam_keyinit.so force revoke
102
-session     required      pam_namespace.so
103
-session     include       password-auth
104
-session     optional      pam_gnome_keyring.so auto_start
105
+#%PAM-1.0
106
+auth       required    pam_env.so
107
+auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
108
+auth       substack    system-auth
109
+auth       optional    pam_gnome_keyring.so
110
+account    required    pam_nologin.so
111
+account    include     system-auth
112
+password   include     system-auth
113
+session    required    pam_loginuid.so
114
+session    optional    pam_console.so
115
+session    optional    pam_keyinit.so force revoke
116
+session    required    pam_namespace.so
117
+session    include     system-auth
118
+session    optional    pam_gnome_keyring.so auto_start
119
+auth       optional pam_group.so
120
diff -urN gdm-3.12.2.orig/data/pam-redhat/gdm-smartcard.pam gdm-3.12.2/data/pam-redhat/gdm-smartcard.pam
121
--- gdm-3.12.2.orig/data/pam-redhat/gdm-smartcard.pam	2014-05-29 16:20:27.379182435 +0400
122
+++ gdm-3.12.2/data/pam-redhat/gdm-smartcard.pam	2014-05-29 16:41:36.000000000 +0400
123
@@ -1,15 +1,21 @@
124
-auth        substack      smartcard-auth
125
+# Sample PAM file for doing smartcard authentication.
126
+# Distros should replace this with what makes sense for them.
127
+auth        required      pam_env.so
128
+auth        [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card card_only
129
+auth        requisite     pam_succeed_if.so uid >= 500 quiet
130
+auth        required      pam_deny.so
131
 
132
-account     required      pam_nologin.so
133
-account     include       smartcard-auth
134
+account     required      pam_unix.so
135
+account     sufficient    pam_localuser.so
136
+account     sufficient    pam_succeed_if.so uid < 500 quiet
137
+account     required      pam_permit.so
138
 
139
-password    include       smartcard-auth
140
+password    optional      pam_pkcs11.so
141
+password    requisite     pam_cracklib.so try_first_pass retry=3 type=
142
 
143
-session     required      pam_selinux.so close
144
 session     required      pam_loginuid.so
145
 session     optional      pam_console.so
146
--session    optional    pam_ck_connector.so
147
-session     required      pam_selinux.so open
148
 session     optional      pam_keyinit.so force revoke
149
 session     required      pam_namespace.so
150
-session     include       smartcard-auth
151
+session     required      pam_limits.so
152
+session     required      pam_unix.so
view file @ 209a402257
... ... --- /dev/null
... ... +++ b/0302-Fix-gdm-pam.d-configs.patch
... ... @@ -0,0 +1,166 @@
1
From 485c74c9689854a3d56e58f30114954d493ddfee Mon Sep 17 00:00:00 2001
2
From: Colin Guthrie <colin@mageia.org>
3
Date: Tue, 30 Aug 2011 20:28:57 +0100
4
Subject: [PATCH 302/303] Fix gdm pam.d configs.
5
6
This ensures that pam_console is included in the gdm-welcome pam.d
7
to allow e.g. the PulseAudio spawned by gdm to access bluetooth h/w.
8
While this isn't in itself necessarily majorly useful, it does solve a
9
problem where by bluetoothd is enabled, but not yet started when
10
gdm's PulseAudio is launched. This will cause bus activation to
11
kick in and attempt to lauch bluetoothd, but due to the default
12
bluez dbus policy gdm will not be allowed to talk to to the
13
necessary interfaces resulting in an activation failure and
14
a 30s timeout before gdm appears.
15
 References:
16
  * https://bugs.mageia.org/show_bug.cgi?id=5148
17
18
The other fix is to ensure that pam_gnome_keyring.so is included
19
after system-auth (or rather after pam_systemd specifically) to
20
ensure that the XDG_RUNTIME_DIR variable is set.
21
 References:
22
  * http://pkgs.fedoraproject.org/gitweb/?p=gdm.git;a=commit;h=12886d9c0f01e4f52eea9a3b63602c996bd7f084
23
  * https://bugzilla.gnome.org/show_bug.cgi?id=655867
24
  * http://mail.gnome.org/archives/distributor-list/2012-April/msg00000.html
25
26
Also add in pam_namespace.so which is needed for xguest.
27
 References:
28
  * https://bugs.mageia.org/show_bug.cgi?id=4950
29
---
30
 data/pam-redhat/gdm-autologin.pam          |  5 +----
31
 data/pam-redhat/gdm-fingerprint.pam        | 21 +++++++++++++--------
32
 data/pam-redhat/gdm-launch-environment.pam |  1 +
33
 data/pam-redhat/gdm-password.pam           | 15 +++++++--------
34
 data/pam-redhat/gdm-smartcard.pam          | 22 ++++++++++++++--------
35
 data/pam-redhat/gdm.pam                    |  3 +++
36
 6 files changed, 39 insertions(+), 28 deletions(-)
37
38
diff --git a/data/pam-redhat/gdm-autologin.pam b/data/pam-redhat/gdm-autologin.pam
39
index 08d4543..f884c1d 100644
40
--- a/data/pam-redhat/gdm-autologin.pam
41
+++ b/data/pam-redhat/gdm-autologin.pam
42
@@ -1,10 +1,8 @@
43
 account    required    pam_nologin.so
44
 account    include     system-auth
45
 password   include     system-auth
46
-session    required    pam_selinux.so close
47
 session    required    pam_loginuid.so
48
 session    optional    pam_console.so
49
-session    required    pam_selinux.so open
50
 session    optional    pam_keyinit.so force revoke
51
 session    required    pam_namespace.so
52
 session    include     system-auth
53
diff --git a/data/pam-redhat/gdm-fingerprint.pam b/data/pam-redhat/gdm-fingerprint.pam
54
index ee0635d..425cd49 100644
55
--- a/data/pam-redhat/gdm-fingerprint.pam
56
+++ b/data/pam-redhat/gdm-fingerprint.pam
57
@@ -1,16 +1,22 @@
58
-auth        substack      fingerprint-auth
59
+# Sample PAM file for doing fingerprint authentication.
60
+# Distros should replace this with what makes sense for them.
61
+auth        required      pam_env.so
62
+auth        required      pam_fprintd.so
63
+auth        sufficient    pam_succeed_if.so uid >= 500 quiet
64
+auth        required      pam_deny.so
65
 auth        include       postlogin
66
 
67
-account     required      pam_nologin.so
68
-account     include       fingerprint-auth
69
+account     required      pam_unix.so
70
+account     sufficient    pam_localuser.so
71
+account     sufficient    pam_succeed_if.so uid < 500 quiet
72
+account     required      pam_permit.so
73
 
74
-password    include       fingerprint-auth
75
+password    required      pam_deny.so
76
 
77
-session     required      pam_selinux.so close
78
 session     required      pam_loginuid.so
79
 session     optional      pam_console.so
80
-session     required      pam_selinux.so open
81
 session     optional      pam_keyinit.so force revoke
82
 session     required      pam_namespace.so
83
-session     include       fingerprint-auth
84
+session     required      pam_limits.so
85
+session     required      pam_unix.so
86
 session     include       postlogin
87
diff --git a/data/pam-redhat/gdm-launch-environment.pam b/data/pam-redhat/gdm-launch-environment.pam
88
index f1811f1..66ab89e 100644
89
--- a/data/pam-redhat/gdm-launch-environment.pam
90
+++ b/data/pam-redhat/gdm-launch-environment.pam
91
@@ -4,6 +4,7 @@
92
 auth       include     postlogin
93
 account    required    pam_permit.so
94
 password   required    pam_permit.so
95
+session    optional    pam_console.so
96
 session    optional    pam_keyinit.so force revoke
97
 session    include     system-auth
98
 session    include     postlogin
99
diff --git a/data/pam-redhat/gdm-password.pam b/data/pam-redhat/gdm-password.pam
100
index b95ca16..cbcc3d9 100644
101
--- a/data/pam-redhat/gdm-password.pam
102
+++ b/data/pam-redhat/gdm-password.pam
103
@@ -1,20 +1,20 @@
104
-auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
105
-auth        substack      password-auth
106
+#%PAM-1.0
107
+auth        required      pam_env.so
108
+auth        sufficient    pam_succeed_if.so user ingroup nopasswdlogin
109
+auth        substack      system-auth
110
 auth        optional      pam_gnome_keyring.so
111
 auth        include       postlogin
112
 
113
 account     required      pam_nologin.so
114
-account     include       password-auth
115
+account     include       system-auth
116
 
117
-password    substack       password-auth
118
--password   optional       pam_gnome_keyring.so use_authtok
119
+password    substack       system-auth
120
+password   optional       pam_gnome_keyring.so use_authtok
121
 
122
-session     required      pam_selinux.so close
123
 session     required      pam_loginuid.so
124
 session     optional      pam_console.so
125
-session     required      pam_selinux.so open
126
 session     optional      pam_keyinit.so force revoke
127
 session     required      pam_namespace.so
128
-session     include       password-auth
129
+session     include       system-auth
130
 session     optional      pam_gnome_keyring.so auto_start
131
 session     include       postlogin
132
diff --git a/data/pam-redhat/gdm-smartcard.pam b/data/pam-redhat/gdm-smartcard.pam
133
index d49eef9..306113c 100644
134
--- a/data/pam-redhat/gdm-smartcard.pam
135
+++ b/data/pam-redhat/gdm-smartcard.pam
136
@@ -1,16 +1,23 @@
137
-auth        substack      smartcard-auth
138
+# Sample PAM file for doing smartcard authentication.
139
+# Distros should replace this with what makes sense for them.
140
+auth        required      pam_env.so
141
+auth        [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card card_only
142
+auth        requisite     pam_succeed_if.so uid >= 500 quiet
143
+auth        required      pam_deny.so
144
 auth        include       postlogin
145
 
146
-account     required      pam_nologin.so
147
-account     include       smartcard-auth
148
+account     required      pam_unix.so
149
+account     sufficient    pam_localuser.so
150
+account     sufficient    pam_succeed_if.so uid < 500 quiet
151
+account     required      pam_permit.so
152
 
153
-password    include       smartcard-auth
154
+password    optional      pam_pkcs11.so
155
+password    requisite     pam_cracklib.so try_first_pass retry=3 type=
156
 
157
-session     required      pam_selinux.so close
158
 session     required      pam_loginuid.so
159
 session     optional      pam_console.so
160
-session     required      pam_selinux.so open
161
 session     optional      pam_keyinit.so force revoke
162
 session     required      pam_namespace.so
163
-session     include       smartcard-auth
164
+session     required      pam_limits.so
165
+session     required      pam_unix.so
166
 session     include       postlogin
view file @ 638a745cc8
... ... --- a/gdm-3.8.1.1-drop-plymouth-conflicts.patch
... ... +++ /dev/null
... ... @@ -1,11 +0,0 @@
0
diff -urN gdm-3.8.1.1.orig/data/gdm.service.in gdm-3.8.1.1/data/gdm.service.in
1
--- gdm-3.8.1.1.orig/data/gdm.service.in	2013-10-09 14:15:43.563513260 +0400
2
+++ gdm-3.8.1.1/data/gdm.service.in	2013-10-09 14:16:28.030515138 +0400
3
@@ -1,6 +1,6 @@
4
 [Unit]
5
 Description=GNOME Display Manager
6
-Conflicts=getty@tty@GDM_INITIAL_VT@.service plymouth-quit.service
7
+Conflicts=getty@tty@GDM_INITIAL_VT@.service
8
 After=systemd-user-sessions.service getty@tty@GDM_INITIAL_VT@.service plymouth-quit.service
9
 
10
 [Service]
... ... --- a/gdm.spec
... ... +++ b/gdm.spec
... ... @@ -10,8 +10,8 @@
10 10
11 11
Summary:	The GNOME Display Manager
12 12
Name:		gdm
13
Version:	3.12.2
14
Release:	4
13
Version:	3.26.2.1
14
Release:	1
15 15
Epoch:		2
16 16
License:	GPLv2+
17 17
Group:		Graphical desktop/GNOME
... ... @@ -19,11 +19,10 @@ Url: http://www.gnome.org/projects/gdm/
19 19
Source0:	ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
20 20
Source1:	org.gnome.login-screen.gschema.override
21 21
Source2:	rosa-logo.png
22
# git format-patch --start-number 300 mga-3.1.2-plymouth..mga-3.1.2-patches
23
Patch0301:	0301-Novell-Look-at-the-current-runlevel-before-managing-.patch
24
Patch0302:	0302-Fix-gdm-pam.d-configs-3.12.2.patch
22
# Import from Mageia
23
Patch0302:	0302-Fix-gdm-pam.d-configs.patch
25 24
Patch0303:	0303-Read-.xsetup-scripts.patch
26
Patch0304:	systemd.patch
25
#----------------------------------------------
27 26
BuildRequires:	dconf
28 27
BuildRequires:	gnome-common
29 28
BuildRequires:	intltool
... ... @@ -90,10 +89,9 @@ several different X sessions on your local machine at the same time.
89 89
%doc AUTHORS COPYING NEWS README
90 90
%_sysconfdir/dbus-1/system.d/gdm.conf
91 91
%{_bindir}/gdm-screenshot
92
%{_bindir}/gdmflexiserver
92 93
%{_sbindir}/gdm
93 94
%dir %{_sysconfdir}/X11/gdm
94
%{_sysconfdir}/gdm
95
%config(noreplace) %{_sysconfdir}/pam.d/gdm
96 95
%config(noreplace) %{_sysconfdir}/pam.d/gdm-autologin
97 96
%config(noreplace) %{_sysconfdir}/pam.d/gdm-pin
98 97
%config(noreplace) %{_sysconfdir}/pam.d/gdm-fingerprint
... ... @@ -108,11 +106,10 @@ several different X sessions on your local machine at the same time.
106 106
%config(noreplace) %{_sysconfdir}/X11/gdm/PostSession
107 107
%config(noreplace) %{_sysconfdir}/X11/gdm/PostLogin
108 108
%config(noreplace) %{_sysconfdir}/X11/gdm/Init
109
%{_libexecdir}/gdm-host-chooser
110 109
%{_libexecdir}/gdm-session-worker
111
%{_libexecdir}/gdm-simple-chooser
112
%{_libexecdir}/gdm/gdmflexiserver
113
%dir %{_libdir}/gdm
110
%{_libexecdir}/gdm-wayland-session
111
%{_libexecdir}/gdm-x-session
112
%{_libexecdir}/security/pam_gdm.so
114 113
%{_datadir}/pixmaps/*
115 114
%{_datadir}/gdm
116 115
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
... ... @@ -125,16 +122,9 @@ several different X sessions on your local machine at the same time.
122 122
%attr(700,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local/share
123 123
%attr(700,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local/share/applications
124 124
%{_datadir}/dconf/profile/gdm
125
#%ghost %{_sysconfdir}/dconf/db/%{name}
126
#%dir %{_sysconfdir}/dconf/db/gdm.d
127
#%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings
128
#%dir %{_sysconfdir}/dconf/db/gdm.d/locks
129
%{_datadir}/gnome-session/sessions/gdm-shell.session
125
%{_datadir}/gnome-session/sessions/gnome-login.session
130 126
%dir %{_var}/log/gdm
131 127
%{_datadir}/icons/hicolor/*/apps/gdm*
132
# (cg) Note: Ship this, but lets not enable it or do anything fancy
133
# until we fully redo any prefdm stuff and have units for all DMs
134
# we support.
135 128
%{_unitdir}/gdm.service
136 129
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.override
137 130
... ... @@ -143,33 +133,11 @@ several different X sessions on your local machine at the same time.
133 133
%_pre_groupadd xgrp gdm
134 134
135 135
%post
136
# avoiding conflict with lightdm
137
if [ $1 -eq 1 ] ; then \
138
update-alternatives --install %{_bindir}/gdmflexiserver gdmflexiserver %{_libexecdir}/%{name}/gdmflexiserver 30
139
fi
140
141
if [ -f /%{_sysconfdir}/X11/xdm/Xsession -a ! -x /%{_sysconfdir}/X11/xdm/Xsession ]; then
142
        chmod +x /%{_sysconfdir}/X11/xdm/Xsession
143
fi
144
if [ -x /usr/sbin/chksession ]; then /usr/sbin/chksession -g || true; fi
145
146
%systemd_post gdm.service
147
148 136
%{_sbindir}/gdm-safe-restart >/dev/null 2>&1 || :
149 137
150 138
%postun
151 139
%_postun_userdel gdm
152 140
%_postun_groupdel xgrp gdm
153
%systemd_postun gdm.service
154
155
%preun
156
if [ $1 -ge 0 ] ; then \
157
	if [ ! -e %{_libexecdir}/%{name}/gdmflexiserver ]; then
158
		update-alternatives --remove gdmflexiserver %{_libexecdir}/%{name}/gdmflexiserver
159
	fi
160
fi
161
%systemd_preun gdm.service
162
163 141
#----------------------------------------------------------------------------
164 142
165 143
%package -n %{libname}
... ... @@ -214,6 +182,7 @@ developing applications that use %{name}.
182 182
%{_includedir}/gdm
183 183
%{_libdir}/libgdm.so
184 184
%{_libdir}/pkgconfig/gdm.pc
185
%{_libdir}/pkgconfig/gdm-pam-extensions.pc
185 186
%{_datadir}/gir-1.0/Gdm-%{gmajor}.gir
186 187
187 188
#----------------------------------------------------------------------------
... ... @@ -231,7 +200,8 @@ NOCONFIGURE=yes gnome-autogen.sh
200 200
	--disable-static \
201 201
	--with-console-kit=no \
202 202
	--with-systemd \
203
	--with-plymouth
203
	--with-plymouth \
204
	--without-xdmcp
204 205
205 206
%make
206 207
... ... @@ -252,29 +222,24 @@ mkdir -p %{buildroot}%{_var}/log/gdm %{buildroot}%{_sysconfdir}/X11/dm/Sessions
222 222
rm -rf %{buildroot}%{_sysconfdir}/X11/gdm/PostLogin/Default.sample \
223 223
  %{buildroot}%{_datadir}/xsessions/gnome.desktop
224 224
225
# (cg) The existing gdm file is what we really want for gdm-password
226
rm -f %{buildroot}%{_sysconfdir}/pam.d/gdm-password
227
ln -s gdm %{buildroot}%{_sysconfdir}/pam.d/gdm-password
225
find %{buildroot} -name '*.la' -delete
228 226
229
## (cg) For ghost ownership
230
#touch %{buildroot}%{_sysconfdir}/dconf/db/%{name}
227
# (cg) The existing gdm file is what we really want for gdm-password
228
#rm -f %{buildroot}%{_sysconfdir}/pam.d/gdm-password
229
#ln -s gdm %{buildroot}%{_sysconfdir}/pam.d/gdm-password
231 230
232
pushd %{buildroot}%{_sysconfdir}
233
ln -s X11/gdm
234
popd
231
# (tmb) dont ship duplicates already provided by caribou and orca
232
rm -f %{buildroot}%{_datadir}/gdm/greeter/autostart/caribou-autostart.desktop
233
rm -f %{buildroot}%{_datadir}/gdm/greeter/autostart/orca-autostart.desktop
235 234
236
# avoiding conflict with lightdm
237
mkdir -p %{buildroot}%{_libexecdir}/%{name}
238
mv %{buildroot}%{_bindir}/gdmflexiserver %{buildroot}%{_libexecdir}/%{name}/gdmflexiserver
235
# (ovitters) gdm-session starts gdm-x-session which can start /etc/X11/gdm/Xsession
236
#            ensure it is a symlink to the xinitrc Xsession
237
ln -s ../Xsession %{buildroot}%{_sysconfdir}/X11/gdm/Xsession
239 238
240
echo "auth       optional pam_group.so" >> %{buildroot}%{_sysconfdir}/pam.d/gdm
241
echo "auth       optional pam_group.so" >> %{buildroot}%{_sysconfdir}/pam.d/gdm-autologin
242
echo "-session     optional      pam_systemd.so" >> %{buildroot}%{_sysconfdir}/pam.d/gdm-fingerprint
243
echo "-session     optional      pam_systemd.so" >> %{buildroot}%{_sysconfdir}/pam.d/gdm-smartcard
239
# (tmb) must exist for gdm to start xorg when WaylandEnable=false
240
mkdir -p %{buildroot}%{_localstatedir}/lib/gdm/.local/share/xorg
244 241
245 242
# added ROSA logo
246 243
install -dD %{buildroot}%{_datadir}/glib-2.0/schemas
247 244
install -m644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas/
248 245
install -m644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/
249
250
sed -i 's@#!/bin/sh@#!/bin/bash@g' %{buildroot}%{_sysconfdir}/X11/gdm/Xsession
view file @ 209a402257
... ... --- a/org.gnome.login-screen.gschema.override
... ... +++ b/org.gnome.login-screen.gschema.override
... ... @@ -1,3 +1,2 @@
1 1
[org.gnome.login-screen]
2 2
logo='/usr/share/pixmaps/rosa-logo.png'
3
enable-smartcard-authentication=false
... ... --- a/systemd.patch
... ... +++ /dev/null
... ... @@ -1,11 +0,0 @@
0
--- gdm-3.12.2/configure.ac	2014-05-16 17:52:58.000000000 +0300
1
+++ gdm-3.12.2/configure.ac	2017-01-13 23:44:05.418923579 +0200
2
@@ -888,7 +888,7 @@
3
 dnl ---------------------------------------------------------------------------
4
 
5
 PKG_CHECK_MODULES(SYSTEMD,
6
-                  [libsystemd-login >= 186 libsystemd-daemon],
7
+                  [libsystemd >= 186],
8
                   [have_systemd=yes], [have_systemd=no])
9
 
10
 if test "x$with_systemd" = "xauto" ; then

Comments