* [gentoo-commits] gentoo-x86 commit in net-misc/neatx: ChangeLog neatx-0.3.1_p59-r2.ebuild
@ 2011-03-14 5:20 Stephanie J. Lockwood-Childs (wormo)
0 siblings, 0 replies; 2+ messages in thread
From: Stephanie J. Lockwood-Childs (wormo) @ 2011-03-14 5:20 UTC (permalink / raw
To: gentoo-commits
wormo 11/03/14 05:20:27
Modified: ChangeLog
Added: neatx-0.3.1_p59-r2.ebuild
Log:
Protect custom $NX_HOME_DIR/.ssh/authorized_keys from being clobbered
by an upgrade/reinstall (bug #339366)
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Revision Changes Path
1.12 net-misc/neatx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 5 Oct 2010 21:09:47 -0000 1.11
+++ ChangeLog 14 Mar 2011 05:20:27 -0000 1.12
@@ -1,6 +1,13 @@
# ChangeLog for net-misc/neatx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v 1.11 2010/10/05 21:09:47 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v 1.12 2011/03/14 05:20:27 wormo Exp $
+
+*neatx-0.3.1_p59-r2 (14 Mar 2011)
+
+ 14 Mar 2011; S. Lockwood-Childs <wormo@gentoo.org>
+ +neatx-0.3.1_p59-r2.ebuild:
+ Protect custom $NX_HOME_DIR/.ssh/authorized_keys from being clobbered
+ by an upgrade/reinstall (bug #339366)
05 Oct 2010; Markus Meier <maekke@gentoo.org> neatx-0.3.1_p59-r1.ebuild:
x86 stable, bug #336646
1.1 net-misc/neatx/neatx-0.3.1_p59-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild?rev=1.1&content-type=text/plain
Index: neatx-0.3.1_p59-r2.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild,v 1.1 2011/03/14 05:20:27 wormo Exp $
EAPI="2"
PYTHON_DEPEND="2"
inherit eutils autotools distutils
DESCRIPTION="Google implementation of NX server"
HOMEPAGE="http://code.google.com/p/neatx/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/docutils"
RDEPEND="dev-python/pexpect
dev-python/simplejson
>=dev-python/pygtk-2.14
>=dev-python/pygobject-2.14
app-portage/portage-utils
media-fonts/font-misc-misc
media-fonts/font-cursor-misc
|| ( net-analyzer/gnu-netcat
net-analyzer/netcat
net-analyzer/netcat6 )
net-misc/nx"
S=${WORKDIR}/${PN}
pkg_setup () {
# configure script looks for latest python2 only,
# no multiple versions support
python_set_active_version 2
if [ -z "${NX_HOME_DIR}" ];
then
export NX_HOME_DIR=/var/lib/neatx/home
fi
enewuser nx -1 -1 ${NX_HOME_DIR}
}
src_prepare() {
sed -i -e "s/rst2html]/rst2html.py]/" configure.ac \
|| die "configure.ac sed failed"
sed -e "s#/lib/neatx#/neatx#" \
-e "/^docdir/s#\$(PACKAGE)#${PF}#" \
-i Makefile.am \
|| die "Makefile.am sed failed"
sed -e "/DATA_DIR =/s#/lib/neatx#/neatx#" \
-i lib/constants.py || die "constants.py sed failed"
eautoreconf
}
src_compile() {
default_src_compile
# Scripts are automatically generated, fix them here
python_convert_shebangs 2 src/nx*
}
src_install() {
emake install DESTDIR="${D}" || die "Failed to install"
fperms 777 /var/lib/neatx/sessions
dodir ${NX_HOME_DIR}/.ssh
fowners nx:nx ${NX_HOME_DIR}
fowners nx:nx ${NX_HOME_DIR}/.ssh
insinto /etc
newins doc/neatx.conf.example neatx.conf
# nc or netcat6 or netcat?
if has_version net-analyzer/gnu-netcat; then
nc_path="/usr/bin/netcat"
elif has_version net-analyzer/netcat6; then
nc_path="/usr/bin/nc6"
else
nc_path="/usr/bin/nc"
fi
cat >> "${D}"/etc/neatx.conf << EOF
netcat-path = ${nc_path}
use-xsession = false
start-gnome-command = /etc/X11/Sessions/Gnome
EOF
insinto /usr/share/neatx
insopts -m 600 -o nx
newins extras/authorized_keys.nomachine authorized_keys.nomachine
insinto ${NX_HOME_DIR}/.ssh
insopts -m 600 -o nx
newins extras/authorized_keys.nomachine authorized_keys
# protect ssh key from getting clobbered by future upgrade (bug #339366)
echo "CONFIG_PROTECT=\"${NX_HOME_DIR}\"" > "${T}/60${PN}"
doenvd "${T}/60${PN}"
}
pkg_preinst () {
# preserve custom ssh key if present (bug #339366)
# CONFIG_PROTECT entry created above will only work for future emerges,
# not the current one (until bug #276345 gets fixed)
if [ -e "${ROOT}/${NX_HOME_DIR}/.ssh/authorized_keys" ] ; then
einfo "Preserving existing ssh key: ${NX_HOME_DIR}/.ssh/authorized_keys"
insinto ${NX_HOME_DIR}/.ssh
insopts -m 600 -o nx
newins "${ROOT}/${NX_HOME_DIR}/.ssh/authorized_keys" authorized_keys
fi
}
pkg_postinst () {
distutils_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/$(get_libdir)/neatx/nxserver-login 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!!"
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/$(get_libdir)/neatx/nxserver-login"
elog " * home directory: ${NX_HOME_DIR}"
fi
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
elog "If you want to use the default su authentication (rather than ssh)"
elog "you must ensure that the nx user is a member of the wheel group."
elog "You can add it via \"usermod -a -G wheel nx\""
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/neatx: ChangeLog neatx-0.3.1_p59-r2.ebuild
@ 2011-06-30 15:00 Brent Baude (ranger)
0 siblings, 0 replies; 2+ messages in thread
From: Brent Baude (ranger) @ 2011-06-30 15:00 UTC (permalink / raw
To: gentoo-commits
ranger 11/06/30 15:00:21
Modified: ChangeLog neatx-0.3.1_p59-r2.ebuild
Log:
Marking neatx-0.3.1_p59-r2 ~ppc for bug 344043
(Portage version: 2.1.9.42/cvs/Linux ppc64)
Revision Changes Path
1.15 net-misc/neatx/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/ChangeLog?r1=1.14&r2=1.15
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog 5 Apr 2011 18:40:03 -0000 1.14
+++ ChangeLog 30 Jun 2011 15:00:21 -0000 1.15
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/neatx
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v 1.14 2011/04/05 18:40:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v 1.15 2011/06/30 15:00:21 ranger Exp $
+
+ 30 Jun 2011; Brent Baude <ranger@gentoo.org> neatx-0.3.1_p59-r2.ebuild:
+ Marking neatx-0.3.1_p59-r2 ~ppc for bug 344043
05 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
neatx-0.3.1_p59-r1.ebuild, neatx-0.3.1_p59-r2.ebuild:
1.4 net-misc/neatx/neatx-0.3.1_p59-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild?r1=1.3&r2=1.4
Index: neatx-0.3.1_p59-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- neatx-0.3.1_p59-r2.ebuild 5 Apr 2011 18:40:04 -0000 1.3
+++ neatx-0.3.1_p59-r2.ebuild 30 Jun 2011 15:00:21 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild,v 1.3 2011/04/05 18:40:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r2.ebuild,v 1.4 2011/06/30 15:00:21 ranger Exp $
EAPI="3"
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND="dev-python/docutils"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-30 15:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-14 5:20 [gentoo-commits] gentoo-x86 commit in net-misc/neatx: ChangeLog neatx-0.3.1_p59-r2.ebuild Stephanie J. Lockwood-Childs (wormo)
-- strict thread matches above, loose matches on Subject: below --
2011-06-30 15:00 Brent Baude (ranger)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox