summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2006-10-30 07:55:04 +0000
committerStuart Herbert <stuart@gentoo.org>2006-10-30 07:55:04 +0000
commita846f64a044cff67421f5caef00861fbed43a0ca (patch)
tree10f7071774ff985aa3bcb90f3dcd6c9685f682f1 /net-misc/nxserver-freenx/files
parentnet-misc/nxnode-base: fix nxnode-nxcomp patch to apply again (diff)
downloadnx-a846f64a044cff67421f5caef00861fbed43a0ca.tar.gz
nx-a846f64a044cff67421f5caef00861fbed43a0ca.tar.bz2
nx-a846f64a044cff67421f5caef00861fbed43a0ca.zip
Moved NX 2.x stuff into experimental
svn path=/testing/; revision=97
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-rw-r--r--net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.03
-rw-r--r--net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0_alpha200607113
-rw-r--r--net-misc/nxserver-freenx/files/freenx-0.5.0-name-change.patch153
-rw-r--r--net-misc/nxserver-freenx/files/freenx-svn-name-change.patch153
-rw-r--r--net-misc/nxserver-freenx/files/freenx-svn-xorg7.patch18
-rw-r--r--net-misc/nxserver-freenx/files/freenx-xorg7.patch18
6 files changed, 0 insertions, 348 deletions
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0
deleted file mode 100644
index 7555001..0000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34c1b7af469f3375e10e709df218e758 nxserver-freenx-0.5.0.tar.gz 19
-RMD160 584c57b4125ef3b0159f20b4dca9559c6ab14572 nxserver-freenx-0.5.0.tar.gz 19
-SHA256 7c205e0ccb2b515ff4cd8ea8b63e353f867e73d5217bff82cefaafeea51b47b6 nxserver-freenx-0.5.0.tar.gz 19
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0_alpha20060711 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0_alpha20060711
deleted file mode 100644
index f55b95a..0000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0_alpha20060711
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2bebb58d29112a39a99423c7fd650357 freenx-svn-20060711.tar.gz 54434
-RMD160 d669ad17ed87d5e6d61ff2b4249f7aa2aabbb6dc freenx-svn-20060711.tar.gz 54434
-SHA256 807740b2f07cf4f81a6b7982acaf98755546da2f4b7d1b90c2f8b2d1b3cd0929 freenx-svn-20060711.tar.gz 54434
diff --git a/net-misc/nxserver-freenx/files/freenx-0.5.0-name-change.patch b/net-misc/nxserver-freenx/files/freenx-0.5.0-name-change.patch
deleted file mode 100644
index 7d5859d..0000000
--- a/net-misc/nxserver-freenx/files/freenx-0.5.0-name-change.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -purN freenx-0.5.0.orig/nxclient freenx-0.5.0/nxclient
---- freenx-0.5.0.orig/nxclient 2005-08-02 12:49:08.000000000 -0500
-+++ freenx-0.5.0/nxclient 2006-07-11 20:04:32.000000000 -0500
-@@ -94,8 +94,8 @@ utility_printer()
- {
- UTILITY_DRIVERS_CACHE="$HOME/.nx/config/drivers.cache"
- [ -n "$USER_FAKE_HOME" ] && UTILITY_DRIVERS_CACHE="$USER_FAKE_HOME/.nx/config/drivers.cache"
-- UTILITY_NXPRINT="nxprint"
-- [ -n "$PATH_BIN" ] && UTILITY_NXPRINT="$PATH_BIN/nxprint"
-+ UTILITY_NXPRINT="nxprint.freenx"
-+ [ -n "$PATH_BIN" ] && UTILITY_NXPRINT="$PATH_BIN/nxprint.freenx"
- case "$1" in
- get)
- grep "driver|$2|" "$UTILITY_DRIVERS_CACHE" 2>/dev/null
-diff -purN freenx-0.5.0.orig/nxnode freenx-0.5.0/nxnode
---- freenx-0.5.0.orig/nxnode 2006-07-01 12:03:39.000000000 -0500
-+++ freenx-0.5.0/nxnode 2006-07-11 20:03:13.000000000 -0500
-@@ -959,10 +959,10 @@ cmd_node_smbmount()
- ERROR=$(PASSWD="$password" "$COMMAND_SMBMOUNT" "//$computername/$rdir" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
- if [ $? -eq 0 ]
- then
-- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display &
-+ $PATH_BIN/nxclient.freenx -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display &
- echo "$HOME/$dir" >> "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mpoint"
- else
-- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' failed to mount: $ERROR" -noautokill -display :$display &
-+ $PATH_BIN/nxclient.freenx -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' failed to mount: $ERROR" -noautokill -display :$display &
- fi
- }
-
-@@ -992,7 +992,7 @@ cmd_node_addprinter()
- DEVICE_URI="ipp://localhost:$port/printers/$printer"
- NAME="$printer"
- fi
-- MODEL=$($PATH_BIN/nxclient -printer "$NAME" -noautokill -display :$display)
-+ MODEL=$($PATH_BIN/nxclient.freenx -printer "$NAME" -noautokill -display :$display)
- [ -z "$MODEL" -o "$MODEL" = "cancel: aborted" ] && return
-
- PUBLIC="-u allow:$USER"
-diff -purN freenx-0.5.0.orig/nxprint freenx-0.5.0/nxprint
---- freenx-0.5.0.orig/nxprint 2005-08-02 12:49:08.000000000 -0500
-+++ freenx-0.5.0/nxprint 2006-07-11 20:05:17.000000000 -0500
-@@ -30,11 +30,11 @@ done
-
- if [ "$HELP" = "yes" ]
- then
-- echo "nxprint - Prints a list of available drivers or printers"
-+ echo "nxprint.freenx - Prints a list of available drivers or printers"
- echo ""
-- echo "Syntax: nxprint --help"
-- echo " nxprint --drivers"
-- echo " nxprint --printes"
-+ echo "Syntax: nxprint.freenx --help"
-+ echo " nxprint.freenx --drivers"
-+ echo " nxprint.freenx --printes"
- echo
- echo " --drivers prints a list of available CUPS drivers"
- echo " --printers prints a list of available CUPS printers"
-diff -purN freenx-0.5.0.orig/nxserver freenx-0.5.0/nxserver
---- freenx-0.5.0.orig/nxserver 2006-07-01 12:03:07.000000000 -0500
-+++ freenx-0.5.0/nxserver 2006-07-11 20:03:51.000000000 -0500
-@@ -90,7 +90,7 @@ passdb_add_user()
- cp -f $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig
- echo "$PASSDB_CHUSER:*" >> $NX_ETC_DIR/passwords
- # deactivated to avoid problems with comm-server
-- su - $PASSDB_CHUSER -c "$PATH_BIN/nxnode --setkey"
-+ su - $PASSDB_CHUSER -c "$PATH_BIN/nxnode.freenx --setkey"
- }
-
- passdb_list_user()
-@@ -567,7 +567,7 @@ do
- then
- log 6 -n "ssh "
- export COMMAND_SSH
-- echo "$PASS" | $PATH_BIN/nxnode-login -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode" --check 2>&1 >/dev/null
-+ echo "$PASS" | $PATH_BIN/nxnode-login -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode.freenx" --check 2>&1 >/dev/null
- if [ $? -eq 0 ]
- then
- LOGIN_SUCCESS="1"
-@@ -579,7 +579,7 @@ do
- if [ "$ENABLE_SU_AUTHENTICATION" = "1" -a "$LOGIN_SUCCESS" = "0" ]
- then
- log 6 -n "su "
-- echo "$PASS" | $PATH_BIN/nxnode-login -- su "$USER" "" "$PATH_BIN/nxnode" --check 2>&1 >/dev/null
-+ echo "$PASS" | $PATH_BIN/nxnode-login -- su "$USER" "" "$PATH_BIN/nxnode.freenx" --check 2>&1 >/dev/null
- if [ $? -eq 0 ]
- then
- LOGIN_SUCCESS="1"
-@@ -636,7 +636,7 @@ nxnode_start()
- :
- #CMD="$1"
- #shift
-- #echo "$@" | $PATH_BIN/nxnode "$CMD"
-+ #echo "$@" | $PATH_BIN/nxnode.freenx "$CMD"
- }
-
- #NX> 1002 Commit
-@@ -666,15 +666,15 @@ server_nxnode_start()
- if [ "$LOGIN_METHOD" = "SSH" ]
- then
- export COMMAND_SSH
-- echo "$PASS" | NXNODE_TOSEND="$@" $PATH_BIN/nxnode-login -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode" "$CMD" 2>&1 | log_tee
-+ echo "$PASS" | NXNODE_TOSEND="$@" $PATH_BIN/nxnode-login -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode.freenx" "$CMD" 2>&1 | log_tee
- elif [ "$LOGIN_METHOD" = "SU" ]
- then
-- echo "$PASS" | NXNODE_TOSEND="$@" $PATH_BIN/nxnode-login -- su "$USER" "" "$PATH_BIN/nxnode" "$CMD" 2>&1 | log_tee
-+ echo "$PASS" | NXNODE_TOSEND="$@" $PATH_BIN/nxnode-login -- su "$USER" "" "$PATH_BIN/nxnode.freenx" "$CMD" 2>&1 | log_tee
- elif [ "$LOGIN_METHOD" = "USERMODE" ]
- then
-- echo "$@" | $PATH_BIN/nxnode "$CMD" 2>&1 | log_tee
-+ echo "$@" | $PATH_BIN/nxnode.freenx "$CMD" 2>&1 | log_tee
- else
-- echo "$@" | $COMMAND_SSH -l "$USER" "$NODE_HOSTNAME" -p $SSHD_PORT -x -2 -i $NX_ETC_DIR/users.id_dsa -o 'PubkeyAuthentication yes' -o 'RSAAuthentication yes' -o 'RhostsAuthentication no' -o 'PasswordAuthentication no' -o 'RhostsRSAAuthentication no' -o 'StrictHostKeyChecking no' $PATH_BIN/nxnode "$CMD" | log_tee
-+ echo "$@" | $COMMAND_SSH -l "$USER" "$NODE_HOSTNAME" -p $SSHD_PORT -x -2 -i $NX_ETC_DIR/users.id_dsa -o 'PubkeyAuthentication yes' -o 'RSAAuthentication yes' -o 'RhostsAuthentication no' -o 'PasswordAuthentication no' -o 'RhostsRSAAuthentication no' -o 'StrictHostKeyChecking no' $PATH_BIN/nxnode.freenx "$CMD" | log_tee
- fi
- }
-
-@@ -1488,14 +1488,14 @@ cmd_terminate()
- --suspend)
- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
- then
-- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend"
-+ echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode.freenx --suspend"
- fi
- ;;
- --terminate)
-- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate"
-+ echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode.freenx --terminate"
- ;;
- --force-terminate)
-- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate"
-+ echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode.freenx --terminate"
- session_close $cmd_sessionid
- ;;
- esac
-@@ -1526,7 +1526,7 @@ cmd_send()
- # is it a "good" session?
- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
- then
-- su - "$cmd_user" -c "$PATH_BIN/nxclient --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
-+ su - "$cmd_user" -c "$PATH_BIN/nxclient.freenx --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
- disown $!
- fi
- done
-@@ -1539,7 +1539,7 @@ cmd_send()
-
- if [ $UID -ne 0 ]
- then
-- [ "$1" = "--agent" ] && exec $PATH_BIN/nxnode "$@"
-+ [ "$1" = "--agent" ] && exec $PATH_BIN/nxnode.freenx "$@"
- [ "$1" != "--passwd" ] && cmd_usage
- cmd_user_passwd
- exit 0
diff --git a/net-misc/nxserver-freenx/files/freenx-svn-name-change.patch b/net-misc/nxserver-freenx/files/freenx-svn-name-change.patch
deleted file mode 100644
index 98ae45d..0000000
--- a/net-misc/nxserver-freenx/files/freenx-svn-name-change.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -purN freenx-svn.orig/nxclient freenx-svn/nxclient
---- freenx-svn.orig/nxclient 2006-07-11 19:17:03.000000000 -0500
-+++ freenx-svn/nxclient 2006-07-11 20:21:18.000000000 -0500
-@@ -96,8 +96,8 @@ utility_printer()
- {
- UTILITY_DRIVERS_CACHE="$HOME/.nx/config/drivers.cache"
- [ -n "$USER_FAKE_HOME" ] && UTILITY_DRIVERS_CACHE="$USER_FAKE_HOME/.nx/config/drivers.cache"
-- UTILITY_NXPRINT="nxprint"
-- [ -n "$PATH_BIN" ] && UTILITY_NXPRINT="$PATH_BIN/nxprint"
-+ UTILITY_NXPRINT="nxprint.freenx"
-+ [ -n "$PATH_BIN" ] && UTILITY_NXPRINT="$PATH_BIN/nxprint.freenx"
- case "$1" in
- get)
- grep "driver|$2|" "$UTILITY_DRIVERS_CACHE" 2>/dev/null
-diff -purN freenx-svn.orig/nxnode freenx-svn/nxnode
---- freenx-svn.orig/nxnode 2006-07-11 19:17:03.000000000 -0500
-+++ freenx-svn/nxnode 2006-07-11 20:19:03.000000000 -0500
-@@ -1156,10 +1156,10 @@ cmd_node_smbmount()
- error=$(PASSWD="$password" "$COMMAND_SMBMOUNT" "//$computername/$rdir" "$HOME/$dir" -o username="$username,ip=127.0.0.1,port=$port" 2>&1)
- if [ $? -eq 0 ]
- then
-- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display &
-+ $PATH_BIN/nxclient.freenx -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' mounted on: '$HOME/$dir'" -noautokill -display :$display &
- echo "$HOME/$dir" >> "$USER_FAKE_HOME/.nx/C-$SERVER_NAME-$display-$sessionid/scripts/mpoint"
- else
-- $PATH_BIN/nxclient -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' failed to mount: $error" -noautokill -display :$display &
-+ $PATH_BIN/nxclient.freenx -dialog ok -caption "NXServer Message" -message "Info: Share: '//$computername/$rdir' failed to mount: $error" -noautokill -display :$display &
- fi
- }
-
-@@ -1192,7 +1192,7 @@ cmd_node_addprinter()
- NAME="$printer"
- fi
-
-- MODEL=$($PATH_BIN/nxclient -printer "$NAME" -noautokill -display :$display)
-+ MODEL=$($PATH_BIN/nxclient.freenx -printer "$NAME" -noautokill -display :$display)
- [ -z "$MODEL" -o "$MODEL" = "cancel: aborted" ] && return
-
- PUBLIC="-u allow:$USER"
-diff -purN freenx-svn.orig/nxprint freenx-svn/nxprint
---- freenx-svn.orig/nxprint 2006-07-11 19:17:03.000000000 -0500
-+++ freenx-svn/nxprint 2006-07-11 20:22:07.000000000 -0500
-@@ -31,11 +31,11 @@ done
-
- if [ "$HELP" = "yes" ]
- then
-- echo "nxprint - Prints a list of available drivers or printers"
-+ echo "nxprint.freenx - Prints a list of available drivers or printers"
- echo ""
-- echo "Syntax: nxprint --help"
-- echo " nxprint --drivers"
-- echo " nxprint --printes"
-+ echo "Syntax: nxprint.freenx --help"
-+ echo " nxprint.freenx --drivers"
-+ echo " nxprint.freenx --printes"
- echo
- echo " --drivers prints a list of available CUPS drivers"
- echo " --printers prints a list of available CUPS printers"
-diff -purN freenx-svn.orig/nxserver freenx-svn/nxserver
---- freenx-svn.orig/nxserver 2006-07-11 19:17:03.000000000 -0500
-+++ freenx-svn/nxserver 2006-07-11 20:26:56.000000000 -0500
-@@ -90,7 +90,7 @@ passdb_add_user()
- cp -f $NX_ETC_DIR/passwords $NX_ETC_DIR/passwords.orig
- echo "$PASSDB_CHUSER:*" >> $NX_ETC_DIR/passwords
- # deactivated to avoid problems with comm-server
-- su - $PASSDB_CHUSER -c "$PATH_BIN/nxnode --setkey"
-+ su - $PASSDB_CHUSER -c "$PATH_BIN/nxnode.freenx --setkey"
- }
-
- passdb_list_user()
-@@ -672,7 +672,7 @@ do
- then
- log 6 -n "ssh "
- export COMMAND_SSH
-- nxnode_login "$PASS" -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode" --check 2>&1 >/dev/null
-+ nxnode_login "$PASS" -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode.freenx" --check 2>&1 >/dev/null
- if [ $? -eq 0 ]
- then
- LOGIN_SUCCESS="1"
-@@ -684,7 +684,7 @@ do
- if [ "$ENABLE_SU_AUTHENTICATION" = "1" -a "$LOGIN_SUCCESS" = "0" ]
- then
- log 6 -n "su "
-- nxnode_login "$PASS" -- su "$USER" "" "$PATH_BIN/nxnode" --check 2>&1 >/dev/null
-+ nxnode_login "$PASS" -- su "$USER" "" "$PATH_BIN/nxnode.freenx" --check 2>&1 >/dev/null
- if [ $? -eq 0 ]
- then
- LOGIN_SUCCESS="1"
-@@ -741,7 +741,7 @@ nxnode_start()
- :
- #CMD="$1"
- #shift
-- #echo "$@" | $PATH_BIN/nxnode "$CMD"
-+ #echo "$@" | $PATH_BIN/nxnode.freenx "$CMD"
- }
-
- #NX> 1002 Commit
-@@ -771,15 +771,15 @@ server_nxnode_start()
- if [ "$LOGIN_METHOD" = "SSH" ]
- then
- export COMMAND_SSH
-- NXNODE_TOSEND="$@" nxnode_login "$PASS" -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode" "$CMD" 2>&1 | log_tee
-+ NXNODE_TOSEND="$@" nxnode_login "$PASS" -- ssh "$USER" "$SSHD_PORT" "$PATH_BIN/nxnode.freenx" "$CMD" 2>&1 | log_tee
- elif [ "$LOGIN_METHOD" = "SU" ]
- then
-- NXNODE_TOSEND="$@" nxnode_login "$PASS" -- su "$USER" "" "$PATH_BIN/nxnode" "$CMD" 2>&1 | log_tee
-+ NXNODE_TOSEND="$@" nxnode_login "$PASS" -- su "$USER" "" "$PATH_BIN/nxnode.freenx" "$CMD" 2>&1 | log_tee
- elif [ "$LOGIN_METHOD" = "USERMODE" ]
- then
-- echo "$@" | $PATH_BIN/nxnode "$CMD" 2>&1 | log_tee
-+ echo "$@" | $PATH_BIN/nxnode.freenx "$CMD" 2>&1 | log_tee
- else
-- echo "$@" | $COMMAND_SSH -l "$USER" "$NODE_HOSTNAME" -p $SSHD_PORT -x -2 -i $NX_ETC_DIR/users.id_dsa -o 'PubkeyAuthentication yes' -o 'RSAAuthentication yes' -o 'RhostsAuthentication no' -o 'PasswordAuthentication no' -o 'RhostsRSAAuthentication no' -o 'StrictHostKeyChecking no' $PATH_BIN/nxnode "$CMD" | log_tee
-+ echo "$@" | $COMMAND_SSH -l "$USER" "$NODE_HOSTNAME" -p $SSHD_PORT -x -2 -i $NX_ETC_DIR/users.id_dsa -o 'PubkeyAuthentication yes' -o 'RSAAuthentication yes' -o 'RhostsAuthentication no' -o 'PasswordAuthentication no' -o 'RhostsRSAAuthentication no' -o 'StrictHostKeyChecking no' $PATH_BIN/nxnode.freenx "$CMD" | log_tee
- fi
- }
-
-@@ -1606,14 +1606,14 @@ cmd_terminate()
- --suspend)
- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
- then
-- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend"
-+ echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode.freenx --suspend"
- fi
- ;;
- --terminate)
-- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate"
-+ echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode.freenx --terminate"
- ;;
- --force-terminate)
-- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate"
-+ echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode.freenx --terminate"
- session_close $cmd_sessionid
- ;;
- esac
-@@ -1644,7 +1644,7 @@ cmd_send()
- # is it a "good" session?
- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type"
- then
-- su - "$cmd_user" -c "$PATH_BIN/nxclient --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
-+ su - "$cmd_user" -c "$PATH_BIN/nxclient.freenx --dialog ok --caption \"NX Administrator Message\" --message \"$@\" --noautokill -display \":$cmd_display\"" &
- disown $!
- fi
- done
-@@ -1657,7 +1657,7 @@ cmd_send()
-
- if [ $UID -ne 0 ]
- then
-- [ "$1" = "--agent" ] && exec $PATH_BIN/nxnode "$@"
-+ [ "$1" = "--agent" ] && exec $PATH_BIN/nxnode.freenx "$@"
- [ "$1" != "--passwd" ] && cmd_usage
- cmd_user_passwd
- exit 0
diff --git a/net-misc/nxserver-freenx/files/freenx-svn-xorg7.patch b/net-misc/nxserver-freenx/files/freenx-svn-xorg7.patch
deleted file mode 100644
index 5d7f2b7..0000000
--- a/net-misc/nxserver-freenx/files/freenx-svn-xorg7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- freenx-server/nxnode 2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode 2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,15 @@
-
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
-
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+ then
-+ export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+ fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" -a "$1" != "--agent" -a "$1" != "--slave" ]
- then
- read CMDLINE
diff --git a/net-misc/nxserver-freenx/files/freenx-xorg7.patch b/net-misc/nxserver-freenx/files/freenx-xorg7.patch
deleted file mode 100644
index 9884756..0000000
--- a/net-misc/nxserver-freenx/files/freenx-xorg7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- freenx-server/nxnode 2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode 2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,15 @@
-
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
-
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+ then
-+ export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+ fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" -a "$1" != "--agent" ]
- then
- read CMDLINE