diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2008-01-09 14:50:42 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2008-01-09 14:50:42 +0000 |
| commit | f5dca33be7bea85fb763fbbd04121bce509a591c (patch) | |
| tree | d936c08d73f49c9de25b805692f64a84d1a337e4 /net-misc | |
| parent | x86 stable, bug #197162 (diff) | |
| download | gentoo-2-f5dca33be7bea85fb763fbbd04121bce509a591c.tar.gz gentoo-2-f5dca33be7bea85fb763fbbd04121bce509a591c.tar.bz2 gentoo-2-f5dca33be7bea85fb763fbbd04121bce509a591c.zip | |
Update nxloadconfig patch for nx 3.1.0 detection
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/nxserver-freenx/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog index 5958c6ee8d22..03fbb6536dcd 100644 --- a/net-misc/nxserver-freenx/ChangeLog +++ b/net-misc/nxserver-freenx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/nxserver-freenx # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.41 2008/01/03 10:41:12 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.42 2008/01/09 14:50:41 voyageur Exp $ + + 09 Jan 2008; Bernard Cafarelli <voyageur@gentoo.org> + files/nxserver-freenx-0.7.1-nxloadconfig.patch: + Update nxloadconfig patch for nx 3.1.0 detection 03 Jan 2008; Bernard Cafarelli <voyageur@gentoo.org> files/nxserver.init: Make init script POSIX-compliant, bug #203451 diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch index e793ab7c7191..7dd476d62d1a 100644 --- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.1-nxloadconfig.patch @@ -33,7 +33,7 @@ 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" ++ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && ENABLE_2_0_0_BACKEND="0" fi if [ "$ENABLE_KDE_CUPS" = "1" ] @@ -51,7 +51,7 @@ 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.0.0')" ] && \ -+ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.0.0')" ] && \ ++ [ -z "$(strings $REAL_PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[01].0')" ] && \ ERROR="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.0.0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.0.0 backend is needed for this version of FreeNX." [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ |