From c468641d780e993b95333ea4475cbe8c545b9e55 Mon Sep 17 00:00:00 2001
From: Itamar Reis Peixoto <itamar@ispbrasil.com.br>
Date: Thu, 18 Nov 2010 01:58:50 -0200
Subject: [PATCH] - up to git tag a9cfc235211a49c69c3cce3f98ee5976ff8103a4

---
 .gitignore              |  1 +
 05-default-keymap.patch | 18 ------------------
 environmnet.patch       |  9 ---------
 sources                 |  1 +
 xrdp.spec               | 34 +++++++++-------------------------
 5 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 05-default-keymap.patch
 delete mode 100644 environmnet.patch
 create mode 100644 sources

diff --git a/.gitignore b/.gitignore
index a7c54aa..a3b37e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xrdp-cvs-03-17-2010.tar.gz
 /xrdp-cvs-03-17-2010.tar.gz
+/xrdp-HEAD-a9cfc23.tar.gz
diff --git a/05-default-keymap.patch b/05-default-keymap.patch
deleted file mode 100644
index ff99385..0000000
--- a/05-default-keymap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/xrdp/lang.c b/xrdp/lang.c
-index 751d2ba..7ae351f 100644
---- a/xrdp/lang.c
-+++ b/xrdp/lang.c
-@@ -234,6 +234,13 @@ get_keymaps(int keylayout, struct xrdp_keymap* keymap)
-       g_file_close(fd);
-     }
-   }
-+  else if (keylayout != 0x409)
-+  {
-+    g_free(filename);
-+    g_writeln("keymap for 0x%4.4x was not found. Falling back to 0x0409 instead",
-+	      keylayout);
-+    return get_keymaps(0x409, keymap);
-+  }
-   g_free(filename);
-   return 0;
- }
diff --git a/environmnet.patch b/environmnet.patch
deleted file mode 100644
index e7ccc0d..0000000
--- a/environmnet.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-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/bash -l
- 
- # change the order in line below to run to run whatever window manager you
- # want, default to kde
diff --git a/sources b/sources
new file mode 100644
index 0000000..465fc72
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+a426071a522793eddf94c4bf80ca90dc  xrdp-HEAD-a9cfc23.tar.gz
diff --git a/xrdp.spec b/xrdp.spec
index 3cb7071..5fd97b9 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,33 +1,18 @@
 %{!?_initddir: %global _initddir %{_sysconfdir}/rc.d/init.d}
 
-%global cvs 03172010
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Version:   0.5.0
-Release:   0.12.%{cvs}%{?dist}
+Release:   0.13%{?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
-# following commands to generate the tarball:
-#
-# visit http://sourceforge.net/projects/xrdp/develop
-#
-# cvs -d:pserver:anonymous@xrdp.cvs.sourceforge.net:/cvsroot/xrdp login
-# cvs -z3 -d:pserver:anonymous@xrdp.cvs.sourceforge.net:/cvsroot/xrdp co -D 11-09-2009 -P xrdp
-# mv xrdp xrdp-0.5.0.20090911cvs
-# tar -czvf xrdp-0.5.0.20090911cvs.tar.gz xrdp-0.5.0.20090911cvs
-
-
+Source0:   http://server1.xrdp.org/xrdp/xrdp-HEAD-a9cfc23.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: xrdp-pam-auth.patch
-Patch1: environmnet.patch
-Patch2: 05-default-keymap.patch
-Patch3: limit-x-to-localhost.patch
+Patch1: xrdp-use-xinitrc-in-startm-sh.patch
+Patch2: xrdp-0.5.0-version.patch
 
 Source1: xrdp.init
 Source2: xrdp.sysconfig
@@ -59,14 +44,10 @@ server, capable of accepting connections from rdesktop and Microsoft's own
 terminal server / remote desktop clients.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n xrdp-HEAD-a9cfc23
 %patch0 -p2
-#fix rhbz #611669
 %patch1 -p2
-#fix keymap
-%patch2 -p1
-%patch3 -p1
-
+%patch2 -p2
 
 
 # remove unused modules from xrdp login combobox
@@ -184,6 +165,9 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %verify(not size md5 mtime) %{_sysconfdir}/xrdp/rsakeys.ini
 
 %changelog
+* Thu Nov 18 2010 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.5.0-0.13
+- up to git tag a9cfc235211a49c69c3cce3f98ee5976ff8103a4
+
 * Thu Nov 18 2010 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.5.0-0.12.03172010
 - fix logrotate to not restart xrdp and drop all open connections