summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2011-09-02 16:55:13 +0200
committerpiernov <piernov@piernov.org>2011-09-02 16:55:13 +0200
commitcef6a4403b5fbfc34d243942bcd89495dee54296 (patch)
treef320cd895a19636df7cc4c5f1deff4f8483649ce
parent7d31360b5a11e063280a27210cd06cd15230521a (diff)
parentebf27d4dc531b596f100b7d441cad297c1eb2544 (diff)
downloadgnome3-cef6a4403b5fbfc34d243942bcd89495dee54296.tar.gz
gnome3-cef6a4403b5fbfc34d243942bcd89495dee54296.tar.bz2
gnome3-cef6a4403b5fbfc34d243942bcd89495dee54296.tar.xz
gnome3-cef6a4403b5fbfc34d243942bcd89495dee54296.zip
Merge branch 'master' of ssh://piernov.org/srv/git/gnome3
-rw-r--r--gdm/.md5sum.i6863
-rw-r--r--gdm/.md5sum.x86_643
-rwxr-xr-xgdm/Pkgfile6
-rw-r--r--gdm/gdm-autologin.pam8
-rw-r--r--gdm/gdm.pam22
5 files changed, 25 insertions, 17 deletions
diff --git a/gdm/.md5sum.i686 b/gdm/.md5sum.i686
index ef71c85..ce5cd0b 100644
--- a/gdm/.md5sum.i686
+++ b/gdm/.md5sum.i686
@@ -1,4 +1,5 @@
9d9e6bf9fd53140d29bcf2f7b137c25d fix_external_program_paths.patch
7e321d02eda07690feed7e7ad5c5b71b gdm-3.1.90.tar.xz
-128858f396f44c50e289611c6806a66f gdm.pam
+157f32e089a7aab50732dc122e592b35 gdm-autologin.pam
+2e52f326dccc833e9c135f8df8297b12 gdm.pam
e5e2643269db8ee342690cc515fd620b vt-allocation-hack.patch
diff --git a/gdm/.md5sum.x86_64 b/gdm/.md5sum.x86_64
index ef71c85..ce5cd0b 100644
--- a/gdm/.md5sum.x86_64
+++ b/gdm/.md5sum.x86_64
@@ -1,4 +1,5 @@
9d9e6bf9fd53140d29bcf2f7b137c25d fix_external_program_paths.patch
7e321d02eda07690feed7e7ad5c5b71b gdm-3.1.90.tar.xz
-128858f396f44c50e289611c6806a66f gdm.pam
+157f32e089a7aab50732dc122e592b35 gdm-autologin.pam
+2e52f326dccc833e9c135f8df8297b12 gdm.pam
e5e2643269db8ee342690cc515fd620b vt-allocation-hack.patch
diff --git a/gdm/Pkgfile b/gdm/Pkgfile
index 8df4567..f92082c 100755
--- a/gdm/Pkgfile
+++ b/gdm/Pkgfile
@@ -7,11 +7,12 @@
name=gdm
version=3.1.90
-release=1
+release=2
source=(http://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz \
fix_external_program_paths.patch
vt-allocation-hack.patch
- gdm.pam)
+ gdm.pam
+ gdm-autologin.pam)
build() {
cd $name-$version
@@ -44,6 +45,7 @@ build() {
mkdir -p $PKG/etc/X11/dm/Sessions
install -v -m755 -d $PKG/var/log/gdm
+ cp -f ../gdm-autologin.pam $PKG/etc/pam.d/gdm-autologin
cp -f ../gdm.pam $PKG/etc/pam.d/gdm
rm -f $PKG/etc/pam.d/gdm-password
ln -s gdm $PKG/etc/pam.d/gdm-password
diff --git a/gdm/gdm-autologin.pam b/gdm/gdm-autologin.pam
new file mode 100644
index 0000000..7c2f9a9
--- /dev/null
+++ b/gdm/gdm-autologin.pam
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth required pam_permit.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_limits.so
+session required pam_unix.so
diff --git a/gdm/gdm.pam b/gdm/gdm.pam
index d31f078..655299c 100644
--- a/gdm/gdm.pam
+++ b/gdm/gdm.pam
@@ -1,14 +1,10 @@
#%PAM-1.0
-auth required pam_env.so
-auth required pam_succeed_if.so user != root quiet
-auth sufficient pam_succeed_if.so user ingroup nopasswdlogin
-auth substack system-auth
-auth optional pam_gnome_keyring.so
-account required pam_nologin.so
-account include system-auth
-password include system-auth
-session optional pam_keyinit.so force revoke
-session required pam_loginuid.so
-session optional pam_gnome_keyring.so auto_start
-session include system-auth
-session optional pam_console.so
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth required pam_unix.so
+auth optional pam_gnome_keyring.so
+account required pam_unix.so
+session required pam_limits.so
+session required pam_unix.so
+session optional pam_gnome_keyring.so auto_start
+password required pam_unix.so