File freenx-server-0.7.3.diff of Package FreeNX
diff -Nur freenx-server-0.7.3.orig/Makefile freenx-server-0.7.3/Makefile --- freenx-server-0.7.3.orig/Makefile 2008-08-18 04:16:25.000000000 +0200 +++ freenx-server-0.7.3/Makefile 2009-01-16 20:50:39.000000000 +0100 @@ -7,8 +7,8 @@ all: cd nxviewer-passwd && xmkmf && make Makefiles && make depend - source nxloadconfig &&\ - export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ + . ./nxloadconfig &&\ + export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ for i in $(SUBDIRS) ; \ do\ echo "making" all "in $$i..."; \ @@ -29,6 +29,7 @@ install -m755 $$i $(DESTDIR)/$$PATH_BIN/ || exit 1;\ done install -m644 node.conf.sample $(DESTDIR)/$$NX_ETC_DIR/ + install -m644 node.conf.sample $(DESTDIR)/$$NX_ETC_DIR/node.conf $(MAKE) -C nxredir install # uncomment the following line to make # nxserver-suid suid nx @@ -43,6 +44,6 @@ done install: - source nxloadconfig &&\ - export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ + . ./nxloadconfig &&\ + export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ $(MAKE) nxenv_install diff -Nur freenx-server-0.7.3.orig/nxloadconfig freenx-server-0.7.3/nxloadconfig --- freenx-server-0.7.3.orig/nxloadconfig 2008-08-22 02:44:43.000000000 +0200 +++ freenx-server-0.7.3/nxloadconfig 2009-01-16 20:52:42.000000000 +0100 @@ -58,7 +58,7 @@ # 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 +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 @@ -113,7 +113,7 @@ DISABLE_PERSISTENT_SESSION="" ENABLE_MIRROR_VIA_VNC=1 -ENABLE_DESKTOP_SHARING=1 +ENABLE_DESKTOP_SHARING=0 ENABLE_SESSION_SHADOWING_AUTHORIZATION=1 ENABLE_INTERACTIVE_SESSION_SHADOWING=1 @@ -315,9 +315,9 @@ [ -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:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" +[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6:$APPLICATION_LIBRARY_PATH/libXext.so.6:$APPLICATION_LIBRARY_PATH/libXcomp.so.3:$APPLICATION_LIBRARY_PATH/libXcompext.so.3:$APPLICATION_LIBRARY_PATH/libXrender.so.1" -NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') +NX_BACKEND_VERSION=$(strings /usr/lib/NX/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') [ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend @@ -354,7 +354,7 @@ ERROR="yes" && echo "Error: Invalid value \"PATH_BIN=$PATH_BIN\"" # Check for NX agents ... - [ ! -x "$PATH_BIN/nxagent" ] && \ + [ ! -x "/usr/lib/NX/nxagent" ] && \ ERROR="yes" && echo "Error: Could not find nxagent in $PATH_BIN. Please install some OSS components." if [ "ENABLE_EXTERNAL_NXDESKTOP" = "1" ] @@ -606,7 +606,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|NXAGENT - Version 3.[012].0')" ] && \ + [ -z "$(strings /usr/lib/NX/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ WARNING="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX." [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ diff -Nur freenx-server-0.7.3.orig/nxnode freenx-server-0.7.3/nxnode --- freenx-server-0.7.3.orig/nxnode 2008-08-22 02:44:43.000000000 +0200 +++ freenx-server-0.7.3/nxnode 2009-01-16 20:50:39.000000000 +0100 @@ -260,6 +260,8 @@ . /etc/profile [ "$ENABLE_SOURCE_BASH_PROFILE" = "1" -a -f ~/.bash_profile ] && . ~/.bash_profile + [ "$ENABLE_SOURCE_BASH_PROFILE" = "1" -a -f ~/.bash_login ] && . ~/.bash_login + [ "$ENABLE_SOURCE_BASH_PROFILE" = "1" -a -f ~/.profile ] && . ~/.profile mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/apps/" diff -Nur freenx-server-0.7.3.orig/nxredir/Makefile freenx-server-0.7.3/nxredir/Makefile --- freenx-server-0.7.3.orig/nxredir/Makefile 2008-07-31 20:12:33.000000000 +0200 +++ freenx-server-0.7.3/nxredir/Makefile 2009-01-16 20:50:39.000000000 +0100 @@ -23,7 +23,11 @@ install: all install -m755 libnxredir.so.0 $(DESTDIR)/usr/lib install -m755 nxredir $(DESTDIR)/usr/bin - install -m755 nxsmb $(DESTDIR)/usr/lib/cups/backend/ + if [ -d $(DESTDIR)/usr/lib64/cups/backend ]; then \ + install -m755 nxsmb $(DESTDIR)/usr/lib64/cups/backend/ ;\ + else \ + install -m755 nxsmb $(DESTDIR)/usr/lib/cups/backend/ ;\ + fi endif .PHONY: clean install diff -Nur freenx-server-0.7.3.orig/nxsetup freenx-server-0.7.3/nxsetup --- freenx-server-0.7.3.orig/nxsetup 2008-03-11 00:01:03.000000000 +0100 +++ freenx-server-0.7.3/nxsetup 2009-01-16 20:50:39.000000000 +0100 @@ -222,7 +222,7 @@ fi # the nx user account might be locked, so unlock it. - passwd -u nx + #passwd -u nx } install_nx()
