rpms/xrdp/F-10 xrdp-pam-auth.patch, NONE, 1.1 import.log, 1.2, 1.3 xrdp.spec, 1.2, 1.3

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19153/F-10

Modified Files:
	import.log xrdp.spec 
Added Files:
	xrdp-pam-auth.patch 
Log Message:
- fix pam.d


xrdp-pam-auth.patch:
 xrdp-sesman |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xrdp-pam-auth.patch ---
diff -ruNp a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman
--- a/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2008-04-29 04:51:34.000000000 -0300
+++ b/xrdp-0.5.0.20090811cvs/instfiles/pam.d/xrdp-sesman	2009-09-08 03:15:46.139495177 -0300
@@ -1,3 +1,3 @@
 #%PAM-1.0
-auth       required	pam_unix.so shadow nullok
-account    required	pam_unix.so
+auth       include      system-auth
+account    include      system-auth


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Sep 2009 22:37:27 -0000	1.2
+++ import.log	8 Sep 2009 16:13:36 -0000	1.3
@@ -1,2 +1,3 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:F-10:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250273132
 xrdp-0_5_0-0_3_20090811cvs_fc12:F-10:xrdp-0.5.0-0.3.20090811cvs.fc12.src.rpm:1252103784
+xrdp-0_5_0-0_5_20090811cvs_fc12:F-10:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252426308


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-10/xrdp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xrdp.spec	4 Sep 2009 22:37:27 -0000	1.2
+++ xrdp.spec	8 Sep 2009 16:13:36 -0000	1.3
@@ -4,7 +4,7 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.3.%{cvs}%{?dist}
+Release:   0.5.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
@@ -24,6 +24,8 @@ URL:       http://xrdp.sourceforge.net/
 Source0: %{name}-%{version}.%{cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: xrdp-pam-auth.patch
+
 Source1: xrdp.init
 Source2: xrdp.sysconfig
 Source3: xrdp.logrotate
@@ -54,6 +56,7 @@ terminal server / remote desktop clients
 
 %prep
 %setup -q -n %{name}-%{version}.%{cvs}
+%patch0 -p2
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@@ -65,10 +68,6 @@ terminal server / remote desktop clients
 # increase encryption to 128 bit's
 %{__sed} -i 's/crypt_level=low/crypt_level=high/g' xrdp/xrdp.ini
 
-#include system-auth into pam.d/xrdp-sesman
-echo "auth    include system-auth" >> instfiles/pam.d/xrdp-sesman
-echo "account include system-auth" >> instfiles/pam.d/xrdp-sesman
-
 #fix wrong permission
 %{__chmod} 644 keygen/keygen.c
 
@@ -170,11 +169,16 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Tue Sep 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.5.20090811cvs
+- fix xrdp-sesman pam.d to uses system-auth
 
-* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.3.20090811cvs
+* Fri Sep 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.4.20090811cvs
 - increase encryption to 128 bit's
 - include system-auth into /etc/pam.d/xrdp-sesman
 
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.3.20090811cvs
+- rebuild with new openssl
+
 * Thu Aug 13 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.2.20090811cvs
 - more changes to spec file https://bugzilla.redhat.com/show_bug.cgi?id=516364#c10
 
@@ -183,6 +187,7 @@ rm -rf %{buildroot}
 - improve initscript
 - fix some macros
 
+
 * Tue Aug 11 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-2.20090811cvs
 - changes from BZ#516364 comment 2 from Mamoru Tasaka
 - changed license to "GPLv2+ with exceptions"