diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2008-11-24 09:49:40 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2008-11-24 09:49:40 +0000 |
| commit | 40f7db80f1397adee6c2be5df5d19d565f7002f5 (patch) | |
| tree | 2a6aad37f033c7b8be0270e7694cb06e8d80a9ec /net-misc/nxserver-freeedition | |
| parent | alpha/ia64/sparc/x86 stable wrt #248500 (diff) | |
| download | gentoo-2-40f7db80f1397adee6c2be5df5d19d565f7002f5.tar.gz gentoo-2-40f7db80f1397adee6c2be5df5d19d565f7002f5.tar.bz2 gentoo-2-40f7db80f1397adee6c2be5df5d19d565f7002f5.zip | |
Prevent update script from failing and removing default ssh key, bug #248049
(Portage version: 2.2_rc16/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'net-misc/nxserver-freeedition')
| -rw-r--r-- | net-misc/nxserver-freeedition/ChangeLog | 11 | ||||
| -rw-r--r-- | net-misc/nxserver-freeedition/files/nxserver-3.3.0-dontupdatekeys.patch | 11 | ||||
| -rw-r--r-- | net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8-r1.ebuild (renamed from net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8.ebuild) | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/net-misc/nxserver-freeedition/ChangeLog b/net-misc/nxserver-freeedition/ChangeLog index c22bf91858cb..bc7bbe19a82a 100644 --- a/net-misc/nxserver-freeedition/ChangeLog +++ b/net-misc/nxserver-freeedition/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/nxserver-freeedition # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.32 2008/11/21 10:38:50 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/ChangeLog,v 1.33 2008/11/24 09:49:39 voyageur Exp $ + +*nxserver-freeedition-3.3.0.8-r1 (24 Nov 2008) + + 24 Nov 2008; Bernard Cafarelli <voyageur@gentoo.org> + +files/nxserver-3.3.0-dontupdatekeys.patch, + -nxserver-freeedition-3.3.0.8.ebuild, + +nxserver-freeedition-3.3.0.8-r1.ebuild: + Prevent update script from failing and removing default ssh key, bug + #248049 *nxserver-freeedition-3.3.0.8 (21 Nov 2008) diff --git a/net-misc/nxserver-freeedition/files/nxserver-3.3.0-dontupdatekeys.patch b/net-misc/nxserver-freeedition/files/nxserver-3.3.0-dontupdatekeys.patch new file mode 100644 index 000000000000..ff9d2b387e79 --- /dev/null +++ b/net-misc/nxserver-freeedition/files/nxserver-3.3.0-dontupdatekeys.patch @@ -0,0 +1,11 @@ +--- scripts/setup/nxserver.orig 2008-11-24 10:24:26.000000000 +0100 ++++ scripts/setup/nxserver 2008-11-24 10:27:38.000000000 +0100 +@@ -3149,8 +3149,6 @@ + # addNXinit + startNXStat + +- updateAutorizedKey +- + checkStr=`$NXSHELL --upgradecheck 2>&1` + result=`echo "$checkStr" | grep -c "expired" 2>&1` + if [ "$result" != "0" ]; diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8-r1.ebuild index e968e48cbf5f..1eeb183bac8f 100644 --- a/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8.ebuild +++ b/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8.ebuild,v 1.1 2008/11/21 10:38:50 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freeedition/nxserver-freeedition-3.3.0.8-r1.ebuild,v 1.1 2008/11/24 09:49:39 voyageur Exp $ inherit eutils versionator @@ -37,6 +37,7 @@ src_unpack() unpack ${A} cd "${S}" epatch "${FILESDIR}"/nxserver-3.0.0-r4-setup.patch + epatch "${FILESDIR}"/nxserver-${MAJOR_PV}-dontupdatekeys.patch } src_install() |