diff options
| -rw-r--r-- | net-misc/nxserver-freenx/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/nxserver-freenx/Manifest | 14 | ||||
| -rw-r--r-- | net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch | 43 | ||||
| -rw-r--r-- | net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild | 121 |
4 files changed, 7 insertions, 178 deletions
diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog index 0f3c8032b304..56d4325fb80c 100644 --- a/net-misc/nxserver-freenx/ChangeLog +++ b/net-misc/nxserver-freenx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/nxserver-freenx # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.73 2010/05/26 18:21:11 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.74 2010/05/26 19:15:02 voyageur Exp $ + + 26 May 2010; Bernard Cafarelli <voyageur@gentoo.org> + -nxserver-freenx-0.7.3_p104-r2.ebuild, + -files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch: + Drop previous version 26 May 2010; Pacho Ramos <pacho@gentoo.org> nxserver-freenx-0.7.3_p104-r4.ebuild: diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest index 666690640f8a..7cadcee7f9e2 100644 --- a/net-misc/nxserver-freenx/Manifest +++ b/net-misc/nxserver-freenx/Manifest @@ -1,23 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX nxserver-freenx-0.7.2-cups.patch 1312 RMD160 c6f0a0675fe7902cc2e53123e708f17e36c44dcd SHA1 3bcd5c4a8bd5ed560f91a705c5f45d3f756c16e9 SHA256 50d0ae81b1bf86aecb0eec82920db481633ae0181dfe2894ac1b10faf5b8644d AUX nxserver-freenx-0.7.3_p102-cflags.patch 925 RMD160 d735fffcac7500ed1329e273a97d4b5da5a3d825 SHA1 a28ad4001ec8a28b33a4646e48a453bd2e89ba02 SHA256 ca99ad30acaf356ece570ebbc0ca4e52e40590533173bc028872dffc1055066b -AUX nxserver-freenx-0.7.3_p102-nxloadconfig.patch 2007 RMD160 0bdbcb76de722284d1ba3f39786b31ae3e0cac0b SHA1 f5a8ad8912763a912270a9a83a52d74aefeb1842 SHA256 d241bde25650bd1613618c84aa05c6887f528e44a550fde165a16fb3b7c95396 AUX nxserver-freenx-0.7.3_p104-jobserver_fix.patch 828 RMD160 9e81cc562f6df63d6659a13e8ecdfd7721603343 SHA1 29950069714449cd64b5f921b692d8a01fd992df SHA256 99e0840b1ce4f2c56cfdbf823166737b609e437fb8ca26212f521126d6326cdc AUX nxserver-freenx-0.7.3_p104-nxloadconfig.patch 2127 RMD160 42c749dc2b8c35f47693c1b0158fcb714b417e74 SHA1 1072496ae6bc91fae462225fbf583e11c688e8af SHA256 82bb31a23fff5b5a4333a0a8703d39c7375ffba7db0b261de2e44241e6de96bf AUX nxserver-freenx-0.7.3_p104-nxnode_setup_samba.patch 2709 RMD160 973befb2e3c3c92b844b585aca1624f4f506ce79 SHA1 534041c2a3f7a02552f75f021b0ba50cf94a5bbf SHA256 ccc3464e6ae44353f98dda81b2ab8cd6fec2d8994586f6991ec823f9ea5ed658 AUX nxserver-freenx-0.7.3_p104-pam_ssh.patch 441 RMD160 f1adcb881d23cb7f950f67210f5842fc91a27b01 SHA1 bfac4b1cdf01ad3b3886dba631b733e8ec7ba2a8 SHA256 854d17b3656ac2382d84b32ed9de893b291217648f08f1f496e3d09a32b8d857 AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980df2e35c594a806b18062e781fa5e52131ff9 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2 DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 RMD160 6dc846efa3953516110a212fe6030ba4936ad21d SHA1 47046b08b1f329a00feaccd3fff9129b1aee0b9e SHA256 0d8b8ea883d67551f40c6e1c3a4a280d5bd663f27147a054e879c58b31873c71 -EBUILD nxserver-freenx-0.7.3_p104-r2.ebuild 3716 RMD160 5ec2ed900033657f502552b35721a7f7ed5becbe SHA1 8c1c513a959e9a85d4c6c23e314c2f814405396d SHA256 8a9bbc1f8f74eb37b2d8ff2ba8635b008de7592063e77d2dfe27d8643ec0ec44 EBUILD nxserver-freenx-0.7.3_p104-r4.ebuild 3813 RMD160 826050a3e4f95405e95e0998fee00f60a1e24c33 SHA1 78c4fea9a8d0db018e91c0fce670cc835eaf441e SHA256 a0687aa485ed6ca89d2fe8a5d991a04a0a51d5d52edac8c1e6f9df4759cd3583 -MISC ChangeLog 17436 RMD160 5aa39a121cea3e57393cd25c5c7ed37e437de414 SHA1 0eeb8c3022a2e69a20535a0fb5702aba63f47461 SHA256 d36bcf638c851453f6dfe5b216dca155851893cf32d1d7b9bdf5b6a295147c0f +MISC ChangeLog 17616 RMD160 85e9a4229bb4f82640158e9fa00d8e6016ef62ea SHA1 c5f38355304ff1afefd08f20091ed63060c92b4a SHA256 bc538263179a7ae9e72c09d6671c355795117b84bf4957abdc575730d597598c MISC metadata.xml 525 RMD160 6b438e37f35775bbce33bbb1a04494049956aa04 SHA1 cf904293a398fd2acb8492d4c0a6c43045d71ea5 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkv9Zp0ACgkQCaWpQKGI+9SbJACZAV96l1zLoCF4WxWcti8M9QE8 -HpUAnjJVKyjRW9t/Q1mxZfu10M+U4Q5A -=skiZ ------END PGP SIGNATURE----- diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch deleted file mode 100644 index 21a33260351c..000000000000 --- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.7.3_p102-nxloadconfig.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- nxloadconfig.orig 2009-03-12 18:29:22.000000000 +0100 -+++ nxloadconfig 2009-03-12 18:29:53.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,11 +194,11 @@ - 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 -@@ -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/nxserver-freenx-0.7.3_p104-r2.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild deleted file mode 100644 index c1e5e562aa7e..000000000000 --- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2010 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-r2.ebuild,v 1.4 2010/04/11 18:51:54 voyageur Exp $ - -EAPI=1 - -inherit 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" -SRC_URI="http://ppa.launchpad.net/freenx-team/ppa/ubuntu/pool/main/f/${MY_PN}/freenx-server_${MAJOR_PV}+teambzr${PATCH_VER/p}.orig.tar.gz" -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 - media-fonts/font-misc-misc - net-analyzer/gnu-netcat - <net-misc/nx-3.4.0 - sys-apps/gawk - virtual/ssh - x11-apps/xauth - x11-apps/xrdb - x11-apps/sessreg - nxclient? ( net-misc/nxclient ) - !nxclient? ( !net-misc/nxclient - || ( x11-misc/xdialog - x11-apps/xmessage ) ) - rdesktop? ( net-misc/rdesktop ) - vnc? ( x11-misc/x11vnc - || ( net-misc/tightvnc net-misc/vnc ) )" - -S=${WORKDIR}/${MY_PN} - -export NX_HOME_DIR=/var/lib/nxserver/home - -pkg_setup () { - enewuser nx -1 -1 ${NX_HOME_DIR} -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-pam_ssh.patch - epatch "${FILESDIR}"/${P}-nxnode_setup_samba.patch - epatch "${FILESDIR}"/${PN}-0.7.3_p102-nxloadconfig.patch - epatch "${FILESDIR}"/${PN}-0.7.3_p102-cflags.patch - epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch - - sed -e "/PATH_LIB=/s/lib/$(get_libdir)/g" \ - -e "s#REAL_PATH_LIB#/usr/$(get_libdir)/NX/bin#" \ - -i nxloadconfig || die "nxloadconfig sed failed" -} - -src_compile() { - 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 - - emake DESTDIR="${D}" install || die "install failed" - - # This should be renamed to remove the blocker on net-misc/nxclient - use nxclient && rm "${D}"/usr/bin/nxprint - - mv "${D}"/etc/nxserver/node.conf.sample "${D}"/etc/nxserver/node.conf || - die "cannot find default configuration file" - - 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 - - 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 ! built_with_use 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 -} |