summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2016-05-26 02:39:46 -0600
committerBrian Bidulock2016-05-26 02:39:46 -0600
commitbf1505c3280123267a70ec94569bccb62e240669 (patch)
tree5f6ffc1acb474cf70feacbb589548998d926e180
parent4534ea7a391b0ad517d498ab9a8b4ef34580439e (diff)
downloadaur-bf1505c3280123267a70ec94569bccb62e240669.tar.gz
version 1.1.11.88.g8281bca-2
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
-rw-r--r--xdm.pam15
3 files changed, 18 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1bc2c6eda1c3..7d93fe5de498 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun May 22 08:56:57 UTC 2016
pkgbase = xorg-xdm-xlogin-git
pkgdesc = X Display Manager
- pkgver = 1.1.11.87.g3cd5374
- pkgrel = 1
+ pkgver = 1.1.11.88.g8281bca
+ pkgrel = 2
url = https://github.com/bbidulock/xdm
arch = i686
arch = x86_64
@@ -35,7 +33,9 @@ pkgbase = xorg-xdm-xlogin-git
backup = etc/X11/xdm/Xsetup_0
backup = etc/X11/xdm/Xsession
source = xorg-xdm-xlogin-git::git+https://github.com/bbidulock/xdm.git
+ source = xdm.pam
sha256sums = SKIP
+ sha256sums = e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0
pkgname = xorg-xdm-xlogin-git
diff --git a/PKGBUILD b/PKGBUILD
index 5a45968df92d..33226daefe8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-xdm-xlogin-git
-pkgver=1.1.11.87.g3cd5374
-pkgrel=1
+pkgver=1.1.11.88.g8281bca
+pkgrel=2
pkgdesc="X Display Manager"
arch=(i686 x86_64)
#url="http://xorg.freedesktop.org/"
@@ -15,8 +15,10 @@ provides=('xorg-xdm' 'xorg-xdm-xlogin')
conflicts=('xorg-xdm' 'xorg-xdm-xlogin' 'xorg-xdm-git')
makedepends=('git' 'pkgconfig' 'xorg-util-macros' 'xtrans')
backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/pam.d/greeter etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
-source=("$pkgname::git+https://github.com/bbidulock/xdm.git")
-sha256sums=('SKIP')
+source=("$pkgname::git+https://github.com/bbidulock/xdm.git"
+ xdm.pam)
+sha256sums=('SKIP'
+ 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0')
pkgver() {
cd $pkgname
@@ -39,6 +41,8 @@ package() {
cd $pkgname
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/var/lib/xdm"
+ install -m755 -d "${pkgdir}/etc/pam.d"
+ install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/xdm.pam b/xdm.pam
index a0b601db6a80..76b8869a2515 100644
--- a/xdm.pam
+++ b/xdm.pam
@@ -1,10 +1,7 @@
#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
-auth required pam_env.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so
-session required pam_loginuid.so
--session optional pam_systemd.so
+auth include system-login
+-auth optional pam_gnome_keyring.so
+account include system-login
+password include system-login
+session include system-login
+-session optional pam_gnome_keyring.so auto_start