diff options
Diffstat (limited to 'net-misc/nxserver-freenx/files')
9 files changed, 329 insertions, 0 deletions
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch new file mode 100644 index 0000000..d64b302 --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.2-cups.patch @@ -0,0 +1,33 @@ +diff -Naur freenx-0.7.1.orig/node.conf.sample freenx-0.7.1/node.conf.sample +--- freenx-0.7.1.orig/node.conf.sample 2007-10-31 13:47:45.000000000 +0100 ++++ freenx-0.7.1/node.conf.sample 2007-10-31 13:48:35.000000000 +0100 +@@ -319,12 +319,12 @@ + # of available ppd drivers via the $COMMAND_FOOMATIC command. + + #ENABLE_FOOMATIC="1" +-#COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile" ++#COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile" + + # CUPS_BACKEND and CUPS_ETC are the corresponding paths of your CUPS + # installation. + +-#CUPS_BACKEND="/usr/lib/cups/backend" ++#CUPS_BACKEND="/usr/libexec/cups/backend" + #CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp" + #CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock" + #CUPS_ETC="/etc/cups" +diff -Naur freenx-0.7.1.orig/nxloadconfig freenx-0.7.1/nxloadconfig +--- freenx-0.7.1.orig/nxloadconfig 2007-10-31 13:47:45.000000000 +0100 ++++ freenx-0.7.1/nxloadconfig 2007-10-31 13:48:43.000000000 +0100 +@@ -155,9 +155,9 @@ + ENABLE_CUPS_SEAMLESS="0" + CUPS_SEAMLESS_DELAY="10" + ENABLE_FOOMATIC="1" +-COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile" ++COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile" + +-CUPS_BACKEND="/usr/lib/cups/backend" ++CUPS_BACKEND="/usr/libexec/cups/backend" + CUPS_IPP_BACKEND="$CUPS_BACKEND/nxipp" + CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock" + CUPS_ETC="/etc/cups/" diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-cflags.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-cflags.patch new file mode 100644 index 0000000..e57cf84 --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-cflags.patch @@ -0,0 +1,33 @@ +--- nx-session-launcher/Makefile.orig 2008-12-19 16:34:02.000000000 +0100 ++++ nx-session-launcher/Makefile 2008-12-19 16:34:55.000000000 +0100 +@@ -1,7 +1,6 @@ + .PHONY: all install + +-CC=gcc +-CFLAGS=-g -O2 -Wall -fPIC ++CFLAGS+=-fPIC + + SOURCES = nx-session-launcher-suid.c + PROGRAMS = nx-session-launcher-suid +--- nxredir/Makefile.orig 2008-12-19 16:33:53.000000000 +0100 ++++ nxredir/Makefile 2008-12-19 16:34:48.000000000 +0100 +@@ -1,7 +1,6 @@ + all: libnxredir.so + +-CC=gcc +-CFLAGS=-g -O2 -Wall -fPIC ++CFLAGS+=-fPIC + LIBNAME=libnxredir.so + VERSION=0 + +@@ -14,8 +13,8 @@ + rm -f *.o + + ifneq ($(NX_VERSION),) +-install: all +- install -m755 $(LIBNAME) $(DESTDIR)/$$PATH_LIB/ ++install: ++ install -m755 $(LIBNAME).$(VERSION) $(DESTDIR)/$$PATH_LIB/ + install -m755 nxredir $(DESTDIR)/$$PATH_BIN/ + install -m755 nxsmb $(DESTDIR)/$$CUPS_BACKEND/ + perl -pi -e "s,PATH_LIB=.*,PATH_LIB=\"$$PATH_LIB\",g" $(DESTDIR)/$$PATH_BIN/nxredir diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch new file mode 100644 index 0000000..385f96a --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-jobserver_fix.patch @@ -0,0 +1,12 @@ +diff -ru freenx-server_orig/Makefile freenx-server/Makefile +--- freenx-server_orig/Makefile 2009-03-29 14:07:27.000000000 +0200 ++++ freenx-server/Makefile 2010-05-09 09:18:36.000000000 +0200 +@@ -6,7 +6,7 @@ + PROGRAMS=nxacl.sample nxcheckload.sample nxcups-gethost nxdesktop_helper nxdialog nxkeygen nxloadconfig nxnode nxnode-login nxprint nxserver nxserver-helper/nxserver-helper nxsetup nxviewer_helper nxviewer-passwd/nxpasswd/nxpasswd nx-session-launcher/nx-session-launcher nx-session-launcher/nx-session-launcher-suid nxserver-usermode nxserver-suid/nxserver-suid + + all: +- cd nxviewer-passwd && xmkmf && make Makefiles && make depend ++ cd nxviewer-passwd && xmkmf && $(MAKE) Makefiles && $(MAKE) depend + source nxloadconfig &&\ + export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ + for i in $(SUBDIRS) ; \ diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-md5sum.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-md5sum.patch new file mode 100644 index 0000000..b62c0ff --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-md5sum.patch @@ -0,0 +1,24 @@ +diff -Naur freenx-server.orig//node.conf.sample freenx-server/node.conf.sample +--- freenx-server.orig//node.conf.sample 2010-07-19 17:01:24.146731690 +0200 ++++ freenx-server/node.conf.sample 2010-07-19 17:03:04.910481227 +0200 +@@ -560,7 +560,7 @@ + #COMMAND_CUPSD=/usr/sbin/cupsd + + # The tool to generate md5sums with +-#COMMAND_MD5SUM="openssl md5" ++#COMMAND_MD5SUM="md5sum" + + # The key that contains the name of the complete path of the 'rdesktop' command. + #COMMAND_RDESKTOP=rdesktop +diff -Naur freenx-server.orig//nxloadconfig freenx-server/nxloadconfig +--- freenx-server.orig//nxloadconfig 2010-07-19 17:01:24.146731690 +0200 ++++ freenx-server/nxloadconfig 2010-07-19 17:03:14.234544279 +0200 +@@ -213,7 +213,7 @@ + COMMAND_SSH=ssh + COMMAND_SSH_KEYGEN=ssh-keygen + COMMAND_CUPSD=/usr/sbin/cupsd +-COMMAND_MD5SUM="openssl md5" ++COMMAND_MD5SUM="md5sum" + COMMAND_PERL=perl + COMMAND_RDESKTOP="rdesktop" + COMMAND_VNCVIEWER="vncviewer" diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxloadconfig.patch new file mode 100644 index 0000000..56c0255 --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxloadconfig.patch @@ -0,0 +1,47 @@ +--- nxloadconfig.orig 2009-12-15 21:31:45.000000000 +0100 ++++ nxloadconfig 2009-12-15 21:32:21.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 +@@ -194,14 +194,14 @@ + KILL_DEFAULT_X_WM="1" + BOOTSTRAP_X_SESSION="0" + USER_X_STARTUP_SCRIPT=.Xclients +-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession ++DEFAULT_X_SESSION=/etc/X11/Sessions/Xsession + COMMAND_GDM_X_SESSION="/etc/gdm/Xsession custom" + if [ ! -x "$COMMAND_GDM_X_SESSION" ] + then +- COMMAND_GDM_X_SESSION="/etc/X11/Xsession" ++ COMMAND_GDM_X_SESSION="/etc/X11/Sessions/Xsession" + fi + COMMAND_START_KDE=startkde +-COMMAND_START_GNOME=gnome-session ++COMMAND_START_GNOME=/etc/X11/Sessions/Gnome + COMMAND_START_CDE=cdwm + COMMAND_XTERM=xterm + COMMAND_XAUTH=/usr/bin/xauth +@@ -224,7 +224,7 @@ + COMMAND_NXSHADOWACL="$PATH_BIN/nxshadowacl" + COMMAND_NXACL="$PATH_BIN/nxacl" + COMMAND_NXCHECKLOAD="$PATH_BIN/nxcheckload" +-COMMAND_NXAGENT="$PATH_BIN/nxagent" ++COMMAND_NXAGENT="REAL_PATH_LIB/nxagent" + + # Guest directives + ENABLE_GUEST_LOGIN="0" +@@ -357,7 +357,7 @@ + [ -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:$APPLICATION_LIBRARY_PATH/libXext.so:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so" + + NX_BACKEND_VERSION=$(strings $COMMAND_NXAGENT 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') + diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch new file mode 100644 index 0000000..543cc16 --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch @@ -0,0 +1,106 @@ +diff -ruN freenx-server.orig/nxnode freenx-server/nxnode +--- freenx-server.orig/nxnode 2009-03-29 14:07:27.000000000 +0200 ++++ freenx-server/nxnode 2009-05-12 19:19:28.090537066 +0200 +@@ -85,6 +85,45 @@ + echo $sessionid + } + ++setup_samba() ++{ ++ smbport="" ++ ++ # We know from protocol traces that client=linux,winnt,macosx are valid values. ++ # I hope with smbclientproto=smb on default and smbclientproto=cifs on all valid ++ # values we get support for all those systems. ++ ++ smbproto="$SAMBA_MOUNT_SHARE_PROTOCOL" ++ ++ if [ "$smbproto" = "both" ] ++ then ++ smbproto="smbfs" ++ ++ [ "$client" = "linux" ] && smbproto="cifs" ++ [ "$client" = "winnt" ] && smbproto="cifs" ++ [ "$client" = "macosx" ] && smbproto="cifs" ++ ++ # FIXME: This is a rather wild guess ++ [ "$client" = "win9x" ] && smbproto="smbfs" ++ fi ++ ++ if [ "$smbproto" = "cifs" ] ++ then ++ smbport=445 ++ COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS ++ COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS ++ elif [ "$smbproto" = "none" ] # none ++ then ++ # we set this to true so that the ++ # SMB mount does not give an error message. ++ ++ COMMAND_SMBMOUNT=/bin/true ++ COMMAND_SMBUMOUNT=/bin/true ++ else # smbfs ++ smbport=139 ++ fi ++} ++ + # + # ----------------------------------------------------------------------------- + # Node functions module +@@ -735,6 +774,7 @@ + + node_umount_smb() + { ++ setup_samba + [ -e "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" ] || return + cat "$USER_FAKE_HOME/.nx/C-$sess_id/scripts/mpoint" | while read mpoint + do +@@ -1136,39 +1176,7 @@ + + if [ "$samba" = "1" ] + then +- # We know from protocol traces that client=linux,winnt,macosx are valid values. +- # I hope with smbclientproto=smb on default and smbclientproto=cifs on all valid +- # values we get support for all those systems. +- +- smbproto="$SAMBA_MOUNT_SHARE_PROTOCOL" +- +- if [ "$smbproto" = "both" ] +- then +- smbproto="smbfs" +- +- [ "$client" = "linux" ] && smbproto="cifs" +- [ "$client" = "winnt" ] && smbproto="cifs" +- [ "$client" = "macosx" ] && smbproto="cifs" +- +- # FIXME: This is a rather wild guess +- [ "$client" = "win9x" ] && smbproto="smbfs" +- fi +- +- if [ "$smbproto" = "cifs" ] +- then +- smbport=445 +- COMMAND_SMBMOUNT=$COMMAND_SMBMOUNT_CIFS +- COMMAND_SMBUMOUNT=$COMMAND_SMBUMOUNT_CIFS +- elif [ "$smbproto" = "none" ] # none +- then +- # we set this to true so that the +- # SMB mount does not give an error message. +- +- COMMAND_SMBMOUNT=/bin/true +- COMMAND_SMBUMOUNT=/bin/true +- else # smbfs +- smbport=139 +- fi ++ setup_samba + fi + + # FreeNX specific variables +@@ -1430,6 +1438,7 @@ + + cmd_node_smbmount() + { ++ setup_samba + sessionid=$(getparam_sessionid) + port=$(getparam port) + username=$(getparam username) diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch new file mode 100644 index 0000000..71a3177 --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-pam_ssh.patch @@ -0,0 +1,10 @@ +--- ./nxnode-login 2009-04-20 16:54:24.000000000 +0200 ++++ /usr/bin/nxnode-login 2009-04-20 16:54:27.000000000 +0200 +@@ -73,6 +73,7 @@ + expect { + "Are you sure you want to continue connecting (yes/no)?" { send "yes\r" } + "assword*:" { sleep 0.3; send "$password\r" } ++ "SSH passphrase:" { sleep 0.3; send "$password\r" } + "Permission denied*" { exit 1 } + "su: Authentication failure" { exit 1 } + "NX> 1000 NXNODE - Version" { diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch new file mode 100644 index 0000000..7490ace --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch @@ -0,0 +1,40 @@ +--- a/nx-session-launcher/Makefile.orig 2008-12-19 16:34:02.000000000 +0100 ++++ b/nx-session-launcher/Makefile 2008-12-19 16:34:55.000000000 +0100 +@@ -1,7 +1,6 @@ + .PHONY: all install + +-CC=gcc +-CFLAGS=-g -O2 -Wall -fPIC ++CFLAGS+=-fPIC + + SOURCES = nx-session-launcher-suid.c + PROGRAMS = nx-session-launcher-suid +--- a/nxredir/Makefile ++++ b/nxredir/Makefile +@@ -1,12 +1,11 @@ + all: libnxredir.so + +-CC=gcc +-CFLAGS=-g -O2 -Wall -fPIC ++CFLAGS+=-fPIC + LIBNAME=libnxredir.so + VERSION=0 + +-libnxredir.so: nxredir.o +- $(CC) -fPIC $(CFLAGS) -nostdlib -shared -Wl,-soname,$(LIBNAME).$(VERSION) -o $(LIBNAME).$(VERSION) nxredir.o -ldl -lc ++libnxredir.so: nxredir.c ++ $(CC) -fPIC $(CFLAGS) $(LDFLAGS) -nostdlib -shared -Wl,-soname,$(LIBNAME).$(VERSION) -o $(LIBNAME).$(VERSION) nxredir.c -ldl -lc + + clean: + rm -f $(LIBNAME) +@@ -14,8 +13,8 @@ + rm -f *.o + + ifneq ($(NX_VERSION),) +-install: all +- install -m755 $(LIBNAME) $(DESTDIR)/$$PATH_LIB/ ++install: ++ install -m755 $(LIBNAME).$(VERSION) $(DESTDIR)/$$PATH_LIB/ + install -m755 nxredir $(DESTDIR)/$$PATH_BIN/ + install -m755 nxsmb $(DESTDIR)/$$CUPS_BACKEND/ + perl -pi -e "s,PATH_LIB=.*,PATH_LIB=\"$$PATH_LIB\",g" $(DESTDIR)/$$PATH_BIN/nxredir diff --git a/net-misc/nxserver-freenx/files/nxserver.init b/net-misc/nxserver-freenx/files/nxserver.init new file mode 100644 index 0000000..564d0d6 --- /dev/null +++ b/net-misc/nxserver-freenx/files/nxserver.init @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/files/nxserver.init,v 1.3 2008/04/07 14:45:19 voyageur Exp $ + +depend() { + before sshd +} + +start() { + ebegin "Starting FreeNX server" + /usr/bin/nxserver --cleanup >/dev/null 2>&1 + /usr/bin/nxserver --start >/dev/null 2>&1 + eend $? +} + +stop() { + ebegin "Stopping FreeNX server" + /usr/bin/nxserver --stop >/dev/null 2>&1 + /usr/bin/nxserver --cleanup >/dev/null 2>&1 + eend 0 +} + +# vim:ts=4 |