rpms/xrdp/F-13 environmnet.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.3, 1.4 sources, 1.2, 1.3 xrdp-pam-auth.patch, 1.2, 1.3 xrdp.spec, 1.5, 1.6

Fri Jul 9 01:12:58 UTC 2010

Author: itamarjp

Update of /cvs/pkgs/rpms/xrdp/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13471/F-13

Modified Files:
	.cvsignore import.log sources xrdp-pam-auth.patch xrdp.spec 
Added Files:
	environmnet.patch 
Log Message:
- use -l for startwm.sh


environmnet.patch:
 startwm.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE environmnet.patch ---
diff -ruNp a/xrdp/sesman/startwm.sh b/xrdp/sesman/startwm.sh
--- a/xrdp/sesman/startwm.sh	2009-09-20 16:07:20.000000000 -0300
+++ b/xrdp/sesman/startwm.sh	2010-07-08 21:42:26.949667558 -0300
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -l
 
 # change the order in line below to run to run whatever window manager you
 # want, default to kde


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	14 Aug 2009 18:01:35 -0000	1.2
+++ .cvsignore	9 Jul 2010 01:12:57 -0000	1.3
@@ -1 +1 @@
-xrdp-0.5.0.20090811cvs.tar.gz
+xrdp-cvs-03-17-2010.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-13/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	8 Sep 2009 16:06:52 -0000	1.3
+++ import.log	9 Jul 2010 01:12:57 -0000	1.4
@@ -1,3 +1,4 @@
 xrdp-0_5_0-0_2_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.2.20090811cvs.fc12.src.rpm:1250272824
 xrdp-0_5_0-0_4_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.4.20090811cvs.fc12.src.rpm:1252103027
 xrdp-0_5_0-0_5_20090811cvs_fc12:HEAD:xrdp-0.5.0-0.5.20090811cvs.fc12.src.rpm:1252425624
+xrdp-0_5_0-0_10_03172010_fc13:F-13:xrdp-0.5.0-0.10.03172010.fc13.src.rpm:1278637907


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	14 Aug 2009 18:01:35 -0000	1.2
+++ sources	9 Jul 2010 01:12:57 -0000	1.3
@@ -1 +1 @@
-541982ebe6acc8f4b0d342d9fd336768  xrdp-0.5.0.20090811cvs.tar.gz
+c8ecfe10c1900bf722c98d628f4b0234  xrdp-cvs-03-17-2010.tar.gz

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

Index: xrdp-pam-auth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-13/xrdp-pam-auth.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xrdp-pam-auth.patch	16 Sep 2009 19:34:00 -0000	1.2
+++ xrdp-pam-auth.patch	9 Jul 2010 01:12:57 -0000	1.3
@@ -1,9 +1,10 @@
-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,4 @@
+diff -ruNp a/xrdp/instfiles/pam.d/xrdp-sesman b/xrdp/instfiles/pam.d/xrdp-sesman
+--- a/xrdp/instfiles/pam.d/xrdp-sesman	2009-09-20 16:06:14.000000000 -0300
++++ b/xrdp/instfiles/pam.d/xrdp-sesman	2009-09-16 16:39:16.000000000 -0300
+@@ -1,4 +1,4 @@
  #%PAM-1.0
 -auth       required	pam_unix.so shadow nullok
+-auth       required	pam_env.so readenv=1
 -account    required	pam_unix.so
 +auth       include      password-auth
 +account    include      password-auth


Index: xrdp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xrdp/F-13/xrdp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xrdp.spec	16 Sep 2009 19:34:00 -0000	1.5
+++ xrdp.spec	9 Jul 2010 01:12:57 -0000	1.6
@@ -1,13 +1,14 @@
 %{!?_initddir: %global _initddir %{_sysconfdir}/rc.d/init.d}
 
-%define cvs 20090811cvs
+%global cvs 03172010
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.6.%{cvs}%{?dist}
+Release:   0.10.%{cvs}%{?dist}
 License:   GPLv2+ with exceptions
 Group:     Applications/Internet
 URL:       http://xrdp.sourceforge.net/
+Source0:   http://server1.xrdp.org/xrdp/xrdp-cvs-03-17-2010.tar.gz
 #Source0:   http://dl.sf.net/xrdp/xrdp-%{version}.tar.gz
 
 # The source for this package was pulled from upstream's vcs.  Use the
@@ -17,14 +18,14 @@ URL:       http://xrdp.sourceforge.net/
 #
 # cvs -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp login
 # cvs -z3 -d:pserver:anonymous at xrdp.cvs.sourceforge.net:/cvsroot/xrdp co -D 11-09-2009 -P xrdp
-# mv xrdp xrdp-0.5.0.20090811cvs
-# tar -czvf xrdp-0.5.0.20090811cvs.tar.gz xrdp-0.5.0.20090811cvs
+# mv xrdp xrdp-0.5.0.20090911cvs
+# tar -czvf xrdp-0.5.0.20090911cvs.tar.gz xrdp-0.5.0.20090911cvs
 
 
-Source0: %{name}-%{version}.%{cvs}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: xrdp-pam-auth.patch
+Patch1: environmnet.patch
 
 Source1: xrdp.init
 Source2: xrdp.sysconfig
@@ -35,7 +36,8 @@ BuildRequires:  openssl-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
-
+Buildrequires:  libX11-devel
+BuildRequires:  libXfixes-devel
 
 #vnc-server provides Xvnc (tigervnc-server in fedora)
 Requires: vnc-server
@@ -55,8 +57,11 @@ server, capable of accepting connections
 terminal server / remote desktop clients.
 
 %prep
-%setup -q -n %{name}-%{version}.%{cvs}
+%setup -q -n %{name}
 %patch0 -p2
+#fix rhbz #611669
+%patch1 -p2
+
 
 # remove unused modules from xrdp login combobox
 %{__sed} -i -e '/\[xrdp2\]/,$d' xrdp/xrdp.ini
@@ -142,6 +147,8 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/sysconfig/xrdp
 %{_initddir}/xrdp
 %{_sysconfdir}/xrdp/*.sh
+%{_sysconfdir}/xrdp/km*.ini
+%{_bindir}/xrdp-genkeymap
 %{_bindir}/xrdp-sesadmin
 %{_bindir}/xrdp-keygen
 %{_bindir}/xrdp-sesrun
@@ -155,6 +162,8 @@ rm -rf %{buildroot}
 %{_datadir}/xrdp/cursor1.cur
 %{_datadir}/xrdp/xrdp256.bmp
 %{_datadir}/xrdp/sans-10.fv1
+%{_datadir}/xrdp/ad24b.bmp
+%{_datadir}/xrdp/xrdp24b.bmp
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %{_libdir}/xrdp/lib*.so.*
@@ -169,6 +178,18 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Thu Jul 08 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.10.03172010
+- fix rhbz #611669 (load environment variables)
+
+* Thu Mar 18 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.9.03172010
+- buildrequires libXfixes-devel
+
+* Thu Mar 18 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.8.03172010
+- buildrequires libX11-devel
+
+* Thu Mar 18 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.5.0-0.7.03172010
+- sync with last xrdp cvs
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.5.0-0.6.20090811cvs
 - use password-auth instead of system-auth
 

