Hello community,
here is the log from the commit of package xrdp
checked in at Wed Sep 24 17:45:07 CEST 2008.
--------
--- xrdp/xrdp.changes 2008-09-12 03:15:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/xrdp/xrdp.changes 2008-09-17 23:33:26.723220000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 17 17:34:08 EDT 2008 - hfiguiere@suse.de
+
+- Update xrdp-NOMAD.diff
+ * Fix Xdmx command line arguments
+ * Fix session data matching for XDMX sessions
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xrdp.spec ++++++
--- /var/tmp/diff_new_pack.C26267/_old 2008-09-24 17:45:02.000000000 +0200
+++ /var/tmp/diff_new_pack.C26267/_new 2008-09-24 17:45:02.000000000 +0200
@@ -20,7 +20,7 @@
Name: xrdp
Version: 0.4.1
-Release: 4
+Release: 7
License: GPL v2 or later
Requires: dbus-1 xorg-x11-server-dmx xorg-x11-server-rdp
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -87,6 +87,10 @@
%config(noreplace) %{_sysconfdir}/pam.d/xrdp-sesman
%changelog
+* Wed Sep 17 2008 hfiguiere@suse.de
+- Update xrdp-NOMAD.diff
+ * Fix Xdmx command line arguments
+ * Fix session data matching for XDMX sessions
* Thu Sep 11 2008 hfiguiere@suse.de
- Add Avahi support.
- More comprehensive support of NOMAD.
++++++ xrdp-NOMAD.diff ++++++
--- /var/tmp/diff_new_pack.C26267/_old 2008-09-24 17:45:02.000000000 +0200
+++ /var/tmp/diff_new_pack.C26267/_new 2008-09-24 17:45:02.000000000 +0200
@@ -1252,7 +1252,7 @@
+ $(LN_S) $(sysconfdir)/xrdp/xrdp.sh $(DESTDIR)/etc/init.d/xrdp
+# $(DESTDIR)$(bindir)/xrdp-keygen xrdp $(DESTDIR)$(sysconfdir)/xrdp/rsakeys.ini
diff --git a/instfiles/xrdp.sh b/instfiles/xrdp.sh
-index 3671004..d529fdf 100755
+index 3671004..870118e 100755
--- a/instfiles/xrdp.sh
+++ b/instfiles/xrdp.sh
@@ -4,8 +4,19 @@
@@ -1276,7 +1276,7 @@
LOG=/dev/null
CFGDIR=/etc/xrdp
-@@ -27,26 +37,25 @@ fi
+@@ -27,26 +38,25 @@ fi
xrdp_start()
{
@@ -1310,7 +1310,7 @@
if test $? -eq 0
then
return 1;
-@@ -57,7 +66,7 @@ is_xrdp_running()
+@@ -57,7 +67,7 @@ is_xrdp_running()
is_sesman_running()
{
@@ -1319,7 +1319,7 @@
if test $? -eq 0
then
return 1;
-@@ -122,7 +131,6 @@ case "$1" in
+@@ -122,7 +132,6 @@ case "$1" in
;;
force-reload|restart)
check_up
@@ -1551,19 +1551,23 @@
e = scp_v1s_connect_new_session(c, display);
switch (e)
diff --git a/sesman/sesman.ini b/sesman/sesman.ini
-index fd240e7..6323957 100644
+index fd240e7..b3c358c 100644
--- a/sesman/sesman.ini
+++ b/sesman/sesman.ini
-@@ -30,3 +30,7 @@ param2=-ac
+@@ -30,3 +30,11 @@ param2=-ac
[Xvnc]
param1=-bs
param2=-ac
+
+[Xdmx]
-+param1=-bs
++param1=-noreset
+param2=-ac
++param3=-nolisten
++param4=tcp
++param5=--
++param6=/usr/bin/Xfake
diff --git a/sesman/session.c b/sesman/session.c
-index 54e02ad..4ff59b8 100644
+index 54e02ad..308e68c 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -29,6 +29,7 @@
@@ -1574,7 +1578,38 @@
//#include