Magellan Linux

Contents of /trunk/nxserver-freenx/patches/nxserver-freenx-0.5.0-nx2-backend-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


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

1 diff -Naur freenx-0.5.0.orig/node.conf.sample freenx-0.5.0/node.conf.sample
2 --- freenx-0.5.0.orig/node.conf.sample 2007-01-03 19:35:41.000000000 +0100
3 +++ freenx-0.5.0/node.conf.sample 2007-01-03 19:37:28.000000000 +0100
4 @@ -346,7 +346,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.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
14 --- freenx-0.5.0.orig/nxloadconfig 2007-01-03 19:35:41.000000000 +0100
15 +++ freenx-0.5.0/nxloadconfig 2007-01-03 19:37:15.000000000 +0100
16 @@ -173,7 +173,7 @@
17
18 # Misc directives
19
20 -ENABLE_2_0_0_BACKEND="0"
21 +ENABLE_2_0_0_BACKEND="1"
22 ENABLE_AUTORECONNECT="0"
23 ENABLE_AUTORECONNECT_BEFORE_140="1"
24 EXPORT_USERIP="0"
25 diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
26 --- freenx-0.5.0.orig/nxloadconfig 2007-01-03 21:25:11.000000000 +0100
27 +++ freenx-0.5.0/nxloadconfig 2007-01-03 21:26:23.000000000 +0100
28 @@ -52,7 +52,7 @@
29 # DO NOT TOUCH unless you REALLY know what you are doing
30 #########################################################################
31
32 -NX_VERSION=1.5.0-50
33 +NX_VERSION=2.1.0-11
34 NX_LICENSE="OS (GPL)"
35
36 # Where can different nx components be found
37 @@ -511,8 +511,9 @@
38 [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \
39 ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\""
40
41 - [ -z "$(strings $PATH_BIN/nxagent | grep 'NXAGENT - Version 1.5.0')" ] && \
42 - ERROR="yes" && echo "Error: Could not find 1.5.0 version string in nxagent. NX 1.5.0 backend is needed for this version of FreeNX."
43 + # disabled, nxagent is a wrapper
44 + #[ -z "$(strings $PATH_BIN/nxagent | grep 'NXAGENT - Version 1.5.0')" ] && \
45 + # ERROR="yes" && echo "Error: Could not find 1.5.0 version string in nxagent. NX 1.5.0 backend is needed for this version of FreeNX."
46
47 [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \
48 ERROR="yes" && echo "Error: Invalid value \"ENABLE_USESSION=$ENABLE_USESSION\""