diff options
author | Stuart Herbert <stuart@gentoo.org> | 2006-11-08 22:04:29 +0000 |
---|---|---|
committer | Stuart Herbert <stuart@gentoo.org> | 2006-11-08 22:04:29 +0000 |
commit | 31091e30809559345bffad4455a9e1791762df36 (patch) | |
tree | a33c65506fce3dba652d7def57585f4c32283530 /net-misc/nxserver-freenx/files | |
parent | Added NX Server Free Edition (diff) | |
download | nx-31091e30809559345bffad4455a9e1791762df36.tar.gz nx-31091e30809559345bffad4455a9e1791762df36.tar.bz2 nx-31091e30809559345bffad4455a9e1791762df36.zip |
Remove unneeded files; sync w/ Portage
svn path=/testing/; revision=115
Diffstat (limited to 'net-misc/nxserver-freenx/files')
6 files changed, 0 insertions, 92 deletions
diff --git a/net-misc/nxserver-freenx/files/50nxserver b/net-misc/nxserver-freenx/files/50nxserver deleted file mode 100644 index a791ca2..0000000 --- a/net-misc/nxserver-freenx/files/50nxserver +++ /dev/null @@ -1,3 +0,0 @@ -PATH=/usr/NX/bin -ROOTPATH=/usr/NX/bin -CONFIG_PROTECT="/usr/NX/etc /usr/NX/home" diff --git a/net-misc/nxserver-freenx/files/fixes.diff b/net-misc/nxserver-freenx/files/fixes.diff deleted file mode 100644 index b82e9ce..0000000 --- a/net-misc/nxserver-freenx/files/fixes.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff -u --recursive freenx-0.2.8-orig/nxclient freenx-0.2.8/nxclient ---- freenx-0.2.8-orig/nxclient 2005-02-17 20:03:15.000000000 +0000 -+++ freenx-0.2.8/nxclient 2005-02-18 18:59:20.843775240 +0000 -@@ -8,7 +8,9 @@ - # it does check it someday. - - # First check if the commercial nxclient is available and use it --[ -x /usr/NX/bin/nxclient ] && exec /usr/NX/bin/nxclient "$@" -+# but check that it isn't this script to prevent a loop! -+NXCLIENT="/usr/NX/bin/nxclient" -+[ -x ${NXCLIENT} -a "`file -bi ${NXCLIENT}`" != 'application/x-shellscript' ] && exec ${NXCLIENT} "$@" - - TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display: -n $(basename $0) -- "$@"` - -diff -u --recursive freenx-0.2.8-orig/nxserver freenx-0.2.8/nxserver ---- freenx-0.2.8-orig/nxserver 2005-02-17 20:03:15.000000000 +0000 -+++ freenx-0.2.8/nxserver 2005-02-18 19:01:54.465015048 +0000 -@@ -495,7 +495,7 @@ - - server_nxnode_start_wait() - { -- server_nxnode_start $@ | while read CMD -+ server_nxnode_start "$@" | while read CMD - do - case "$CMD" in - "NX> 1006"*|"NX> 1005"*) diff --git a/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch b/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch deleted file mode 100644 index 773ef3a..0000000 --- a/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -purN freenx-0.4.4.org/nxsetup freenx-0.4.4.new/nxsetup ---- freenx-0.4.4.org/nxsetup 2005-08-02 12:29:59.000000000 -0500 -+++ freenx-0.4.4.new/nxsetup 2005-08-07 19:17:08.000000000 -0500 -@@ -116,7 +116,11 @@ useradd_nx() - # no, its a "normal" useradd - else - USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver" -- [ -n $SETUP_GID ] && USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS" -+ # gid specified? -+ if [ -n "$SETUP_GID" ] -+ then -+ USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS" -+ fi - # uid specified? - if [ -n "$SETUP_UID" ] - then diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch deleted file mode 100644 index 297befe..0000000 --- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-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" ] - then - read CMDLINE diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch deleted file mode 100644 index 9884756..0000000 --- a/net-misc/nxserver-freenx/files/nxserver-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/files/nxserver-path.diff b/net-misc/nxserver-freenx/files/nxserver-path.diff deleted file mode 100644 index 1e734c9..0000000 --- a/net-misc/nxserver-freenx/files/nxserver-path.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- nxserver.orig 2004-12-12 15:51:12.283474376 -0500 -+++ nxserver 2004-12-12 15:51:46.385290112 -0500 -@@ -487,7 +487,7 @@ - # Use nxnode-login? - if [ "$PAM_LOGIN_METHOD" = "1" ] - then -- echo $PAM_PASS | nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee -+ echo $PAM_PASS | $NX_DIR/bin/nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee - else - echo "$@" | ssh -l "$USER" 127.0.0.1 -p $SSHD_AUTH_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' $NX_DIR/bin/nxnode "$CMD" | log_tee - fi |