3.2 based pam change #33690

4 files changed, 50 insertions, 32 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index d156c14edc5b..a83382b21a47 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.98 2003/11/20 02:45:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.99 2003/11/20 13:45:16 caleb Exp $
 
   20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdebase-3.1.4.ebuild:
   Marked ppc
 
+  20 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta1-r1.ebuild,
+  files/kde-np.pam:
+  Add new kde-np pam module for autologin.  See bug 33690
+
   12 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta1-r1.ebuild:
   Fix a couple of lines
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index f4754f646cd1..08f7e4e1a868 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,48 +1,49 @@
+MD5 0ddf72a18a286698c80e009c517ea462 kdebase-3.2.0_beta1-r1.ebuild 3614
 MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791
-MD5 2e7914e7f0c37c2da3d1db99bbf38d1f kdebase-3.0.4-r3.ebuild 4486
-MD5 f7da3219b03aeb7ae0957f39bc09da08 kdebase-3.2.0_beta1-r1.ebuild 3535
-MD5 5b0632c922cb1e82a960952f1071fcb1 kdebase-3.1.4.ebuild 4005
-MD5 43871dc2aa6e7002a330c6ae9f93056a ChangeLog 17345
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 924761c92da94a05214375c0d374e947 kdebase-3.0.5b.ebuild 7924
-MD5 c5e47769d4235122e0d731ae7639cd64 kdebase-3.2.0_alpha2.ebuild 3236
+MD5 5b0632c922cb1e82a960952f1071fcb1 kdebase-3.1.4.ebuild 4005
+MD5 2e7914e7f0c37c2da3d1db99bbf38d1f kdebase-3.0.4-r3.ebuild 4486
 MD5 1687699e3ed7299098d65b414d68fbe1 kdebase-3.2.0_beta1.ebuild 3264
+MD5 c5e47769d4235122e0d731ae7639cd64 kdebase-3.2.0_alpha2.ebuild 3236
+MD5 4d44bf9ca10c0e4bedfacdc4ca4769c6 ChangeLog 17500
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 a9b5cb78455790de6a267f7d9ec46b63 files/konq-crash-patch.diff 1106
-MD5 51c5cbe3e55c1154f6a596ddac4a8d5f files/kdebase-3.1.4-amd64-accessviol.patch 1091
 MD5 6192c26683805595b89b418bfbb92d28 files/digest-kdebase-3.2.0_beta1 69
-MD5 ad9e6eef841435f5c66f31ef9874c563 files/digest-kdebase-3.1.2 68
-MD5 13e89585cfb3d572a179ae7a8590fa95 files/digest-kdebase-3.1.4 68
+MD5 51c5cbe3e55c1154f6a596ddac4a8d5f files/kdebase-3.1.4-amd64-accessviol.patch 1091
+MD5 f6156166c554420f1684f00d488f674a files/focus-patch.diff 542
+MD5 a9b5cb78455790de6a267f7d9ec46b63 files/konq-crash-patch.diff 1106
+MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
 MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
+MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
 MD5 11389fa15ff0492536b0b153a0b11ff1 files/digest-kdebase-3.2.0_alpha2 69
-MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
-MD5 f6156166c554420f1684f00d488f674a files/focus-patch.diff 542
+MD5 ad9e6eef841435f5c66f31ef9874c563 files/digest-kdebase-3.1.2 68
+MD5 13e89585cfb3d572a179ae7a8590fa95 files/digest-kdebase-3.1.4 68
 MD5 6192c26683805595b89b418bfbb92d28 files/digest-kdebase-3.2.0_beta1-r1 69
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
-MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
-MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
-MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
-MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
+MD5 68409867ec02e18f4c594f2ea3dffd72 files/3.2.0_alpha2/kdmrc 17620
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0_alpha2/backgroundrc 342
+MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0_alpha2/startkde-3.2.0_alpha2-gentoo.diff 1923
 MD5 ce285a04f7eaf402c947046989a141f1 files/3.1.2/startkde-3.1.2-gentoo.diff 1878
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
-MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
+MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
+MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.4/kdmrc 17661
-MD5 8e50b3888c85740fe7425dbda247a12d files/3.1.4/startkde-3.1.4-gentoo.diff 1878
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.4/backgroundrc 342
-MD5 68409867ec02e18f4c594f2ea3dffd72 files/3.2.0_alpha2/kdmrc 17620
-MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0_alpha2/startkde-3.2.0_alpha2-gentoo.diff 1923
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0_alpha2/backgroundrc 342
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0_beta1-r1/Xsetup 758
+MD5 8e50b3888c85740fe7425dbda247a12d files/3.1.4/startkde-3.1.4-gentoo.diff 1878
+MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
+MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
+MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
+MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.0_beta1-r1/kdmrc 18202
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0_beta1-r1/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0_beta1-r1/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0_beta1-r1/startkde-3.2.0_beta1-r1-gentoo.diff 1923
-MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
-MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
-MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
 MD5 68409867ec02e18f4c594f2ea3dffd72 files/3.2.0_beta1/kdmrc 17620
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0_beta1/backgroundrc 342
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0_beta1/startkde-3.2.0_beta1-gentoo.diff 1923
+MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
+MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
+MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
diff --git a/kde-base/kdebase/files/kde-np.pam b/kde-base/kdebase/files/kde-np.pam
new file mode 100644
index 000000000000..c7556154a83f
--- /dev/null
+++ b/kde-base/kdebase/files/kde-np.pam
@@ -0,0 +1,12 @@
+#%PAM-1.0
+
+auth       required     /lib/security/pam_nologin.so
+auth	   required	/lib/security/pam_permit.so
+
+account    required     /lib/security/pam_stack.so service=system-auth
+
+password   required     /lib/security/pam_stack.so service=system-auth
+
+session    required     /lib/security/pam_stack.so service=system-auth
+
+session    optional     /lib/security/pam_console.so
diff --git a/kde-base/kdebase/kdebase-3.2.0_beta1-r1.ebuild b/kde-base/kdebase/kdebase-3.2.0_beta1-r1.ebuild
index e72c01bdb4da..06ce14a0c2bd 100644
--- a/kde-base/kdebase/kdebase-3.2.0_beta1-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.2.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0_beta1-r1.ebuild,v 1.3 2003/11/13 21:32:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.2.0_beta1-r1.ebuild,v 1.4 2003/11/20 13:45:16 caleb Exp $
 inherit kde-dist eutils
 
 IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
@@ -54,9 +54,10 @@ src_install() {
 	kde_src_install
 	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup" install
 
-	# cf bug #5953
 	insinto /etc/pam.d
 	newins ${FILESDIR}/kde.pam kde
+	# kde-np is new requirement for 3.2 autologins - #33690
+	newins ${FILESDIR}/kde-np.pam kde-np
 
 	# startkde script
 	cd ${D}/${KDEDIR}/bin