diff options
author | ponce <matteo.bernardini@sns.it> | 2010-12-09 10:29:01 -0600 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-09 10:29:01 -0600 |
commit | c8cbc6a05cd2c057761c473574aefff409751c4c (patch) | |
tree | 7d7e44b78e7c3d27d22f5e9eb5dd70de34583bd3 /network/freenx/patches | |
parent | 8cb50d13eaa0a31273698f99bd5f668cb75edd66 (diff) |
network/freenx: Added (Free implementation of the NX Server)
Thanks to Eric Hameleers (alienBOB) for the original script
on which this one is based.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network/freenx/patches')
-rw-r--r-- | network/freenx/patches/authkeys.patch | 12 | ||||
-rw-r--r-- | network/freenx/patches/netcat.patch | 24 | ||||
-rw-r--r-- | network/freenx/patches/nxpaths.diff | 64 | ||||
-rw-r--r-- | network/freenx/patches/nxserver_multimedia.diff | 29 |
4 files changed, 129 insertions, 0 deletions
diff --git a/network/freenx/patches/authkeys.patch b/network/freenx/patches/authkeys.patch new file mode 100644 index 0000000000000..7633cee459d4c --- /dev/null +++ b/network/freenx/patches/authkeys.patch @@ -0,0 +1,12 @@ +diff -uarN freenx-server-0.7.3.orig/nxloadconfig freenx-server-0.7.3/nxloadconfig +--- freenx-server-0.7.3.orig/nxloadconfig 2008-08-22 02:44:43.000000000 +0200 ++++ freenx-server-0.7.3/nxloadconfig 2008-11-16 01:28:14.000000000 +0100 +@@ -70,7 +70,7 @@ + APPLICATION_LIBRARY_PRELOAD="" #Calculated + + # the name of the authorized keys file for ssh +-SSH_AUTHORIZED_KEYS="authorized_keys2" ++SSH_AUTHORIZED_KEYS="authorized_keys" + + # retest values like xauth, netcat and checks for nxdesktop/nxviewer availability + # set to 0 if you are sure, you set the right values diff --git a/network/freenx/patches/netcat.patch b/network/freenx/patches/netcat.patch new file mode 100644 index 0000000000000..91475d272a20c --- /dev/null +++ b/network/freenx/patches/netcat.patch @@ -0,0 +1,24 @@ +diff -uarN freenx-server-0.7.3.orig/node.conf.sample freenx-server-0.7.3/node.conf.sample +--- freenx-server-0.7.3.orig/node.conf.sample 2008-08-22 02:44:43.000000000 +0200 ++++ freenx-server-0.7.3/node.conf.sample 2008-11-16 01:26:58.000000000 +0100 +@@ -539,7 +539,7 @@ + #COMMAND_SMBUMOUNT_CIFS=/sbin/umount.cifs + + # The key that contains the name of the complete path of the 'netcat' command. +-#COMMAND_NETCAT=netcat ++#COMMAND_NETCAT=nc + + # The key that contains the name of the complete path of the 'ssh' and + # 'ssh-keygen' command. +diff -uarN freenx-server-0.7.3.orig/nxloadconfig freenx-server-0.7.3/nxloadconfig +--- freenx-server-0.7.3.orig/nxloadconfig 2008-08-22 02:44:43.000000000 +0200 ++++ freenx-server-0.7.3/nxloadconfig 2008-11-16 01:26:18.000000000 +0100 +@@ -195,7 +195,7 @@ + COMMAND_SMBUMOUNT=smbumount + COMMAND_SMBMOUNT_CIFS=/sbin/mount.cifs + COMMAND_SMBUMOUNT_CIFS=/sbin/umount.cifs +-COMMAND_NETCAT=netcat ++COMMAND_NETCAT=nc + COMMAND_SSH=ssh + COMMAND_SSH_KEYGEN=ssh-keygen + COMMAND_CUPSD=/usr/sbin/cupsd diff --git a/network/freenx/patches/nxpaths.diff b/network/freenx/patches/nxpaths.diff new file mode 100644 index 0000000000000..2273ff55edbe5 --- /dev/null +++ b/network/freenx/patches/nxpaths.diff @@ -0,0 +1,64 @@ +diff -uarN freenx-server-0.7.3.orig/node.conf.sample freenx-server-0.7.3/node.conf.sample +--- freenx-server-0.7.3.orig/node.conf.sample 2008-08-22 02:44:43.000000000 +0200 ++++ freenx-server-0.7.3/node.conf.sample 2009-01-27 21:03:36.000000000 +0100 +@@ -498,12 +498,12 @@ + # and .Xsession + # Depending on distribution DEFAULT_X_SESSION might be /etc/X11/xdm/Xsession, + # /etc/X11/Sessions/Xsession or /etc/X11/xinit/xinitrc +-#USER_X_STARTUP_SCRIPT=.Xclients +-#DEFAULT_X_SESSION=/etc/X11/xdm/Xsession ++#USER_X_STARTUP_SCRIPT=.xinitrc ++#DEFAULT_X_SESSION=/etc/X11/xinit/xinitrc + + # The key that contains the name of the script that starts a KDE session. + # It's run when a 'unix-kde' session is requested by the client. +-#COMMAND_START_KDE=startkde ++#COMMAND_START_KDE=/etc/X11/xinit/xinitrc.kde + + # The key that contains the name of the script that starts a gnome session. + # It's run when a 'unix-gnome' session is requested by the client. +diff -uarN freenx-server-0.7.3.orig/nxloadconfig freenx-server-0.7.3/nxloadconfig +--- freenx-server-0.7.3.orig/nxloadconfig 2008-08-22 02:44:43.000000000 +0200 ++++ freenx-server-0.7.3/nxloadconfig 2009-01-27 21:01:57.000000000 +0100 +@@ -56,8 +56,8 @@ + NX_LICENSE="OS (GPL, using backend: %BACKEND%)" + + # Where can different nx components be found +-NX_DIR=/usr +-PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys ++NX_DIR=/usr/lib/NX ++PATH_BIN=/usr/bin # if you change that, be sure to also change the public keys + PATH_LIB=$NX_DIR/lib + NX_ETC_DIR=/etc/nxserver + NX_SESS_DIR=/var/lib/nxserver/db +@@ -184,9 +184,9 @@ + + DEFAULT_X_WM="" + KILL_DEFAULT_X_WM="1" +-USER_X_STARTUP_SCRIPT=.Xclients +-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession +-COMMAND_START_KDE=startkde ++USER_X_STARTUP_SCRIPT=.xinitrc ++DEFAULT_X_SESSION=/etc/X11/xinit/xinitrc ++COMMAND_START_KDE=/etc/X11/xinit/xinitrc.kde + COMMAND_START_GNOME=gnome-session + COMMAND_START_CDE=cdwm + COMMAND_XTERM=xterm +@@ -317,7 +317,7 @@ + [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB + [ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" + +-NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') ++NX_BACKEND_VERSION=$(strings $NX_DIR/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') + + [ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend + +@@ -606,7 +606,7 @@ + [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \ + ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\"" + +- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ ++ [ -z "$(strings $NX_DIR/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ + WARNING="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX." + + [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ diff --git a/network/freenx/patches/nxserver_multimedia.diff b/network/freenx/patches/nxserver_multimedia.diff new file mode 100644 index 0000000000000..6f16bf9c24baf --- /dev/null +++ b/network/freenx/patches/nxserver_multimedia.diff @@ -0,0 +1,29 @@ +--- freenx-server-0.7.3/nxserver.orig 2008-12-30 21:21:40.000000000 +0100 ++++ freenx-server-0.7.3/nxserver 2008-12-30 21:22:50.000000000 +0100 +@@ -1447,7 +1447,7 @@ + # Now check for the other enabled services + + let SAMBA_DISPLAY=$SESS_DISPLAY+3000 +- if [ "$(getparam 'samba')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $SAMBA_DISPLAY ++ if [ "$(getparam 'samba')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $SAMBA_DISPLAY 2>/dev/null + then + log 2 "Warning: Skipping $SERVER_HOST:$AGENT_DISPLAY as samba port is not free." + let SESS_DISPLAY=$SESS_DISPLAY+1 +@@ -1455,7 +1455,7 @@ + fi + + let MEDIA_DISPLAY=$SESS_DISPLAY+7000 +- if [ "$(getparam 'media')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $MEDIA_DISPLAY ++ if [ "$(getparam 'media')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $MEDIA_DISPLAY 2>/dev/null + then + log 2 "Warning: Skipping $SERVER_HOST:$AGENT_DISPLAY as media port is not free." + let SESS_DISPLAY=$SESS_DISPLAY+1 +@@ -1464,7 +1464,7 @@ + + + let CUPS_DISPLAY=$SESS_DISPLAY+9000 +- if [ "$(getparam 'cups')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $CUPS_DISPLAY ++ if [ "$(getparam 'cups')" = 1 ] && $COMMAND_NETCAT -z "$SERVER_HOST" $CUPS_DISPLAY 2>/dev/null + then + log 2 "Warning: Skipping $SERVER_HOST:$AGENT_DISPLAY as cups port is not free." + let SESS_DISPLAY=$SESS_DISPLAY+1 |