metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

add missed files in last commit

Browse Source
This commit is contained in:
Itamar Reis Peixoto 2010-11-18 02:05:55 -02:00
parent c468641d78
commit efc2218e24
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xrdp-0.5.0-version.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ruNp a/xrdp-HEAD-a9cfc23/configure.ac b/xrdp-HEAD-a9cfc23/configure.ac
--- a/xrdp-HEAD-a9cfc23/configure.ac 2010-11-04 13:52:27.000000000 -0200
+++ b/xrdp-HEAD-a9cfc23/configure.ac 2010-11-18 01:22:22.566408534 -0200
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script
AC_PREREQ(2.59)
-AC_INIT([xrdp], [0.6.0], [xrdp-devel@lists.sourceforge.net])
+AC_INIT([xrdp], [0.5.0], [xrdp-devel@lists.sourceforge.net])
AM_CONFIG_HEADER(config_ac.h:config_ac-h.in)
AM_INIT_AUTOMAKE([1.6 foreign])
AC_PROG_CC
diff -ruNp a/xrdp-HEAD-a9cfc23/xrdp/xrdp.c b/xrdp-HEAD-a9cfc23/xrdp/xrdp.c
--- a/xrdp-HEAD-a9cfc23/xrdp/xrdp.c 2010-11-04 13:52:27.000000000 -0200
+++ b/xrdp-HEAD-a9cfc23/xrdp/xrdp.c 2010-11-18 01:22:49.398335339 -0200
@@ -485,7 +485,7 @@ main(int argc, char** argv)
g_writeln("xrdp: A Remote Desktop Protocol server.");
g_writeln("Copyright (C) Jay Sorg 2004-2010");
g_writeln("See http://xrdp.sourceforge.net for more information.");
- g_writeln("Version 0.6.0");
+ g_writeln("Version 0.5.0");
g_writeln("");
g_exit(0);
}

17
xrdp-use-xinitrc-in-startm-sh.patch Normal file
View File

@ -0,0 +1,17 @@
diff -ruNp a/xrdp-HEAD-a9cfc23/sesman/startwm.sh b/xrdp-HEAD-a9cfc23/sesman/startwm.sh
--- a/xrdp-HEAD-a9cfc23/sesman/startwm.sh 2010-11-04 13:52:27.000000000 -0200
+++ b/xrdp-HEAD-a9cfc23/sesman/startwm.sh 2010-11-18 01:08:01.275689981 -0200
@@ -1,5 +1,13 @@
#!/bin/sh
+# if xinitrc exists use it instead, it should load user prefferences
+# including desktop environment specified in /etc/sysconfig/desktop
+if [ -f /etc/X11/xinit/xinitrc ]
+then
+ . /etc/X11/xinit/xinitrc
+ exit 0
+fi
+
# change the order in line below to run to run whatever window manager you
# want, default to kde