New upstream version 2.1.3

2025-08-08 20:28:57 +02:00
commit beb2263461
101 changed files with 13044 additions and 0 deletions
--- a/dists/alt/99-altlinux.conf
+++ b/dists/alt/99-altlinux.conf
@@ -0,0 +1,4 @@
+# override defaualts for altlinux
+CUPS_ETC=/usr/share/cups/mime
+DEFAULT_X_SESSION=/etc/X11/Xsession
+COMMAND_START_GNOME="startgnome2"
--- a/dists/alt/rx-etersoft.spec
+++ b/dists/alt/rx-etersoft.spec
@@ -0,0 +1,440 @@
+%define cups_root %_prefix/lib
+%define oname freenx-server
+Name: rx-etersoft
+Version: 1.1.1
+Release: alt13
+
+Summary: Freenx application/thin-client server
+Group: Networking/Remote access
+License: GPLv2
+Url: http://wiki.etersoft.ru/RX
+
+Packager: Denis Baranov <baraka@etersoft.ru>
+
+Source: ftp://updates.etersoft.ru/pub/Etersoft/RX@Etersoft/unstable/sources/tarball/%oname-%version.tar.bz2
+Source1: %oname.init
+Source2: %oname.outformat
+Source6: sudoers.conf
+Source8: terminate-suspend-nx.sh
+Source10: 99-altlinux.conf
+
+Obsoletes: freenx
+Provides: freenx = %version
+
+Obsoletes: %oname
+Provides: %oname = %version
+
+Requires: nx
+Requires: openssl
+Requires: netcat
+Requires: expect
+Requires: foomatic-db-engine
+Requires: zenity
+%if %_vendor == "alt"
+Requires: dbus-tools-gui
+# FIXME: it needs for strings command, need to be removed
+Requires: binutils
+#Requires: Xdialog
+# FIXME: for which purposes?
+#Requires: /usr/bin/xvt
+%endif
+
+BuildPreReq: rpm-build-intro
+BuildRequires: imake xorg-cf-files gccmakedep xauth openssh-server
+
+%description
+Freenx is an application/thin-client server based on nx technology.
+NoMachine nx is the next-generation X compression and roundtrip suppression
+scheme. It can operate remote X11 sessions over 56k modem dialup links
+or anything better. This package contains a free (GPL) implementation
+of the nxserver component.
+
+%prep
+%setup -n %oname-%version
+# wrong install path
+%__subst "s|/usr/lib|%_libdir|g" nxredir/Makefile
+%__subst "s|%_libdir/cups|%cups_root/cups|g" Makefile
+# install use nxloadconfig
+%__subst "s|/usr/lib|%_libdir|g" nxloadconfig
+%__subst "s|%_libdir/cups|%cups_root/cups|g" nxloadconfig
+%__subst "s|\$NX_DIR/lib|%_libdir|g" nxloadconfig
+# nxredir nxsmb
+%__subst "s|/usr/lib|%_libdir|g" nxredir/nxredir
+%__subst "s|/usr/lib|%_libdir|g" nxredir/nxsmb
+%__subst "s|/usr/lib|%_libdir|g" %SOURCE10
+%__subst "s|%_libdir/cups|%cups_root/cups|g" nxredir/nxsmb
+
+%build
+%make_build
+
+%install
+%makeinstall_std
+mkdir -p %buildroot%_bindir/
+mkdir -p %buildroot%_var/lib/nxserver/home/
+mkdir -p %buildroot%_var/lib/nxserver/db/
+mkdir -p %buildroot%_sysconfdir/nxserver/node.conf.d/
+mkdir -p %buildroot%_sysconfdir/nxserver/acls/
+mkdir -p %buildroot%_datadir/%oname/node.conf.d/
+mkdir -p %buildroot%_sysconfdir/sysconfig/
+
+
+echo "# See /etc/nxserver/node.conf.d/*.conf" > node.conf
+
+install -m755 rxsetup %buildroot%_bindir/
+install -Dp -m755 %SOURCE1 %buildroot%_initdir/%oname
+install -Dp -m755 data/fixkeyboard %buildroot%_sysconfdir/nxserver/fixkeyboard
+install -Dp -m755 data/Xsession %buildroot%_sysconfdir/nxserver/Xsession
+install -Dp -m644 data/Xkbmap %buildroot%_sysconfdir/nxserver/Xkbmap
+install -Dp -m400 %SOURCE6 %buildroot%_sysconfdir/sudoers.d/nxserver
+install -Dp -m700 %SOURCE8 %buildroot%_bindir/terminate-suspend-nx
+install -Dp -m644 node.conf %buildroot%_sysconfdir/nxserver/node.conf
+install -m644 conf/conf.d/*.conf %buildroot%_datadir/%oname/node.conf.d
+install -m644 conf/conf.d/*.conf %buildroot%_sysconfdir/nxserver/node.conf.d
+install -m644 conf/acls/* %buildroot%_sysconfdir/nxserver/acls
+%if %_vendor == "alt"
+install -m644 %SOURCE10 %buildroot%_sysconfdir/nxserver/node.conf.d/
+%else
+install -m755 %SOURCE2 %buildroot%_initdir/
+%endif
+
+install -Dp -m644 data/logrotate %buildroot%_sysconfdir/logrotate.d/freenx-server
+install -Dp -m644 nx-session-launcher/ConsoleKit-NX.conf %buildroot%_sysconfdir/dbus-1/system.d/ConsoleKit-NX.conf
+mv nx-session-launcher/README nx-session-launcher/README.suid
+
+cat >> %buildroot%_sysconfdir/sysconfig/%oname << EOF
+#Time to live SUSPENDED freenx session in seconds for cron task.
+#If not set default value is 3600.
+#Cron task enable if value greater than 0.
+SESSION_TTL=0
+EOF
+
+%pre
+%groupadd nx 2> /dev/null ||:
+%useradd -g nx -G utmp -d /var/lib/nxserver/home/ -s %_bindir/nxserver \
+        -c "NX System User" nx 2> /dev/null ||:
+# FIXME: remove it strange code
+if [ ! -d %_datadir/fonts/misc ] && [ ! -e %_datadir/fonts/misc ] && [ -d %_datadir/fonts/bitmap/misc ]
+then
+    ln -s %_datadir/fonts/bitmap/misc %_datadir/fonts/misc
+fi
+
+%files
+%doc AUTHORS ChangeLog CONTRIB nxcheckload.sample node.conf.sample nx-session-launcher/README.suid
+%dir %_sysconfdir/nxserver/
+%dir %_sysconfdir/nxserver/node.conf.d/
+%dir %_sysconfdir/nxserver/acls/
+%config(noreplace) %_sysconfdir/nxserver/node.conf
+%config(noreplace) %_sysconfdir/nxserver/node.conf.d/*
+%config(noreplace) %_sysconfdir/nxserver/acls/*
+%_sysconfdir/nxserver/node.conf.sample
+%config(noreplace) %_sysconfdir/logrotate.d/freenx-server
+%attr(0400,root,root) %config %_sysconfdir/sudoers.d/nxserver
+%config(noreplace) %_sysconfdir/dbus-1/system.d/ConsoleKit-NX.conf
+%config(noreplace) %_sysconfdir/nxserver/Xkbmap
+%_sysconfdir/nxserver/fixkeyboard
+%_sysconfdir/nxserver/Xsession
+%config(noreplace) %_sysconfdir/sysconfig/%oname
+%_sysconfdir/cron.hourly/terminate-suspend-nx.sh
+%_initdir/%oname
+%if %_vendor == "alt"
+%else
+%_initdir/%oname.outformat
+%endif
+%attr(4711,nx,root) %_bindir/nx-session-launcher-suid
+%_bindir/nx*
+%_bindir/rxsetup
+%dir %_libdir/%oname/
+%attr(755,root,root) %_libdir/%oname/libnxredir.so.0
+%cups_root/cups/backend/nx*
+%attr(2750,nx,nx) %_var/lib/nxserver/home/
+%attr(2750,root,nx) %_var/lib/nxserver/db/
+%_datadir/%oname/
+
+%changelog
+* Fri Oct 21 2011 Denis Baranov <baraka@altlinux.ru> 1.1.1-alt13
+- add nx-3.5.0 version in check function (eterbug #7728)
+
+* Thu Sep 01 2011 Denis Baranov <baraka@altlinux.ru> 1.1.1-alt12
+- fix requires
+
+* Thu Aug 04 2011 Denis Baranov <baraka@altlinux.ru> 1.1.1-alt11
+- add start kill suspend script every 10 min
+- move sudo settings to sudoers.d folder
+
+* Fri Jan 14 2011 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt10
+- Fix error with zenity
+- Add message when folder not mount
+
+* Thu Jan 06 2011 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt9
+- rxsetup: add check for expect
+- fix error on mount folder with empty password
+- fix rxsetup log path
+- nxnode: logging is a little faster
+- fix endless cycle in node_start_applications()
+- new algorithm of share mounting (--smbmount)
+- chg start-modes of share/printer adding
+- norm_param(): check for iconv, logging switch off
+- fix Makefile: add nxacl.app to
+- smile acl syntax fix
+- upd config to acls check
+- add code&configs to acls check
+
+* Thu Dec 16 2010 Vitaly Lipatov <lav@altlinux.ru> 1.1.1-alt8
+- cleanup spec
+- change SMB_MOUNT_OPTIONS again, change links to unixforum.org
+- converting smb/cifs resurce-names
+- fix check_remote_printer()
+- fix for kde4 (merge with git.alt)
+- fix node_umount_smb()
+- new code to ENABLE_SHARE_MULTIMOUNT=1 or
+- nxlog tunning
+- rxsetup: disable direct dependency to /etc/init.d (missed on ALT)
+- rxsetup write output into log
+- update sudoers.conf
+
+* Tue Oct 12 2010 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt7
+- load config files from node.conf.d/ only *.conf
+
+* Mon Oct 11 2010 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt6
+- add autodetect KDE4 by default in conf
+- clean node.conf, all values must be override from /etc/nxserver/node.conf.d/*.conf
+
+* Thu Oct 07 2010 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt5
+- change COMMAND_MD5SUM on md5sum
+- add in config default DPI=96 (eterbug#6112)
+
+* Thu Oct 07 2010 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt4
+- fix build requeries
+
+* Fri Oct 01 2010 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt3
+- fix requeries
+
+* Fri Jul 30 2010 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt2
+- add support zenity for dialog interface
+- add requires zenity
+
+* Mon Jul 26 2010 Denis Baranov <baraka@etersoft.ru> 1.1.1-alt1
+- release RX@Etersoft 1.1.1
+
+* Sun Jul 25 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt24
+- fix printer forwarding (thx to dimbor and unixforum)
+- nxlog now always return '0'
+
+* Mon Jul 12 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt23
+- fix double slashes in nxsmb and nxredir (thx to dimbor)
+
+* Sun Jul 11 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt22
+- Added rxsetup script
+- Fixed config replacement
+- fix restore session after suspend (eterbug #5704)
+- do not source /etc/X11/profile.d/* in freenx Xsession
+
+* Sun Feb 14 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt21
+- move default config set to %_datadir/%name/node.conf.d.
+  All values must be override from /etc/nxserver/node.conf
+  and /etc/nxserver/node.conf.d
+
+* Sun Jan 31 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt20.1
+- fix defaults for all
+- add 100-altlinux.conf with ALTLinux defaults
+
+* Sun Jan 31 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt20
+- move all config values form node.conf to %_sysconfdir/nxserver/node.conf.d/*.conf
+
+* Sun Jan 03 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt19.7
+- fix permission on /tmp/.X11-unix after creating (fix eter#4653)
+
+* Sun Jan 03 2010 Boris Savelev <boris@altlinux.org> 0.7.4-alt19.6
+- fix NETCAT_COMMAND running (fix eter#3818)
+- add additional config for profile including during node startup ('on' by default)
+
+* Tue Dec 29 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt19.5
+- fix COMMAND_START_GNOME for ALTLinux (fix eter#4725)
+- don't start numlockx during session startup by default. Add additional config for numlockx
+
+* Wed Dec 02 2009 Eugeny A. Rostovtsev (REAL) <real at altlinux.org> 0.7.4-alt19.4.1
+- Rebuilt with python 2.6
+
+* Fri Nov 20 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt19.4
+- disable terminate-suspend-nx.sh cron task by default
+
+* Thu Nov 12 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt19.3
+- add Requires schedutils for ALT-system (fix eter#4421)
+- add cron-script for terminate suspended sessions (fix eter#4436)
+
+* Wed Oct 07 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt19.2
+- fix perm on nxserver sudo config (closes: #21860)
+
+* Tue Oct 06 2009 Vitaly Lipatov <lav@altlinux.ru> 0.7.4-alt19.1
+- fix mount-additional.conf packing
+
+* Wed Sep 30 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt19
+- add patch for Server mode CUPS
+  and SMB per-user share mount (from dimbor)
+
+* Tue Sep 22 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.12
+- fix CUPSLogLevel config parser
+
+* Thu Jul 30 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.11
+- fix restoring suspended sessions
+
+* Wed Jul 29 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.10
+- fix new bash regexp syntax
+
+* Wed Jul 29 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.9
+- fix new bash regexp syntax
+
+* Mon Jul 27 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.8
+- add patch from Mario Becroft (increase nxserver work speed)
+
+* Mon Jul 27 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.7
+- increase timeout for hangup session
+
+* Tue Jul 21 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.6
+- fix typo in nxnode
+
+* Tue Jul 21 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.5
+- fix typo in nxnode. Affected non-ALT systems
+
+* Tue Jul 14 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.4
+- add additional conf for mount share and CUPS
+
+* Sat Jun 13 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.3
+- xrdb merge /etc/X11/Xresources on startup
+
+* Tue Jun 09 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.2
+- use %_bindir/xvt if possible for ALT (ALT#20381)
+
+* Sat Jun 06 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18.1
+- add requires Xdialog (ALT#20325)
+
+* Sat Apr 11 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt18
+- include patch from Jeffrey J. Kosowsky for CUPS
+
+* Thu Apr 09 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt17
+- 2 small fixes
+- move fixkeyboard and etc to /etc/nxserver
+
+* Tue Mar 10 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt16.1
+- fix COMMAND_SMBMOUNT redifines
+
+* Tue Mar 10 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt16
+- build with for new nx
+
+* Sat Mar 07 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt15
+- force umount
+- merge with teambzr upstream
+
+* Fri Feb 27 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt14
+- fix export CUPS_SERVER with Win-client
+
+* Thu Feb 26 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt13
+- don't use Xsession for start desktop
+
+* Wed Feb 25 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt12
+- move libnxredir to %%_libdir/%name
+- check for first run in init-script
+
+* Wed Feb 25 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt11
+- add bungle for fixkeyboard
+- fix perm on libnxredir (hack, will be fixed soon)
+
+* Sun Feb 22 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt10
+- logrotate rule.
+- add LSB header.
+- patches from Ubuntu.
+- implementation of guest login.
+- nx-session-launcher:
+    + add DBUS rules
+    + fix permission on nx-session-launcher-suid
+    + add README for nx-session-launcher
+
+* Fri Feb 20 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt9
+- fix nxloadconfig for Etersoft SHARE_FAST_MOUNT
+
+* Thu Feb 19 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt8
+- fix eterbug #3226 (patch from horch)
+- add sleeping wait for valid display (fixkeyboard fails)
+
+* Thu Jan 08 2009 Boris Savelev <boris@altlinux.org> 0.7.4-alt7
+- fix path to cups backends on x86_64 (alt bug #18462)
+- fix path to LOCKDIR on Debian (eter bug #3094)
+
+* Tue Dec 16 2008 Boris Savelev <boris@altlinux.org> 0.7.4-alt6
+- fix path to cups
+- run "numlockx on" on session start
+
+* Sun Nov 23 2008 Boris Savelev <boris@altlinux.org> 0.7.4-alt5
+- fix permission on nx homedir
+
+* Sat Nov 22 2008 Boris Savelev <boris@altlinux.org> 0.7.4-alt4
+- add support nx 3.3
+
+* Tue Nov 11 2008 Boris Savelev <boris@altlinux.org> 0.7.4-alt3
+- add /var/lib/nxserver
+
+* Fri Sep 05 2008 Boris Savelev <boris@altlinux.org> 0.7.4-alt2
+- Fixed non-encrypted session mode. You might need to set EXTERNAL_PROXY_IP in node.conf.
+
+* Thu Aug 28 2008 Boris Savelev <boris@altlinux.org> 0.7.4-alt1
+- Opened the 0.7.4 development.
+- Fixed missing export of NX_ETC_DIR in Makefile, so node.conf.sample is installed correctly.
+- Fixed broken round-robin load balance algorithm.
+- Fixed --terminate|--suspend|--force-terminate for load balancing case.
+- Fixed --terminate|--suspend|--force-terminate for usermode case.
+
+* Sat Aug 23 2008 Boris Savelev <boris@altlinux.org> 0.7.3-alt3
+- Changed type for external agents to windows-helper or vnc-helper so that those sessions can be mirrored / shadowed as well.
+- Added nxshadowacl.sample component to be able to shadow foreign sessions.
+- Prepared shadowing foreign users for VNC-shadowing.
+- Added shadow support to --listsession command.
+- Added shadow mode as nxagent target.
+- Fixed shadow mode and made it usable.
+
+* Mon Aug 18 2008 Boris Savelev <boris@altlinux.org> 0.7.3-alt2
+- Build from git
+- Finally checked for all service ports. (cups, media, samba) and also checked it on the host where the load balancing actually leads to.
+- Fixed broken fallback logic if SSH_CLIENT variables cannot be read correctly.
+- Overhauled the usermode:
+- There are now two modes of operation.
+- One statically setting the ENABLE_USERMODE_AUTHENTICATION key in node.conf. (old behavior)
+- Or using nxserver-usermode as startup binary, which directly goes into the 103 stage.
+- Fixed using commandline parameters like --cleanup for static usermode.
+- Enabled the root commandline parameters in usermode.
+- Fixed usage of "nx" user as normal user in usermode.
+- Disabled slave mode and load balancing for usermode.
+- Fixed creation of the logfile directory.
+- Fixed nxnode usage of SSH_CLIENT using fallback mechanism.
+- Added disabled nxserver-suid wrapper with help from Google. To enable it uncomment the suid_install target in Makefile.
+- Automatically disabled slave mode, when load balancing is activated.
+- Made ENABLE_SLAVE_MODE="1" the new default as its faster and more reliable. If you encounter any problems with it, disable it in node.conf.
+
+* Mon Aug 11 2008 Boris Savelev <boris@altlinux.org> 0.7.3-alt1
+- svn update to r565
+- fix x86_64 build
+
+* Tue Jul 15 2008 Boris Savelev <boris@altlinux.org> 0.7.2-alt2
+- svn update to r546
+
+* Fri Jun 13 2008 Boris Savelev <boris@altlinux.org> 0.7.2-alt1
+- new version
+- fix altbug #16049
+- new init-script
+
+* Mon Jan 14 2008 Igor Zubkov <icesik@altlinux.org> 0.7.2-alt5.r430
+- fix path for libXrender
+
+* Sun Jan 06 2008 Igor Zubkov <icesik@altlinux.org> 0.7.2-alt4.r430
+- fix font path (#13830)
+
+* Thu Jan 03 2008 Igor Zubkov <icesik@altlinux.org> 0.7.2-alt3.r430
+- update from svn
+
+* Fri Dec 28 2007 Igor Zubkov <icesik@altlinux.org> 0.7.2-alt2.r427
+- mark %_sysconfdir/nxserver/node.conf a config(noreplace)
+- own %_sysconfdir/nxserver dir
+- add requires nx
+
+* Mon Dec 24 2007 Igor Zubkov <icesik@altlinux.org> 0.7.2-alt1.r427
+- build for Sisyphus
+
--- a/dists/gentoo/files/70-gentoo.conf
+++ b/dists/gentoo/files/70-gentoo.conf
@@ -0,0 +1,14 @@
+ENABLE_SLAVE_MODE="0"
+ENABLE_SHOW_RUNNING_SESSIONS="0"
+#NX_ACL_DIR="/etc/nxserver/acls"
+KDE4_ENABLE="0"
+COMMAND_START_KDE=/bin/false
+COMMAND_START_CDE=/bin/false
+COMMAND_START_KDE4=/bin/false
+ENABLE_KDE_CUPS="0"
+ENABLE_CUPS_SERVER_MODE="1"
+SAMBA_MOUNT_SHARE_PROTOCOL="cifs"
+ENABLE_SHARE_MULTIMOUNT="1"
+COMMAND_SMBMOUNT=/bin/false
+COMMAND_SMBUMOUNT=/bin/false
+COMMAND_SMBUMOUNT_CIFS="/bin/umount"
--- a/dists/gentoo/files/nxserver-freenx-0.7.4-nxloadconfig.patch
+++ b/dists/gentoo/files/nxserver-freenx-0.7.4-nxloadconfig.patch
@@ -0,0 +1,68 @@
+--- freenx-server/nxloadconfig.orig	2012-07-18 17:45:54.624000000 +0400
+++ freenx-server/nxloadconfig	2012-07-18 17:43:42.454003648 +0400
+@@ -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
+@@ -183,7 +183,7 @@
+ #JJK: added the following path referenced in nxprint
+ PPD_DIR="/usr/share/cups/model" #JJK: Note /usr/share/ppd on some systems
+ 
+-CUPS_BACKEND="/usr/lib/cups/backend"
+CUPS_BACKEND="/usr/libexec/cups/backend"
+ CUPS_IPP_BACKEND="$CUPS_BACKEND/ipp"
+ CUPS_DEFAULT_SOCK="/var/run/cups/cups.sock"
+ CUPS_ETC="/etc/cups/"
+@@ -202,15 +202,15 @@
+ 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/X11/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_KDE4="startkde4"
+-COMMAND_START_GNOME="gnome-session"
+COMMAND_START_GNOME="/etc/X11/Sessions/Gnome"
+ COMMAND_START_CDE=cdwm
+ COMMAND_XTERM=xterm
+ COMMAND_XAUTH=/usr/bin/xauth
+@@ -234,14 +234,15 @@
+ 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"
+-COMMAND_GUEST_LOGIN="/usr/lib/nx/guest/nxnode"
+COMMAND_GUEST_LOGIN="/usr/lib/NX/guest/nxnode"
+ # Try to use protected enviroment for guest sessions
+-COMMAND_GUEST_X_SESSION="/usr/share/gdm/guest-session/Xsession custom"
+-if [ ! -x "/usr/share/gdm/guest-session/Xsession" ]
+COMMAND_GUEST_X_SESSION="/usr/lib/NX/guest/Gnome"
+
+if [ ! -x "/usr/lib/NX/guest/Gnome" ]
+ then
+ 	COMMAND_GUEST_X_SESSION=$COMMAND_GDM_X_SESSION
+ fi
+@@ -406,7 +407,7 @@
+ [ -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-nx.so.6:$APPLICATION_LIBRARY_PATH/libXext-nx.so.6:$APPLICATION_LIBRARY_PATH/libXcomp.so.3:$APPLICATION_LIBRARY_PATH/libXcompext.so.3:$APPLICATION_LIBRARY_PATH/libXrender.so.1"
+[ -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')
+ 
--- a/dists/gentoo/files/nxserver-freenx-0.7.4-pam_ssh.patch
+++ b/dists/gentoo/files/nxserver-freenx-0.7.4-pam_ssh.patch
@@ -0,0 +1,10 @@
+--- freenx-server/nxnode-login.orig	2009-04-20 16:54:24.000000000 +0200
+++ freenx-server/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" { 
--- a/dists/gentoo/gentoo.postinst
+++ b/dists/gentoo/gentoo.postinst
@@ -0,0 +1,7 @@
+#!/bin/bash
+chmod 711 "/usr/libexec/cups/backend/ipp"
+chmod 755 "/usr/sbin/cupsd"
+chmod 4711 "/sbin/mount.cifs"
+ln -s /usr/share/cups/mime/mime.convs /etc/cups
+ln -s /usr/share/cups/mime/mime.types /etc/cups
+
--- a/dists/gentoo/nxserver-freenx-0.7.4-r665.ebuild
+++ b/dists/gentoo/nxserver-freenx-0.7.4-r665.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r6.ebuild,v 1.4 2011/11/24 21:00:12 voyageur Exp $
+
+EAPI=4
+
+inherit git-2 multilib eutils toolchain-funcs versionator
+
+MAJOR_PV="$(get_version_component_range 1-3)"
+PATCH_VER="$(get_version_component_range 4)"
+MY_PN="freenx-server"
+
+DESCRIPTION="Free Software Implementation of the NX Server"
+HOMEPAGE="http://freenx.berlios.de/ https://launchpad.net/~freenx-team"
+EGIT_REPO_URI="git://git.etersoft.ru/people/dimbor/packages/freenx-server.git"
+#EGIT_BOOTSTRAP="autogen.bash"
+SRC_URI=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nxclient rdesktop vnc"
+
+DEPEND="x11-misc/gccmakedep
+	x11-misc/imake"
+RDEPEND="dev-tcltk/expect
+	media-fonts/font-cursor-misc
+	sys-devel/bc
+	media-fonts/font-misc-misc
+	net-analyzer/gnu-netcat
+	>=net-misc/nx-2.1.0
+	sys-apps/gawk
+	virtual/ssh
+	x11-apps/xauth
+	x11-apps/xrdb
+	x11-apps/sessreg
+	x11-terms/xterm
+	nxclient? ( net-misc/nxclient )
+	!nxclient? ( !net-misc/nxclient
+				 || ( x11-misc/xdialog
+					  x11-apps/xmessage
+					    gnome-extra/zenity ) )
+	rdesktop? ( net-misc/rdesktop )
+	vnc? ( x11-misc/x11vnc
+		   net-misc/tightvnc )"
+
+S=${WORKDIR}
+
+export NX_HOME_DIR=/var/lib/nxserver/home
+
+pkg_setup () {
+	enewuser nx -1 -1 ${NX_HOME_DIR}
+}
+
+src_prepare() {
+	cd ${S}
+	epatch "${FILESDIR}"/nxserver-freenx-0.7.4-pam_ssh.patch
+	epatch "${FILESDIR}"/nxserver-freenx-0.7.4-nxloadconfig.patch
+
+	# Path to net-misc/nx files, support for nx >= 3.4.0
+	sed	-e "/PATH_LIB=/s/lib/$(get_libdir)/g" \
+		-e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \
+		-i ${MY_PN}/nxloadconfig || die "nxloadconfig sed failed"
+}
+
+src_compile() {
+	cd ${MY_PN}
+	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
+}
+
+src_install() {
+	export NX_ETC_DIR=/etc/nxserver
+	export NX_SESS_DIR=/var/lib/nxserver/db
+
+	cd ${MY_PN}
+	emake DESTDIR="${D}" install || die "install failed"
+
+#	LIBREDIR_DIR="${D}""usr/lib/freenx-server"
+#	dodir "/usr/lib/freenx-server"
+#	OLDREDIR_DIR="${D}""usr/$(get_libdir)/NX/$(get_libdir)/freenx-server"
+#	mv ${OLDREDIR_DIR}/libnxredir.so.0 ${LIBREDIR_DIR}
+#	[[ $(get_libdir) == "lib64" ]] && rm -r "${D}""usr/$(get_libdir)" || \
+#	    rm -r "${D}""usr/$(get_libdir)/NX"
+
+
+	# This should be renamed to remove the blocker on net-misc/nxclient
+	use nxclient && rm "${D}"/usr/bin/nxprint
+
+	dodir ${NX_ETC_DIR}
+	for x in passwords passwords.orig ; do
+		touch "${D}"${NX_ETC_DIR}/$x
+		chmod 600 "${D}"${NX_ETC_DIR}/$x
+	done
+
+
+	insinto ${NX_ETC_DIR}
+	for x in Xkbmap Xsession fixkeyboard ; do
+	    doins "${S}/${MY_PN}/data/$x"
+	    [[ $x == "Xkbmap" ]] && continue
+	    chmod 755 "${D}"${NX_ETC_DIR}/$x
+	done
+
+	CONF_DIR="${NX_ETC_DIR}"/node.conf.d
+	dodir ${CONF_DIR}
+	insinto ${CONF_DIR}
+
+	doins "${S}/${MY_PN}/conf/conf.d"/*
+	cp "${FILESDIR}"/70-gentoo.conf "${D}"${CONF_DIR}
+
+	ACL_DIR="${NX_ETC_DIR}/acls"
+	dodir "${ACL_DIR}"
+	insinto "${ACL_DIR}"
+	doins "${S}/${MY_PN}/conf/acls"/*
+
+	dodir "${NX_ETC_DIR}/ppd"
+
+	SUDO_DIR=/etc/sudoers.d
+	dodir ${SUDO_DIR}
+	insinto "${SUDO_DIR}"
+	newins "${S}/sudoers.conf" nxserver
+	chmod 440 "${D}"${SUDO_DIR}/nxserver
+
+	LOGR_DIR=/etc/logrotate.d
+	dodir ${LOGR_DIR}
+	insinto "${LOGR_DIR}"
+	newins "${S}/${MY_PN}/data/logrotate" nxserver
+
+	dodir ${NX_HOME_DIR}
+
+	for x in closed running failed ; do
+		keepdir ${NX_SESS_DIR}/$x
+		fperms 0700 ${NX_SESS_DIR}/$x
+	done
+
+	newinitd "${FILESDIR}"/nxserver.init nxserver
+}
+
+pkg_postinst () {
+	# Other NX servers ebuilds may have already created the nx account
+	# However they use different login shell/home directory paths
+	if [[ ${ROOT} == "/" ]]; then
+		usermod -s /usr/bin/nxserver nx || die "Unable to set login shell of nx user!!"
+		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
+		usermod -a -G utmp nx || die "Unable to add nx user to utmp group!!"
+	else
+		elog "If you had another NX server installed before, please make sure"
+		elog "the nx user account is correctly set to:"
+		elog " * login shell: /usr/bin/nxserver"
+		elog " * home directory: ${NX_HOME_DIR}"
+		elog " * supplementary groups: utmp"
+	fi
+
+	elog "To complete the installation, run:"
+	elog " nxsetup --install --setup-nomachine-key"
+	elog "This will use the default Nomachine SSH key"
+	elog "If you had older NX servers installed, you may need to add \"--clean --purge\" to the nxsetup command"
+
+	if has_version net-misc/openssh[-pam]; then
+		elog ""
+		elog "net-misc/openssh was not built with PAM support"
+		elog "You will need to unlock the nx account by setting a password for it"
+	fi
+}