Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
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
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
-rw-r--r--net-misc/nxserver-freenx/Manifest2
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.7.0-nx3support.patch41
2 files changed, 30 insertions, 13 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 8f9d704..48ab7c2 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 6558 RMD160 a058891711e09c6d0e1bd9faa70d09d07a8c85b3 SHA1 04711cc9de2a61129a0b8dcf9b487fbc7d3a67e1 SHA256 220fe1937affac69d102afa019d9051b32260300ef6f8fb5deb26d610c22d500
+AUX nxserver-freenx-0.7.0-nx3support.patch 6969 RMD160 c866cc6641ff560179a178b97fc9f1f9676a8d94 SHA1 191d8b0dc2d4e5b808de3d07537bf9b9f4824170 SHA256 d66f249c6aa6e759c667314f6e770e7074ceff3e318237a7d2de547ed485d601
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 3221 RMD160 852b96fbf43aa5ddc2c14270d1d0d2983e64bceb SHA1 fefcaf33055214f6569831e7f80d7e876e44016d SHA256 e800d9caf2edacda8cc43cd3ec6c3f9a096eae89760bbe1ff2bcec86afdea2f3
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()
{