summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-09-17 13:12:45 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-09-17 13:12:45 +0000
commitc8a55de076c918bac50b4371e8639830e93b4414 (patch)
tree81f15300c54e8aa308f88ec20a3a3b60cd22f948 /net-misc/nxserver-freenx/files
parentRemove DEPEND on nx-2.1 (diff)
downloadnx-c8a55de076c918bac50b4371e8639830e93b4414.tar.gz
nx-c8a55de076c918bac50b4371e8639830e93b4414.tar.bz2
nx-c8a55de076c918bac50b4371e8639830e93b4414.zip
More rdesktop/vnc tweaking
svn path=/testing/; revision=195
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch23
1 files changed, 13 insertions, 10 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 10a3a96..4321d1e 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 14:46:18.000000000 +0200
-+++ freenx-0.7.0/node.conf 2007-09-17 14:22:45.000000000 +0200
+--- 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
@@ -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 14:46:18.000000000 +0200
-+++ freenx-0.7.0/nxloadconfig 2007-09-17 14:29:43.000000000 +0200
+--- 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
@@ -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 14:46:18.000000000 +0200
-+++ freenx-0.7.0/nxnode 2007-09-17 14:30:20.000000000 +0200
+--- 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
@@ -414,7 +414,7 @@
# backingstore
@@ -91,12 +91,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,11 +457,11 @@
+@@ -457,21 +457,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)" -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 &
elif [ "$type" = "vnc" ]
then
@@ -105,12 +105,15 @@ 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 password
-@@ -471,7 +471,7 @@
+
+ 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
# 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)" -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 &
elif [ "$R" = "-R" -a "$rootless" != "1" ]
then