[arch-commits] Commit in gdm/trunk (2 files)
Jan Steffens
heftig at nymeria.archlinux.org
Sat Apr 19 00:37:10 UTC 2014
Date: Saturday, April 19, 2014 @ 02:37:10
Author: heftig
Revision: 211512
Update PAM config
Modified:
gdm/trunk/0001-Add-Arch-Linux-PAM-config-files.patch
gdm/trunk/PKGBUILD
--------------------------------------------+
0001-Add-Arch-Linux-PAM-config-files.patch | 41 +++++++++++----------------
PKGBUILD | 4 +-
2 files changed, 19 insertions(+), 26 deletions(-)
Modified: 0001-Add-Arch-Linux-PAM-config-files.patch
===================================================================
--- 0001-Add-Arch-Linux-PAM-config-files.patch 2014-04-18 19:18:52 UTC (rev 211511)
+++ 0001-Add-Arch-Linux-PAM-config-files.patch 2014-04-19 00:37:10 UTC (rev 211512)
@@ -1,4 +1,4 @@
-From cd3370b869bd2d5418270e0c9e8197c296d314f5 Mon Sep 17 00:00:00 2001
+From 521d3702ac5569c370a5a453b87133d688e1c87d Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
Date: Tue, 30 Jul 2013 22:42:27 +0600
Subject: [PATCH] Add Arch Linux PAM config files
@@ -6,13 +6,13 @@
---
configure.ac | 6 ++++--
data/Makefile.am | 12 ++++++++++++
- data/pam-arch/gdm-autologin.pam | 14 ++++++++++++++
- data/pam-arch/gdm-fingerprint.pam | 16 ++++++++++++++++
+ data/pam-arch/gdm-autologin.pam | 10 ++++++++++
+ data/pam-arch/gdm-fingerprint.pam | 14 ++++++++++++++
data/pam-arch/gdm-launch-environment.pam | 13 +++++++++++++
data/pam-arch/gdm-password.pam | 11 +++++++++++
- data/pam-arch/gdm-pin.pam | 12 ++++++++++++
- data/pam-arch/gdm-smartcard.pam | 16 ++++++++++++++++
- 8 files changed, 98 insertions(+), 2 deletions(-)
+ data/pam-arch/gdm-pin.pam | 13 +++++++++++++
+ data/pam-arch/gdm-smartcard.pam | 14 ++++++++++++++
+ 8 files changed, 91 insertions(+), 2 deletions(-)
create mode 100644 data/pam-arch/gdm-autologin.pam
create mode 100644 data/pam-arch/gdm-fingerprint.pam
create mode 100644 data/pam-arch/gdm-launch-environment.pam
@@ -21,7 +21,7 @@
create mode 100644 data/pam-arch/gdm-smartcard.pam
diff --git a/configure.ac b/configure.ac
-index f66fdd9..aabe305 100644
+index 242a969..a368029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,12 +189,13 @@ if test x$enable_split_authentication = xyes; then
@@ -88,16 +88,13 @@
$(dconf_db_files) \
diff --git a/data/pam-arch/gdm-autologin.pam b/data/pam-arch/gdm-autologin.pam
new file mode 100644
-index 0000000..e7998ef
+index 0000000..9f45c65
--- /dev/null
+++ b/data/pam-arch/gdm-autologin.pam
-@@ -0,0 +1,14 @@
-+auth required pam_tally.so onerr=succeed file=/var/log/faillog
-+auth required pam_shells.so
+@@ -0,0 +1,10 @@
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth optional pam_permit.so
-+auth optional pam_gnome_keyring.so
+
+account include system-local-login
+
@@ -105,13 +102,12 @@
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
-+session optional pam_gnome_keyring.so auto_start
diff --git a/data/pam-arch/gdm-fingerprint.pam b/data/pam-arch/gdm-fingerprint.pam
new file mode 100644
-index 0000000..97afb44
+index 0000000..a480861
--- /dev/null
+++ b/data/pam-arch/gdm-fingerprint.pam
-@@ -0,0 +1,16 @@
+@@ -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
@@ -118,7 +114,6 @@
+auth required pam_env.so
+auth required pam_fprintd.so
+auth optional pam_permit.so
-+auth optional pam_gnome_keyring.so
+
+account include system-local-login
+
@@ -127,7 +122,6 @@
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
-+session optional pam_gnome_keyring.so auto_start
diff --git a/data/pam-arch/gdm-launch-environment.pam b/data/pam-arch/gdm-launch-environment.pam
new file mode 100644
index 0000000..2981326
@@ -166,10 +160,10 @@
+session optional pam_gnome_keyring.so auto_start
diff --git a/data/pam-arch/gdm-pin.pam b/data/pam-arch/gdm-pin.pam
new file mode 100644
-index 0000000..44ec42f
+index 0000000..135e205
--- /dev/null
+++ b/data/pam-arch/gdm-pin.pam
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,13 @@
+auth requisite pam_pin.so
+auth include system-local-login
+auth optional pam_gnome_keyring.so
@@ -178,6 +172,7 @@
+
+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
@@ -184,10 +179,10 @@
+session optional pam_gnome_keyring.so auto_start
diff --git a/data/pam-arch/gdm-smartcard.pam b/data/pam-arch/gdm-smartcard.pam
new file mode 100644
-index 0000000..c6f01fe
+index 0000000..ec6f75d
--- /dev/null
+++ b/data/pam-arch/gdm-smartcard.pam
-@@ -0,0 +1,16 @@
+@@ -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
@@ -194,7 +189,6 @@
+auth required pam_env.so
+auth required pam_pkcs11.so wait_for_card card_only
+auth optional pam_permit.so
-+auth optional pam_gnome_keyring.so
+
+account include system-local-login
+
@@ -203,7 +197,6 @@
+
+session optional pam_keyinit.so force revoke
+session include system-local-login
-+session optional pam_gnome_keyring.so auto_start
--
-1.9.1
+1.9.2
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-18 19:18:52 UTC (rev 211511)
+++ PKGBUILD 2014-04-19 00:37:10 UTC (rev 211512)
@@ -5,7 +5,7 @@
pkgbase=gdm
pkgname=(gdm libgdm)
pkgver=3.12.1
-pkgrel=1
+pkgrel=2
pkgdesc="Gnome Display Manager"
arch=(i686 x86_64)
license=(GPL)
@@ -16,7 +16,7 @@
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz
0001-Add-Arch-Linux-PAM-config-files.patch)
sha256sums=('41a009252bf491dadd7644b3e74be5c9364b1971b519a1a9ef31257180c74913'
- 'e158ea240e90113cf1d7790a623c3d0b64e459f76b0e9135f9f536cdb22c0c0e')
+ '49f2c70f96c796378ff749bb7283f23fb055424b2179d31e6235d6034c791bfd')
prepare() {
cd $pkgbase-$pkgver
More information about the arch-commits
mailing list