summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-09-17 13:59:52 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-09-17 13:59:52 +0000
commit8004b8d061343a6aaaf4a1b81168178fdfc0479f (patch)
tree8dcd0bc5166a774f06d324306579e425b7a2f547 /net-misc/nxserver-freenx/files
parentMore rdesktop/vnc tweaking (diff)
downloadnx-8004b8d061343a6aaaf4a1b81168178fdfc0479f.tar.gz
nx-8004b8d061343a6aaaf4a1b81168178fdfc0479f.tar.bz2
nx-8004b8d061343a6aaaf4a1b81168178fdfc0479f.zip
Restore rdesktop functionality
svn path=/testing/; revision=196
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch41
1 files changed, 29 insertions, 12 deletions
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
index 4321d1e..720b922 100644
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
+++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch
@@ -1,6 +1,6 @@
diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
---- freenx-0.7.0.orig/node.conf 2007-09-17 15:11:12.000000000 +0200
-+++ freenx-0.7.0/node.conf 2007-09-17 15:10:56.000000000 +0200
+--- freenx-0.7.0.orig/node.conf 2007-09-17 15:53:24.000000000 +0200
++++ freenx-0.7.0/node.conf 2007-09-17 15:53:08.000000000 +0200
@@ -378,6 +378,9 @@
# When you installed a 2.0.0 NX Backend, set this to 1.
#ENABLE_2_0_0_BACKEND="0"
@@ -12,8 +12,8 @@ diff -Naur freenx-0.7.0.orig/node.conf freenx-0.7.0/node.conf
#ENABLE_AUTORECONNECT="0"
diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
---- freenx-0.7.0.orig/nxloadconfig 2007-09-17 15:11:12.000000000 +0200
-+++ freenx-0.7.0/nxloadconfig 2007-09-17 15:10:56.000000000 +0200
+--- freenx-0.7.0.orig/nxloadconfig 2007-09-17 15:53:24.000000000 +0200
++++ freenx-0.7.0/nxloadconfig 2007-09-17 15:53:07.000000000 +0200
@@ -184,6 +184,7 @@
# Misc directives
@@ -71,8 +71,8 @@ diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
[ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""
diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
---- freenx-0.7.0.orig/nxnode 2007-09-17 15:11:12.000000000 +0200
-+++ freenx-0.7.0/nxnode 2007-09-17 15:11:49.000000000 +0200
+--- freenx-0.7.0.orig/nxnode 2007-09-17 15:53:24.000000000 +0200
++++ freenx-0.7.0/nxnode 2007-09-17 15:55:03.000000000 +0200
@@ -414,7 +414,7 @@
# backingstore
@@ -82,7 +82,24 @@ diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
then
[ "$backingstore" != 1 ] && B="-bs $backingstore"
[ "$backingstore" = 1 ] && B="+bs"
-@@ -443,7 +443,7 @@
+@@ -424,6 +424,7 @@
+
+ G=""
+ [ -n "$geometry" ] && G="-geometry $geometry"
++ [ -n "$geometry" -a "$type" = "windows" ] && G="-g $geometry"
+
+ # type of session
+
+@@ -435,7 +436,7 @@
+ vncfullscreen=""
+ [ "$geometry" = "fullscreen" -a "$type" = "vnc" ] && vncfullscreen="-fullscreen" && G=""
+
+- [ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-geometry `echo $screeninfo | cut -d"x" -f1,2`"
++ [ "$geometry" = "fullscreen" -a "$type" = "windows" ] && G="-g`echo $screeninfo | cut -d"x" -f1,2`"
+
+ #
+ # Start the wanted nxagent
+@@ -443,7 +444,7 @@
if [ "$type" = "windows" ]
then
@@ -91,12 +108,12 @@ diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
[ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
# Setup optional parameters
-@@ -457,21 +457,21 @@
+@@ -457,21 +458,21 @@
# Start the agent
- echo "$agent_password" | $PATH_BIN/nxdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
-+ echo "$agent_password" | $PATH_BIN/rdesktop -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $K $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
++ echo "$agent_password" | $PATH_BIN/rdesktop $G $U $P $D $agent_server $AGENT_EXTRA_OPTIONS_RDP 2>&3 &
elif [ "$type" = "vnc" ]
then
@@ -108,16 +125,16 @@ diff -Naur freenx-0.7.0.orig/nxnode freenx-0.7.0/nxnode
mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/"
- echo "$agent_password" | $PATH_BIN/nxpasswd "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd" doit
-+ echo "$agent_password" | $PATH_BIN/vncpasswd "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd" doit
++ echo "$agent_password" | $PATH_BIN/vncpasswd -f > "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd"
# Start the agent
- $PATH_BIN/nxviewer -encodings tight hextile copyrect raw -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
-+ $PATH_BIN/vncviewer -encodings tight hextile copyrect raw -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" $vncfullscreen $G $K $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
++ $PATH_BIN/vncviewer -encodings "tight hextile copyrect raw" -passwd $USER_FAKE_HOME/.nx/C-$sess_id/scripts/.passwd $vncfullscreen $G $agent_server $AGENT_EXTRA_OPTIONS_RFB 2>&3 &
elif [ "$R" = "-R" -a "$rootless" != "1" ]
then
-@@ -942,8 +942,8 @@
+@@ -942,8 +943,8 @@
node_start_monitor()
{