Magellan Linux

Annotation of /trunk/nxserver-freenx/patches/nxserver-freenx-0.6.0-nx2-backend.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 151 - (hide annotations) (download)
Tue May 8 20:26:14 2007 UTC (17 years ago) by niro
File size: 2650 byte(s)
-moved to patches subdir

1 niro 151 diff -Naur freenx-0.6.0/node.conf.sample freenx-0.6.0.patched/node.conf.sample
2     --- freenx-0.6.0/node.conf.sample 2007-01-23 04:22:50.000000000 +0100
3     +++ freenx-0.6.0.patched/node.conf.sample 2007-01-25 10:34:07.000000000 +0100
4     @@ -336,7 +336,7 @@
5     #########################################################################
6    
7     # When you installed a 2.0.0 NX Backend, set this to 1.
8     -#ENABLE_2_0_0_BACKEND="0"
9     +#ENABLE_2_0_0_BACKEND="1"
10    
11     # When set to 1 this will automatically resume started sessions
12     #ENABLE_AUTORECONNECT="0"
13     diff -Naur freenx-0.6.0/nxloadconfig freenx-0.6.0.patched/nxloadconfig
14     --- freenx-0.6.0/nxloadconfig 2007-01-23 04:22:50.000000000 +0100
15     +++ freenx-0.6.0.patched/nxloadconfig 2007-01-25 10:36:45.000000000 +0100
16     @@ -171,7 +171,7 @@
17    
18     # Misc directives
19    
20     -ENABLE_2_0_0_BACKEND=""
21     +ENABLE_2_0_0_BACKEND="1"
22     ENABLE_AUTORECONNECT="0"
23     ENABLE_AUTORECONNECT_BEFORE_140="1"
24     EXPORT_USERIP="0"
25     @@ -263,7 +263,7 @@
26     [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB
27     [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB
28     [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB
29     -[ -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"
30     +[ -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.2:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2"
31     if [ -z "$ENABLE_2_0_0_BACKEND" ]
32     then
33     ENABLE_2_0_0_BACKEND="1"
34     @@ -509,8 +509,9 @@
35     [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
36     ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
37    
38     - [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
39     - 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."
40     + # disabled, nxagent is a wrapper
41     + #[ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0')" ] && \
42     + # 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."
43    
44     [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
45     ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""