clean

7 files changed, 36 insertions, 13 deletions

diff --git a/gnome-base/gdm/files/2.2.5/gnomerc b/gnome-base/gdm/files/2.2.5/gnomerc
new file mode 100644
index 000000000000..7113e23aca25
--- /dev/null
+++ b/gnome-base/gdm/files/2.2.5/gnomerc
@@ -0,0 +1,14 @@
+startssh=
+sshagent=/usr/bin/ssh-agent
+gnomesession=/usr/bin/gnome-session
+
+if [ -x $sshagent -a -z "$SSH_AUTH_SOCK" ]; then
+  startssh=yes
+fi
+
+if [ -n "$startssh" ]; then
+  exec $sshagent -- $gnomesession
+else
+  exec $gnomesession
+fi
+
diff --git a/gnome-base/gdm/files/2.2.5/pam.d/gdm b/gnome-base/gdm/files/2.2.5/pam.d/gdm
new file mode 100644
index 000000000000..f21b495f641f
--- /dev/null
+++ b/gnome-base/gdm/files/2.2.5/pam.d/gdm
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       required	/lib/security/pam_pwdb.so shadow nullok
+auth       required	/lib/security/pam_nologin.so
+account    required	/lib/security/pam_pwdb.so
+account    required     /lib/security/pam_permit.so
+password   required	/lib/security/pam_cracklib.so
+password   required	/lib/security/pam_pwdb.so shadow nullok use_authtok
+session    required	/lib/security/pam_pwdb.so
+session    optional     /lib/security/pam_console.so
+session    optional     /lib/security/pam_xauth.so
diff --git a/gnome-base/gdm/files/2.2.5/pam.d/gdmconfig b/gnome-base/gdm/files/2.2.5/pam.d/gdmconfig
new file mode 100644
index 000000000000..4bb2ddb7aff1
--- /dev/null
+++ b/gnome-base/gdm/files/2.2.5/pam.d/gdmconfig
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       sufficient   /lib/security/pam_rootok.so
+auth       required     /lib/security/pam_pwdb.so shadow nullok
+session    required     /lib/security/pam_pwdb.so
+session    optional     /lib/security/pam_xauth.so
+account    required     /lib/security/pam_pwdb.so
diff --git a/gnome-base/gdm/files/2.2.5/security/console.apps/gdmconfig b/gnome-base/gdm/files/2.2.5/security/console.apps/gdmconfig
new file mode 100644
index 000000000000..5fc459648a9a
--- /dev/null
+++ b/gnome-base/gdm/files/2.2.5/security/console.apps/gdmconfig
@@ -0,0 +1,5 @@
+USER=root
+PROGRAM=/usr/bin/gdmconfig
+SESSION=false
+FALLBACK=true
+
diff --git a/gnome-base/gdm/files/digest-gdm-2.2.3.2-r4 b/gnome-base/gdm/files/digest-gdm-2.2.3.2-r4
deleted file mode 100644
index 27ffdd8dda1e..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.2.3.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5e05b0b4722061311121f63e02907b50 gdm-2.2.3.2.tar.gz 1753088
diff --git a/gnome-base/gdm/files/digest-gdm-2.2.5.1 b/gnome-base/gdm/files/digest-gdm-2.2.5.1
new file mode 100644
index 000000000000..76fe7ee34610
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.2.5.1
@@ -0,0 +1 @@
+MD5 17742a33f27505b942697403a16de289 gdm-2.2.5.1.tar.bz2 1454080
diff --git a/gnome-base/gdm/files/gdm-2.2.3.2.patch b/gnome-base/gdm/files/gdm-2.2.3.2.patch
deleted file mode 100644
index c90521736433..000000000000
--- a/gnome-base/gdm/files/gdm-2.2.3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vicious-extensions/Makefile.am.orig	Sat Oct  6 03:46:47 2001
-+++ vicious-extensions/Makefile.am	Sat Oct  6 03:44:05 2001
-@@ -5,7 +5,8 @@
- 	-I.. \
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- 	-I$(includedir) \
--	$(GNOME_INCLUDEDIR)
-+	$(GNOME_INCLUDEDIR) \
-+	$(LIBGLADE_CFLAGS)
- 
- noinst_LIBRARIES = libvicious.a libviciousui.a
-