File freenx-server-0.7.2.diff of Package FreeNX
diff -u -r freenx-server-0.7.2.orig//Makefile freenx-server-0.7.2/Makefile --- freenx-server-0.7.2.orig//Makefile 2008-03-17 22:00:03.481542000 +0100 +++ Makefile 2008-03-17 22:37:58.743737000 +0100 @@ -12,7 +12,7 @@ done install: - . nxloadconfig;\ + . ./nxloadconfig;\ install -m755 -d $(DESTDIR)/$$PATH_BIN/ ;\ install -m755 -d $(DESTDIR)/$$PATH_LIB/ ;\ install -m755 -d $(DESTDIR)/$$NX_ETC_DIR/ ;\ @@ -22,5 +22,5 @@ install -m755 $$i $(DESTDIR)/$$PATH_BIN/ ;\ done;\ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION;\ - install -m644 node.conf.sample $(DESTDIR)/$$NX_ETC_DIR/ ; \ + install -m644 node.conf.sample $(DESTDIR)/$$NX_ETC_DIR/node.conf ; \ make -C nxredir install diff -u -r freenx-server-0.7.2.orig//nxredir/Makefile freenx-server-0.7.2/nxredir/Makefile --- freenx-server-0.7.2.orig//nxredir/Makefile 2008-03-17 22:00:04.501605750 +0100 +++ nxredir/Makefile 2008-03-17 22:40:57.582913750 +0100 @@ -24,7 +24,11 @@ else \ 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; \ fi .PHONY: clean install diff -u -r ../freenx-server-0.7.2.orig//node.conf.sample ./node.conf.sample --- ../freenx-server-0.7.2.orig//node.conf.sample 2008-03-17 22:00:03.401537000 +0100 +++ ./node.conf.sample 2008-03-17 23:08:50.459462000 +0100 @@ -146,7 +146,7 @@ # Note: You need to have the rights to access the display # else it does not work. # -#ENABLE_DESKTOP_SHARING=1 +#ENABLE_DESKTOP_SHARING=0 # # Enable or disable clipboard: diff -u -r ../freenx-server-0.7.2.orig//nxloadconfig ./nxloadconfig --- ../freenx-server-0.7.2.orig//nxloadconfig 2008-03-17 22:00:04.701618250 +0100 +++ ./nxloadconfig 2008-03-17 23:08:40.598845750 +0100 @@ -52,13 +52,13 @@ # DO NOT TOUCH unless you REALLY know what you are doing ######################################################################### -NX_VERSION=2.1.0-72 +NX_VERSION=2.1.0-72 NX_LICENSE="OS (GPL, using backend: %BACKEND%)" # 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 @@ -111,7 +111,7 @@ DISABLE_PERSISTENT_SESSION="" ENABLE_MIRROR_VIA_VNC=1 -ENABLE_DESKTOP_SHARING=1 +ENABLE_DESKTOP_SHARING=0 ENABLE_CLIPBOARD="both" ENABLE_PULLDOWN_MENU="1" @@ -307,9 +307,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.2:$APPLICATION_LIBRARY_PATH/libXcompext.so.2:$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 @@ -346,7 +346,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" ] @@ -598,7 +598,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.[01].0')" ] && \ + [ -z "$(strings /usr/lib/NX/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.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[01].0 backend is needed for this version of FreeNX." [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ diff -u -r ../freenx-server-0.7.2.orig//nxnode ./nxnode --- ../freenx-server-0.7.2.orig//nxnode 2008-03-17 22:00:03.457540500 +0100 +++ ./nxnode 2008-03-17 23:07:47.011496750 +0100 @@ -252,6 +252,8 @@ . /etc/profile [ -f ~/.bash_profile ] && . ~/.bash_profile + [ -f ~/.bash_login ] && . ~/.bash_login + [ -f ~/.profile ] && . ~/.profile mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/apps/" diff -u -r ../freenx-server-0.7.2.orig//nxsetup ./nxsetup --- ../freenx-server-0.7.2.orig//nxsetup 2008-03-17 22:00:03.605549750 +0100 +++ ./nxsetup 2008-03-17 23:08:16.097314500 +0100 @@ -222,7 +222,7 @@ fi # the nx user account might be locked, so unlock it. - passwd -u nx + #passwd -u nx } install_nx()
