summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2007-03-21 13:06:47 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2007-03-21 13:06:47 +0000
commit2e3a8d040a76e400fc9a53945ce917382a496116 (patch)
tree7b51e88d1c43c56f0468c20fb99d616525af8416 /net-misc/nxserver-freenx/files
parentRemoved old profiles/ folder (diff)
downloadnx-2e3a8d040a76e400fc9a53945ce917382a496116.tar.gz
nx-2e3a8d040a76e400fc9a53945ce917382a496116.tar.bz2
nx-2e3a8d040a76e400fc9a53945ce917382a496116.zip
nx-2.1 and freenx-0.6 now in portage
svn path=/testing/; revision=153
Diffstat (limited to 'net-misc/nxserver-freenx/files')
-rw-r--r--net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.03
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch53
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch12
-rw-r--r--net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch39
4 files changed, 0 insertions, 107 deletions
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0
deleted file mode 100644
index 2d1c7bb..0000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 504aaa2c3c93c36eefab74e2b8a6506e freenx-0.6.0.tar.gz 110758
-RMD160 6000d5fed4d11dbb4c750b43c81626991460ccbb freenx-0.6.0.tar.gz 110758
-SHA256 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca freenx-0.6.0.tar.gz 110758
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch
deleted file mode 100644
index d0deb20..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-nxloadconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- nxloadconfig.orig 2007-01-23 04:22:50.000000000 +0100
-+++ nxloadconfig 2007-01-29 17:29:38.000000000 +0100
-@@ -58,7 +58,8 @@
- # 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
--PATH_LIB=$NX_DIR/lib
-+REAL_PATH_BIN=$NX_DIR/lib/NX/bin
-+PATH_LIB=$NX_DIR/lib/NX/lib
- NX_ETC_DIR=/etc/nxserver
- NX_SESS_DIR=/var/lib/nxserver/db
- NX_HOME_DIR=/var/lib/nxserver/home
-@@ -154,7 +155,7 @@
- DEFAULT_X_WM=""
- KILL_DEFAULT_X_WM="1"
- USER_X_STARTUP_SCRIPT=.Xclients
--DEFAULT_X_SESSION=/etc/X11/xdm/Xsession
-+DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession
- COMMAND_START_KDE=startkde
- COMMAND_START_GNOME=gnome-session
- COMMAND_START_CDE=cdwm
-@@ -263,11 +264,11 @@
- [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
- [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
- [ -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.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
-+[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so"
- if [ -z "$ENABLE_2_0_0_BACKEND" ]
- then
- ENABLE_2_0_0_BACKEND="1"
-- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
-+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0')" ] && ENABLE_2_0_0_BACKEND="0"
- fi
-
- [ -z "$KDE_PRINTRC" -a -n "$KDEHOME" ] && KDE_PRINTRC="$KDEHOME/share/config/kdeprintrc"
-@@ -288,7 +289,7 @@
- ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
- # Check for NX agents ...
-
-- [ ! -f "$PATH_BIN/nxagent" ] && \
-+ [ ! -f "$REAL_PATH_BIN/nxagent" ] && \
- ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components."
-
- [ ! -f "$PATH_BIN/nxdesktop" ] && \
-@@ -509,7 +510,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')" ] && \
-+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
- ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 backend is needed for this version of FreeNX."
-
- [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch
deleted file mode 100644
index e6ed42a..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rdesktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- nxnode.orig 2007-02-02 19:54:15.000000000 +0100
-+++ nxnode 2007-02-02 19:50:28.000000000 +0100
-@@ -253,6 +253,9 @@
-
- NODE_APPLICATION=$(node_find_application "$type")
-
-+ # For rdesktop/VNC, there is no application to start
-+ [ -n "$NODE_APPLICATION" ] || return
-+
- #
- # Check if we want to use a mediahelper
- #
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch
deleted file mode 100644
index eb30df2..0000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.6.0-rootless-mode.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- freenx-server/trunk/nxnode 2007/02/04 01:05:52 313
-+++ freenx-server/trunk/nxnode 2007/02/25 23:50:49 331
-@@ -969,7 +969,7 @@
- sync=$(getparam sync)
- samba=$(getparam samba)
- cups=$(getparam cups)
-- agent_server=$(getparam agent_server)
-+ agent_server=$(getparam agent_server | sed 's/%3A/:/g')
- agent_user=$(getparam agent_user)
- agent_password=$(getparam agent_password)
- agent_domain=$(getparam agent_domain)
-@@ -991,13 +991,17 @@
- rootless=0
- # Its still the clients decision
- [ "$ENABLE_ROOTLESS_MODE" = "1" ] && rootless=$(getparam rootless)
-+
-+ # Rootless fix from 2x nxserver 1.5.0
-+ realtype=$type
-+ [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop"
-
- # FreeNX specific variables
- clientproto=$(getparam clientproto)
- status=$(getparam status)
- host=$(getparam host)
-
-- fullscreen=""
-+ fullscreen=$(getparam fullscreen)
- [ "$geometry" = "fullscreen" ] && fullscreen="1"
-
- [ "$EXPORT_USERIP" = "1" ] && export NXUSERIP="$userip"
-@@ -1061,7 +1065,7 @@
- umask 0077
-
- cat << EOF > $USER_FAKE_HOME/.nx/C-$sess_id/options
--${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$type,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
-+${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}:$display
- EOF
- umask $OLD_UMASK
- #samba=$samba,