[gentoo-commits] gentoo-x86 commit in net-misc/nxserver-freenx/files: nxserver-freenx-0.7.1-nxloadconfig.patch

[Bernard Cafarelli (voyageur)]

voyageur    07/11/26 12:50:26

  Modified:             nxserver-freenx-0.7.1-nxloadconfig.patch
  Log:
  Fix nxloadconfig patch, bug #198927
  (Portage version: 2.1.4_rc3)

Revision  Changes    Path
1.2                  net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch?r1=1.1&r2=1.2

Index: nxserver-freenx-0.7.1-nxloadconfig.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nxserver-freenx-0.7.1-nxloadconfig.patch	31 Oct 2007 19:49:55 -0000	1.1
+++ nxserver-freenx-0.7.1-nxloadconfig.patch	26 Nov 2007 12:50:25 -0000	1.2
@@ -28,6 +28,15 @@
  if [ -z "$ENABLE_2_0_0_BACKEND" ]
  then
  	ENABLE_2_0_0_BACKEND="1"
+@@ -301,7 +301,7 @@
+ 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|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0"
++	[ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && ENABLE_2_0_0_BACKEND="0"
+ fi 
+ 
+ if [ "$ENABLE_KDE_CUPS" = "1" ]
 @@ -326,7 +327,7 @@
  		ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\""
  	# Check for NX agents ...



-- 
gentoo-commits@g.o mailing list