From 4b10ab3d618007b9ce2a21ff2e08d8bfc5f79e93 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Mon, 30 Nov 2009 20:52:17 +0100
Subject: maj gdm#2.20.10-6, et de ses dépendances
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/gdm/.footprint |  4 ++++
 extra/gdm/Pkgfile    | 36 +++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'extra')

diff --git a/extra/gdm/.footprint b/extra/gdm/.footprint
index 4fca879f2..64e9ab0c1 100644
--- a/extra/gdm/.footprint
+++ b/extra/gdm/.footprint
@@ -20,6 +20,9 @@ drwxr-xr-x	root/root	etc/gdm/modules/
 -rw-r--r--	root/root	etc/gdm/modules/AccessKeyMouseEvents
 -rw-r--r--	root/root	etc/gdm/modules/factory-AccessDwellMouseEvents
 -rw-r--r--	root/root	etc/gdm/modules/factory-AccessKeyMouseEvents
+drwxr-xr-x	root/root	etc/pam.d/
+-rw-r--r--	root/root	etc/pam.d/gdm
+-rw-r--r--	root/root	etc/pam.d/gdm-autologin
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
 -rwxr-xr--	root/root	etc/rc.d/init.d/gdm
@@ -49,6 +52,7 @@ lrwxrwxrwx	root/root	usr/bin/gdmXnest -> gdmXnestchooser
 -rwxr-xr-x	root/root	usr/bin/gdmphotosetup
 -rwxr-xr-x	root/root	usr/bin/gdmthemetester
 drwxr-xr-x	root/root	usr/lib/
+-rwxr-xr-x	root/root	usr/lib/gdmaskpass
 -rwxr-xr-x	root/root	usr/lib/gdmchooser
 -rwxr-xr-x	root/root	usr/lib/gdmgreeter
 -rwxr-xr-x	root/root	usr/lib/gdmlogin
diff --git a/extra/gdm/Pkgfile b/extra/gdm/Pkgfile
index b479d453b..ae5e2ec77 100755
--- a/extra/gdm/Pkgfile
+++ b/extra/gdm/Pkgfile
@@ -2,11 +2,11 @@
 # URL: http://www.5z.com/jirka/gdm.html
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: librsvg, libgnomecanvas, gnome-doc-utils, intltool, desktop-file-utils
+# Depends on: librsvg, libgnomecanvas, gnome-doc-utils, intltool, desktop-file-utils, linux-pam
 
 name=gdm
 version=2.20.10
-release=5
+release=6
 source=(http://ftp.gnome.org/pub/gnome/sources/$name/2.20/$name-$version.tar.bz2 \
        http://kiao.no-ip.info/NuTyX/files/nutyx09.tar.gz \
 	defaults.conf NuTyXlogo.png)
@@ -46,26 +46,24 @@ build() {
         install -v -m755 -d $PKG/var/log/gdm
         sed -i.orig "/\[daemon\]/ a LogDir=/var/log/gdm" \
         $PKG/etc/gdm/custom.conf
-# cat > $PKG/etc/pam.d/gdm << "EOF"
-# auth        required    pam_unix.so
-# auth        requisite   pam_nologin.so
-# account     required    pam_unix.so
-# password    required    pam_unix.so
-# session     required    pam_unix.so
+cat > $PKG/etc/pam.d/gdm << "EOF"
+auth        required    pam_unix.so
+auth        requisite   pam_nologin.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so
 
-# EOF
-# cat > $PKG/etc/pam.d/gdm-autologin << "EOF"
-# auth        required    pam_env.so
-# auth        requisite   pam_nologin.so
-# auth        required    pam_permit.so
-# account     required    pam_unix.so
-# password    required    pam_unix.so
-# session     required    pam_unix.so
+EOF
+cat > $PKG/etc/pam.d/gdm-autologin << "EOF"
+auth        required    pam_env.so
+auth        requisite   pam_nologin.so
+auth        required    pam_permit.so
+account     required    pam_unix.so
+password    required    pam_unix.so
+session     required    pam_unix.so
 
-# EOF
-# rm -r $PKG/usr/share/xsessions
+EOF
 	install -D -m644 ../NuTyXlogo.png $PKG/usr/share/pixmaps/gdm-foot-logo.png
-	#rm -r $PKG/usr/share/gdm/themes/nutyx
 	install -D -m444 ../defaults.conf $PKG/usr/share/gdm/defaults.conf
 	cp -a $SRC/nutyx09 $PKG/usr/share/gdm/themes/
 	rm $PKG/usr/share/xsessions/gnome.desktop
-- 
cgit v1.2.3-70-g09d2