1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
diff -urN gdm-3.17.4.orig/configure.ac gdm-3.17.4/configure.ac
--- gdm-3.17.4.orig/configure.ac 2015-07-25 16:52:56.977983878 +0200
+++ gdm-3.17.4/configure.ac 2015-07-25 16:55:05.835278107 +0200
@@ -195,7 +195,8 @@
fi
AC_ARG_WITH(default-pam-config,
- AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, none @<:@default=auto@:>@]))
+ AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none
+@<:@default=auto@:>@]))
dnl If not given, try autodetecting from release files (see NetworkManager source)
if test x$with_default_pam_config = x; then
AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat")
@@ -208,7 +209,7 @@
fi
fi
case x$with_default_pam_config in
- xredhat|xopenembedded|xexherbo|xlfs|xnone) ;;
+ xredhat|xopenembedded|xexherbo|xlfs|xarch|xnone) ;;
*)
AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}])
exit 1
@@ -218,6 +219,7 @@
AM_CONDITIONAL(ENABLE_OPENEMBEDDED_PAM_CONFIG, test x$with_default_pam_config = xopenembedded)
AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_default_pam_config = xexherbo)
AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs)
+AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch)
AC_ARG_ENABLE(console-helper,
AS_HELP_STRING([--enable-console-helper],
diff -urN gdm-3.17.4.orig/data/Makefile.am gdm-3.17.4/data/Makefile.am
--- gdm-3.17.4.orig/data/Makefile.am 2015-07-25 16:52:56.976983884 +0200
+++ gdm-3.17.4/data/Makefile.am 2015-07-25 16:57:24.129520056 +0200
@@ -125,6 +125,15 @@
$(NULL)
EXTRA_DIST += $(pam_lfs_files)
+pam_arch_files = pam-arch/gdm-autologin.pam \
+ pam-arch/gdm-launch-environment.pam \
+ pam-arch/gdm-fingerprint.pam \
+ pam-arch/gdm-smartcard.pam \
+ pam-arch/gdm-password.pam \
+ pam-arch/gdm-pin.pam \
+ $(NULL)
+EXTRA_DIST += $(pam_arch_files)
+
if ENABLE_REDHAT_PAM_CONFIG
pam_files = $(pam_redhat_files)
endif
@@ -137,6 +146,9 @@
if ENABLE_LFS_PAM_CONFIG
pam_files = $(pam_lfs_files)
endif
+if ENABLE_ARCH_PAM_CONFIG
+pam_files = $(pam_arch_files)
+endif
EXTRA_DIST += \
$(dconf_db_files) \
diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-autologin.pam gdm-3.17.4/data/pam-arch/gdm-autologin.pam
--- gdm-3.17.4.orig/data/pam-arch/gdm-autologin.pam 1970-01-01 01:00:00.000000000 +0100
+++ gdm-3.17.4/data/pam-arch/gdm-autologin.pam 2015-07-25 16:58:54.784015841 +0200
@@ -0,0 +1,10 @@
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth optional pam_permit.so
+
+account include system-local-login
+
+password include system-local-login
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-fingerprint.pam gdm-3.17.4/data/pam-arch/gdm-fingerprint.pam
--- gdm-3.17.4.orig/data/pam-arch/gdm-fingerprint.pam 1970-01-01 01:00:00.000000000 +0100
+++ gdm-3.17.4/data/pam-arch/gdm-fingerprint.pam 2015-07-25 16:59:29.494812089 +0200
@@ -0,0 +1,14 @@
+auth required pam_tally.so onerr=succeed file=/var/log/faillog
+auth required pam_shells.so
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth required pam_fprintd.so
+auth optional pam_permit.so
+
+account include system-local-login
+
+password required pam_fprintd.so
+password optional pam_permit.so
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-launch-environment.pam gdm-3.17.4/data/pam-arch/gdm-launch-environment.pam
--- gdm-3.17.4.orig/data/pam-arch/gdm-launch-environment.pam 1970-01-01 01:00:00.000000000 +0100
+++ gdm-3.17.4/data/pam-arch/gdm-launch-environment.pam 2015-07-25 17:00:04.135609150 +0200
@@ -0,0 +1,10 @@
+auth required pam_env.so
+auth optional pam_permit.so
+
+account include system-local-login
+
+password required pam_deny.so
+
+session optional pam_keyinit.so force revoke
+session required pam_systemd.so
+session optional pam_permit.so
diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-password.pam gdm-3.17.4/data/pam-arch/gdm-password.pam
--- gdm-3.17.4.orig/data/pam-arch/gdm-password.pam 1970-01-01 01:00:00.000000000 +0100
+++ gdm-3.17.4/data/pam-arch/gdm-password.pam 2015-07-25 17:00:28.295467846 +0200
@@ -0,0 +1,11 @@
+auth include system-local-login
+auth optional pam_gnome_keyring.so
+
+account include system-local-login
+
+password include system-local-login
+password optional pam_gnome_keyring.so use_authtok
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
+session optional pam_gnome_keyring.so auto_start
diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-pin.pam gdm-3.17.4/data/pam-arch/gdm-pin.pam
--- gdm-3.17.4.orig/data/pam-arch/gdm-pin.pam 1970-01-01 01:00:00.000000000 +0100
+++ gdm-3.17.4/data/pam-arch/gdm-pin.pam 2015-07-25 17:00:51.430332710 +0200
@@ -0,0 +1,13 @@
+auth requisite pam_pin.so
+auth include system-local-login
+auth optional pam_gnome_keyring.so
+
+account include system-local-login
+
+password include system-local-login
+password optional pam_pin.so
+password optional pam_gnome_keyring.so use_authtok
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
+session optional pam_gnome_keyring.so auto_star
diff -urN gdm-3.17.4.orig/data/pam-arch/gdm-smartcard.pam gdm-3.17.4/data/pam-arch/gdm-smartcard.pam
--- gdm-3.17.4.orig/data/pam-arch/gdm-smartcard.pam 1970-01-01 01:00:00.000000000 +0100
+++ gdm-3.17.4/data/pam-arch/gdm-smartcard.pam 2015-07-25 17:01:16.614185794 +0200
@@ -0,0 +1,14 @@
+auth required pam_tally.so onerr=succeed file=/var/log/faillog
+auth required pam_shells.so
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth required pam_pkcs11.so wait_for_card card_only
+auth optional pam_permit.so
+
+account include system-local-login
+
+password required pam_pkcs11.so
+password optional pam_permit.so
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
|