New upstream version 2.1.3
This commit is contained in:
geos_one
14
dists/gentoo/files/70-gentoo.conf
Normal file
14
dists/gentoo/files/70-gentoo.conf
Normal file
@@ -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"
|
||||
68
dists/gentoo/files/nxserver-freenx-0.7.4-nxloadconfig.patch
Normal file
68
dists/gentoo/files/nxserver-freenx-0.7.4-nxloadconfig.patch
Normal file
@@ -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')
|
||||
|
||||
10
dists/gentoo/files/nxserver-freenx-0.7.4-pam_ssh.patch
Normal file
10
dists/gentoo/files/nxserver-freenx-0.7.4-pam_ssh.patch
Normal file
@@ -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" {
|
||||
7
dists/gentoo/gentoo.postinst
Executable file
7
dists/gentoo/gentoo.postinst
Executable file
@@ -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
|
||||
|
||||
162
dists/gentoo/nxserver-freenx-0.7.4-r665.ebuild
Normal file
162
dists/gentoo/nxserver-freenx-0.7.4-r665.ebuild
Normal file
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user