summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-09-17 12:47:50 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-09-17 12:47:50 +0000
commit09e864a20ad7ede5bccf85752c330916ffbbda22 (patch)
tree608e4fb5d70e4b873f483f6585bf6f589b624764 /net-misc/nxserver-freenx
parentWIP freenx 0.7 with NX 3.0 support (diff)
downloadnx-09e864a20ad7ede5bccf85752c330916ffbbda22.tar.gz
nx-09e864a20ad7ede5bccf85752c330916ffbbda22.tar.bz2
nx-09e864a20ad7ede5bccf85752c330916ffbbda22.zip
rdesktop/vnc fix with nx3.0
svn path=/testing/; revision=193
Diffstat (limited to 'net-misc/nxserver-freenx')
-rw-r--r--net-misc/nxserver-freenx/Manifest2
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch60
2 files changed, 55 insertions, 7 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 3ce21d4..0b301d1 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,6 +1,6 @@
AUX nxserver-freenx-0.6.0-nxloadconfig.patch 2823 RMD160 e3f4a7f32e3962690ba2704c612220f8dc99cb44 SHA1 58ea968770e729a029e05ce6934eb16339d0955c SHA256 660f3bf731114f9ea9cf0129649d95a3b1ac0dd219541ddf6866ed2ede725179
AUX nxserver-freenx-0.7.0-kdecups.patch 1373 RMD160 34227f429683b4d718321fb696faf5e05ed665dc SHA1 181797315f96fc9b2af32f975d6401deaa169023 SHA256 ad010a7b5d4f1874d9f4e60f18de370eb4a0b1e4ca78aff225918302b00d1ad2
-AUX nxserver-freenx-0.7.0-nx3support.patch 3980 RMD160 6a77fb0f0ba4bc5fd13fc3138109074611216994 SHA1 9f792653cc0827432d90b5bb65b95864db8277b0 SHA256 ebc083d044978ffbb3fc5aba471a4248823657659e5cb780640a8ea0dfa763cc
+AUX nxserver-freenx-0.7.0-nx3support.patch 6415 RMD160 de92efb2d563d4f4bd16fccaf0798ca3ae1f3be5 SHA1 d68834483a8de2d3430834ffa67d8a1fcfddc82b SHA256 4fe9a7e55adcccd7370d1889e1dc6f5967163e3c65c44c516739d6a23ba4595d
AUX nxserver-freenx-0.7.0-xfsfonts.patch 583 RMD160 74b3fb482b3fd1d689a24df19281ec9ff8223d13 SHA1 8d33b566cc23e52f25b356c4ce9a8675661fc440 SHA256 d5bc41d43d46728d770be26680970e8f1608b1aa97e1e0bb2f0cf34bd6c591df
DIST freenx-0.7.0.tar.gz 57614 RMD160 a051d4fcb96fd80b167c5fdc526cb5a789732057 SHA1 243f0c98f02b1c84c59e5b324a5a7e6d3d3d8db3 SHA256 61aedd3f8d3fae02b0e13de5f4ee1cb7bc1397dd7a379a67752a188d1f0119c9
EBUILD nxserver-freenx-0.7.0-r1.ebuild 3220 RMD160 04072c9dd47831f50ca1c9944d734f56679c238a SHA1 5a44b63d94284af9b832acf125ab6adcbfafd13b SHA256 11e346cdacd10ad18d4c59d7c0862d1edf2bd7981b516296bd5a21e8c1c8c584
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 d8d06a4..10a3a96 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:11:10.000000000 +0200
-+++ freenx-0.7.0/node.conf 2007-09-17 14:13:39.000000000 +0200
+--- 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
@@ -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:11:10.000000000 +0200
-+++ freenx-0.7.0/nxloadconfig 2007-09-17 14:19:00.000000000 +0200
+--- 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
@@ -184,6 +184,7 @@
# Misc directives
@@ -43,6 +43,22 @@ diff -Naur freenx-0.7.0.orig/nxloadconfig freenx-0.7.0/nxloadconfig
[ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
[ -z "$KDE_PRINTRC" -o ! -r "$KDE_PRINTRC" ] && KDE_PRINTRC="$HOME/.kde/share/config/kdeprintrc"
+@@ -303,11 +310,11 @@
+ [ ! -f "$REAL_PATH_BIN/nxagent" ] && \
+ ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
+
+- [ ! -f "$PATH_BIN/nxdesktop" ] && \
+- WARNING="yes" && echo "Warning: Could not find nxdesktop in $PATH_BIN. RDP sessions won't work."
++ [ ! -f "$PATH_BIN/rdesktop" ] && \
++ WARNING="yes" && echo "Warning: Could not find rdesktop in $PATH_BIN. RDP sessions won't work."
+
+- [ ! -f "$PATH_BIN/nxviewer" ] && \
+- WARNING="yes" && echo "Warning: Could not find nxviewer in $PATH_BIN. VNC sessions won't work."
++ [ ! -f "$PATH_BIN/vncviewer" ] && \
++ WARNING="yes" && echo "Warning: Could not find vncviewer in $PATH_BIN. VNC sessions won't work."
+
+ # Check for paths
+
@@ -535,8 +542,8 @@
[ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
@@ -55,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:11:10.000000000 +0200
-+++ freenx-0.7.0/nxnode 2007-09-17 14:20:34.000000000 +0200
+--- 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
@@ -414,7 +414,7 @@
# backingstore
@@ -66,6 +82,38 @@ 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 @@
+
+ if [ "$type" = "windows" ]
+ then
+- # nxdesktop session (Windows RDP)
++ # rdesktop session (Windows RDP)
+
+ [ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
+ # Setup optional parameters
+@@ -457,11 +457,11 @@
+
+ # 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 &
+
+ elif [ "$type" = "vnc" ]
+ then
+- # nxviewer session (VNC RFP)
++ # vncviewer session (VNC RFP)
+
+ [ "$SET_LD_LIBRARY_PATH" = "1" ] && export LD_LIBRARY_PATH="$AGENT_LIBRARY_PATH:$LD_LIBRARY_PATH"
+ # Setup password
+@@ -471,7 +471,7 @@
+
+ # 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 &
+
+ elif [ "$R" = "-R" -a "$rootless" != "1" ]
+ then
@@ -942,8 +942,8 @@
node_start_monitor()