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
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')
-rw-r--r--net-misc/nxserver-freenx/Manifest32
-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
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.5.0.ebuild126
-rw-r--r--net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild131
9 files changed, 0 insertions, 637 deletions
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
deleted file mode 100644
index 9ec96e0..0000000
--- a/net-misc/nxserver-freenx/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
-AUX freenx-0.5.0-name-change.patch 7559 RMD160 1cc6e5e29e7ecf97df063f4c5c96451aefdd5043 SHA1 009687084f3964820bc357bed4433d6fca34563a SHA256 89c8c524dffbc2ee7ca2984eaffd6dc474baeb243b8ab08073968d53275d2a61
-MD5 49edb8005c18e2c8088bc95e588f6b8f files/freenx-0.5.0-name-change.patch 7559
-RMD160 1cc6e5e29e7ecf97df063f4c5c96451aefdd5043 files/freenx-0.5.0-name-change.patch 7559
-SHA256 89c8c524dffbc2ee7ca2984eaffd6dc474baeb243b8ab08073968d53275d2a61 files/freenx-0.5.0-name-change.patch 7559
-AUX freenx-svn-name-change.patch 7342 RMD160 a731d5d9ef4524cc81b88678ba32c183dbdf0116 SHA1 2e17d45316fd887566b61a6df6a74d121b277920 SHA256 e18ddf9fbb8169dd112fa5b556a76dc658e576962661ce811b9e3224e728b136
-MD5 a5d662513f52278c8757a85cd1b5ba31 files/freenx-svn-name-change.patch 7342
-RMD160 a731d5d9ef4524cc81b88678ba32c183dbdf0116 files/freenx-svn-name-change.patch 7342
-SHA256 e18ddf9fbb8169dd112fa5b556a76dc658e576962661ce811b9e3224e728b136 files/freenx-svn-name-change.patch 7342
-AUX freenx-svn-xorg7.patch 611 RMD160 2a7dc63cff63ced5a69c54f4a4a513fd4e1bafbc SHA1 f97d9692dac230281ff3bf011e3597cbbeb271f4 SHA256 54a18576f9dd918d56fefea6033c487e3d80f3725f980e200866e3c611ee23f4
-MD5 929c02373c1ec61a13ed33dcab420666 files/freenx-svn-xorg7.patch 611
-RMD160 2a7dc63cff63ced5a69c54f4a4a513fd4e1bafbc files/freenx-svn-xorg7.patch 611
-SHA256 54a18576f9dd918d56fefea6033c487e3d80f3725f980e200866e3c611ee23f4 files/freenx-svn-xorg7.patch 611
-AUX freenx-xorg7.patch 590 RMD160 ad610f08f19fed4365903883e9ac58c8765566ba SHA1 21444d5e71e66f8cf24b9292d8aa35dec6c98c49 SHA256 f690fa88b718e47c9d545f185bfa88ce8cf2c96ed0de26cd2ca27118c711e225
-MD5 2a253055c0eef647a0a8b922f321842d files/freenx-xorg7.patch 590
-RMD160 ad610f08f19fed4365903883e9ac58c8765566ba files/freenx-xorg7.patch 590
-SHA256 f690fa88b718e47c9d545f185bfa88ce8cf2c96ed0de26cd2ca27118c711e225 files/freenx-xorg7.patch 590
-DIST freenx-svn-20060711.tar.gz 54434 RMD160 d669ad17ed87d5e6d61ff2b4249f7aa2aabbb6dc SHA1 b6b11c377dab70a67ab3f5f7a90ffddeb52b29d8 SHA256 807740b2f07cf4f81a6b7982acaf98755546da2f4b7d1b90c2f8b2d1b3cd0929
-DIST nxserver-freenx-0.5.0.tar.gz 19 RMD160 584c57b4125ef3b0159f20b4dca9559c6ab14572 SHA1 93ee93b11dd2be72bd7ac8a585dca51f0ff54e73 SHA256 7c205e0ccb2b515ff4cd8ea8b63e353f867e73d5217bff82cefaafeea51b47b6
-EBUILD nxserver-freenx-0.5.0.ebuild 3830 RMD160 f63b86bc94f2c3297733d5b5398ace776db5afa8 SHA1 8f3a056ca27b6e835029e41d5e50d7cf4b79baa5 SHA256 da29093372e2f260ada3e8815d69546dd1ba5c47ea4a19379bfc7bcf040aa8bc
-MD5 25fccff528d2c478009c5584752d13e1 nxserver-freenx-0.5.0.ebuild 3830
-RMD160 f63b86bc94f2c3297733d5b5398ace776db5afa8 nxserver-freenx-0.5.0.ebuild 3830
-SHA256 da29093372e2f260ada3e8815d69546dd1ba5c47ea4a19379bfc7bcf040aa8bc nxserver-freenx-0.5.0.ebuild 3830
-EBUILD nxserver-freenx-0.6.0_alpha20060711.ebuild 4131 RMD160 fab937be50c039c5bcd5a5de1fe5af86f41ec16d SHA1 d61da2fa1a4528c660caee7b9cce132399369dcb SHA256 fad9b48c8c1e452bb77a6b24a6412e1550a361c6e638a82cb29a1bfac6480d97
-MD5 d6dc469e687839467eab647ca40d02f5 nxserver-freenx-0.6.0_alpha20060711.ebuild 4131
-RMD160 fab937be50c039c5bcd5a5de1fe5af86f41ec16d nxserver-freenx-0.6.0_alpha20060711.ebuild 4131
-SHA256 fad9b48c8c1e452bb77a6b24a6412e1550a361c6e638a82cb29a1bfac6480d97 nxserver-freenx-0.6.0_alpha20060711.ebuild 4131
-MD5 76d8082a363dfe8809918cab10be8ea1 files/digest-nxserver-freenx-0.5.0 253
-RMD160 e5c978cddd5cbea1896de845d5571f2e07ffd420 files/digest-nxserver-freenx-0.5.0 253
-SHA256 b2bf6f40af47c6f3001a95290af3d418fc246518fa77f069c405185e3706cd24 files/digest-nxserver-freenx-0.5.0 253
-MD5 6e7d7976a9c5babc901a03014f729379 files/digest-nxserver-freenx-0.6.0_alpha20060711 256
-RMD160 9539f85b0bca929ab2f41674da2c96976e30e253 files/digest-nxserver-freenx-0.6.0_alpha20060711 256
-SHA256 523f994845bbc683888a1882230149517159ca5f8530cc7ae15cd4012bede7ef files/digest-nxserver-freenx-0.6.0_alpha20060711 256
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
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.ebuild
deleted file mode 100644
index 0261476..0000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib eutils
-
-DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
-HOMEPAGE="http://freenx.berlios.de/"
-URI_BASE="http://download.berlios.de/freenx"
-SRC_URI="${URI_BASE}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="mirror strip"
-IUSE="arts cups esd"
-DEPEND="virtual/ssh
- dev-tcltk/expect
- sys-apps/gawk
- net-analyzer/gnu-netcat
- !ppc? ( >=net-misc/nxclient-1.5.0
- || ( ~net-misc/nx-x11-1.5.0
- ~net-misc/nx-x11-bin-1.5.0
- ~net-misc/nxnode-2.0.0 ) )
- ppc? ( || ( ~net-misc/nx-x11-1.5.0
- ~net-misc/nxnode-base-2.0.0 ) )
- arts? ( kde-base/arts )
- cups? ( net-print/cups )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/freenx-0.5.0
-
-pkg_setup () {
- enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch gentoo-nomachine.diff
- epatch ${FILESDIR}/freenx-xorg7.patch
- epatch ${FILESDIR}/freenx-0.5.0-name-change.patch
-
- # fix to make sure 32 bit libraries are used by nx-x11 on amd64
- has_multilib_profile && \
- sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig
-
- # Rename these files so they do not conflict with files installed by nxclient and nxnode.
- mv nxclient nxclient.freenx
- mv nxnode nxnode.freenx
- mv nxprint nxprint.freenx
-
- # Change the defaults in nxloadconfig to meet the users needs.
- if use arts ; then
- einfo "Enabling arts support."
- sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig
- sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample
- fi
- if use esd ; then
- einfo "Enabling esd support."
- sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig
- sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample
- fi
- if use cups ; then
- einfo "Enabling cups support."
- sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig
- sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample
- fi
-}
-
-src_compile() {
- einfo "Nothing to compile"
-}
-
-src_install() {
-
- NX_DIR=/usr/NX
- NX_ETC_DIR=${NX_DIR}/etc
- NX_SESS_DIR=${NX_DIR}/var/db
- NX_HOME_DIR=${NX_DIR}/home/nx
-
- into ${NX_DIR}
- dobin nxclient.freenx
- dobin nxkeygen
- dobin nxloadconfig
- dobin nxnode.freenx
- dobin nxnode-login
- dobin nxprint.freenx
- dobin nxserver
- dobin nxsetup
-
- dodir ${NX_ETC_DIR}
- for x in passwords passwords.orig ; do
- touch ${D}${NX_ETC_DIR}/${x}
- chmod 600 ${D}${NX_ETC_DIR}/${x}
- done
-
- insinto ${NX_ETC_DIR}
- doins node.conf.sample
-
- ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
- for x in closed running failed ; do
- keepdir ${NX_SESS_DIR}/${x}
- fperms 0700 ${NX_SESS_DIR}/${x}
- done
-
- dodir ${NX_HOME_DIR}/.ssh
- fperms 0700 ${NX_HOME_DIR}
- fperms 0700 ${NX_HOME_DIR}/.ssh
-
- cat << EOF >${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
- fperms 0600 ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
- cp ${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${D}${NX_HOME_DIR}/.ssh/authorized_keys2
- fperms 0600 ${NX_HOME_DIR}/.ssh/authorized_keys2
-
- echo -n "127.0.0.1" ${D}${NX_HOME_DIR}/.ssh/known_hosts
-
- chown -R nx:root ${D}${NX_DIR}
-}
-
-pkg_postinst () {
- usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild
deleted file mode 100644
index 1ce791f..0000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0_alpha20060711.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit multilib eutils
-
-DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
-HOMEPAGE="http://freenx.berlios.de/"
-URI_BASE="http://gentooexperimental.org/~sleepyhead/freenx/"
-SRC_URI="${URI_BASE}/freenx-svn-20060711.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="mirror strip"
-IUSE="arts cups esd"
-DEPEND="virtual/ssh
- dev-tcltk/expect
- sys-apps/gawk
- net-analyzer/gnu-netcat
- !ppc? ( >=net-misc/nxclient-1.5.0
- || ( ~net-misc/nxnode-2.0.0
- ~net-misc/nx-x11-1.5.0
- ~net-misc/nx-x11-bin-1.5.0 ) )
- ppc? ( || ( ~net-misc/nxnode-base-2.0.0
- ~net-misc/nx-x11-1.5.0 ) )
- arts? ( kde-base/arts )
- cups? ( net-print/cups )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/freenx-svn
-
-pkg_setup () {
- enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch gentoo-nomachine.diff
- epatch ${FILESDIR}/freenx-svn-xorg7.patch
- epatch ${FILESDIR}/freenx-svn-name-change.patch
-
- # fix to make sure 32 bit libraries are used by nx-x11 on amd64
- has_multilib_profile && \
- sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig
-
- # Rename these files so they do not conflict with files installed by nxclient and nxnode.
- mv nxclient nxclient.freenx
- mv nxnode nxnode.freenx
- mv nxprint nxprint.freenx
-
- # Change the defaults in nxloadconfig to meet the users needs.
- if has_version "~net-misc/nxclient-2.0.0" || has_version "~net-misc/nxclient-base-2.0.0" ; then
- einfo "Enabling the NX 2.0.0 backend support."
- sed -i '/ENABLE_2_0_0_BACKEND=/s/"0"/"1"/' nxloadconfig
- sed -i '/ENABLE_2_0_0_BACKEND=/s/"0"/"1"/' node.conf.sample
- fi
- if use arts ; then
- einfo "Enabling arts support."
- sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig
- sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample
- fi
- if use esd ; then
- einfo "Enabling esd support."
- sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig
- sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample
- fi
- if use cups ; then
- einfo "Enabling cups support."
- sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig
- sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample
- fi
-}
-
-src_compile() {
- einfo "Nothing to compile"
-}
-
-src_install() {
-
- NX_DIR=/usr/NX
- NX_ETC_DIR=${NX_DIR}/etc
- NX_SESS_DIR=${NX_DIR}/var/db
- NX_HOME_DIR=${NX_DIR}/home/nx
-
- into ${NX_DIR}
- dobin nxclient.freenx
- dobin nxkeygen
- dobin nxloadconfig
- dobin nxnode.freenx
- dobin nxnode-login
- dobin nxprint.freenx
- dobin nxserver
- dobin nxsetup
-
- dodir ${NX_ETC_DIR}
- for x in passwords passwords.orig ; do
- touch ${D}${NX_ETC_DIR}/${x}
- chmod 600 ${D}${NX_ETC_DIR}/${x}
- done
-
- insinto ${NX_ETC_DIR}
- doins node.conf.sample
-
- ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
- for x in closed running failed ; do
- keepdir ${NX_SESS_DIR}/${x}
- fperms 0700 ${NX_SESS_DIR}/${x}
- done
-
- dodir ${NX_HOME_DIR}/.ssh
- fperms 0700 ${NX_HOME_DIR}
- fperms 0700 ${NX_HOME_DIR}/.ssh
-
- cat << EOF >${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
- fperms 0600 ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
- cp ${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${D}${NX_HOME_DIR}/.ssh/authorized_keys2
- fperms 0600 ${NX_HOME_DIR}/.ssh/authorized_keys2
-
- echo -n "127.0.0.1" ${D}${NX_HOME_DIR}/.ssh/known_hosts
-
- chown -R nx:root ${D}${NX_DIR}
-}
-
-pkg_postinst () {
- usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-}