rpms/kdebase/devel kde-np, 1.2, 1.3 kdebase-3.4.91-redhat.patch, 1.3, 1.4 kdebase.spec, 1.127, 1.128 kdebase-3.2.0-selinux.patch, 1.1, NONE kdebase-3.4.1-pam.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3095

Modified Files:
	kde-np kdebase-3.4.91-redhat.patch kdebase.spec 
Removed Files:
	kdebase-3.2.0-selinux.patch kdebase-3.4.1-pam.patch 
Log Message:
* Fri Oct  7 2005 Tomas Mraz <tmraz at redhat.com>
- use include instead of pam_stack in pam config
- merged selinux and pam (loginuid) patches



Index: kde-np
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kde-np,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-np	6 Jun 2005 14:08:20 -0000	1.2
+++ kde-np	7 Oct 2005 10:40:12 -0000	1.3
@@ -2,8 +2,9 @@
 auth       required	pam_env.so
 auth       required	pam_nologin.so
 auth       required	pam_permit.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
-session    required  pam_loginuid.so
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
+session    required     pam_loginuid.so
+session    optional     pam_selinux.so
 session    optional     pam_console.so

kdebase-3.4.91-redhat.patch:
 kde.pamd |   16 ++++++++++------
 startkde |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 9 deletions(-)

Index: kdebase-3.4.91-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.4.91-redhat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdebase-3.4.91-redhat.patch	29 Sep 2005 14:37:35 -0000	1.3
+++ kdebase-3.4.91-redhat.patch	7 Oct 2005 10:40:12 -0000	1.4
@@ -1,6 +1,6 @@
 --- kdebase-3.4.91/kde.pamd.redhat	2005-09-10 10:26:16.000000000 +0200
 +++ kdebase-3.4.91/kde.pamd	2005-09-27 18:16:15.000000000 +0200
-@@ -1,7 +1,9 @@
+@@ -1,7 +1,11 @@
  #%PAM-1.0
 -auth       required	/lib/security/pam_pwdb.so shadow nullok
 -auth       required	/lib/security/pam_nologin.so
@@ -8,13 +8,15 @@
 -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
-+auth       required	pam_stack.so service=system-auth
-+auth       required	pam_nologin.so
 +auth       sufficient	pam_timestamp.so
-+account    required	pam_stack.so service=system-auth
-+password   required	pam_stack.so service=system-auth
-+session    required	pam_stack.so service=system-auth
++auth       include     system-auth
++account    required	pam_nologin.so
++account    include     system-auth
++password   include     system-auth
++session    include	system-auth
++session    required    pam_loginuid.so
 +session    optional	pam_timestamp.so
++session    optional    pam_selinux.so
 +session    optional	pam_console.so
 --- kdebase-3.4.91/startkde.redhat	2005-09-10 15:03:40.000000000 +0200
 +++ kdebase-3.4.91/startkde	2005-09-29 16:16:19.000000000 +0200


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdebase.spec	29 Sep 2005 14:21:45 -0000	1.127
+++ kdebase.spec	7 Oct 2005 10:40:12 -0000	1.128
@@ -47,13 +47,11 @@
 Patch65: kdebase-3.1.1-usb.patch
 Patch71: kdebase-3.1.3-konsole-double-esc.patch
 Patch74: kdebase-3.3.92-kpersonalizer.patch
-Patch75: kdebase-3.2.0-selinux.patch
 Patch80: kdebase-3.2.92-logo.patch 
 Patch81: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
 Patch83: kdebase-3.3.0-altf2.patch
 Patch91: kdebase-3.4.2-kdesktop-konsole.patch
 Patch92: kdebase-3.4.0-xdg.patch
-Patch93: kdebase-3.4.1-pam.patch
 
 # upstream patches
 Patch200: kdebase-3.4.91-uic.patch
@@ -130,13 +128,11 @@
 %patch65 -p1 -b .usb
 %patch71 -p1 -b .konsole
 %patch74 -p1 -b .kper
-%patch75 -p1 -b .selinux
 %patch80 -p1 -b .logo
 %patch81 -p1 -b .im
 %patch83 -p1 -b .altf2
 %patch91 -p1 -b .kdestop-konsole
 %patch92 -p1 -b .xdg
-%patch93 -p1 -b .loginuid
 
 # upstream patces
 %patch200 -p1 -b .uic
@@ -429,6 +425,10 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Fri Oct  7 2005 Tomas Mraz <tmraz at redhat.com>
+- use include instead of pam_stack in pam config
+- merged selinux and pam (loginuid) patches
+
 * Thu Sep 29 2005 Than Ngo <than at redhat.com> 6:3.4.91-2
 - fix typo
 


--- kdebase-3.2.0-selinux.patch DELETED ---


--- kdebase-3.4.1-pam.patch DELETED ---