Prevent update script from failing and removing default ssh key, bug #248049

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 26 insertions, 4 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/Manifest b/net-misc/nxserver-freeedition/Manifest
index 1bb2936b3c3d..7a8347712e4e 100644
--- a/net-misc/nxserver-freeedition/Manifest
+++ b/net-misc/nxserver-freeedition/Manifest
@@ -1,5 +1,6 @@
 AUX nxserver-2.1.0-init 494 RMD160 03340e16e3d3f99635eb7886a447b35cf907a63e SHA1 fe7a4fa1d02831404d6a70ff63eef537bcd37086 SHA256 4c937f114be2a2e5bfebf6f7b96d00e841c46a9104c300e6773aae5b9d3d75bf
 AUX nxserver-3.0.0-r4-setup.patch 2240 RMD160 00e4b500e532fbdf700ee662a50f5967a0eb31c0 SHA1 ba0ee1ba2cb198a6d06c1ee4e2414cd88cc5dfa5 SHA256 9517e84c742ca444d46bc15cf71a56c8ae5026092a2c2bcedf0cb8d23c2e15d0
+AUX nxserver-3.3.0-dontupdatekeys.patch 333 RMD160 1ff3a3eb64447b5e4861d2bc5baaca5b60c7d3cc SHA1 4b683678bccf05b4556e453ff166c5e87d9ee95e SHA256 4b4202a988d9b8841a5aef358b6ef50cc5864644ff4e9192cbd77cab54d1f298
 DIST nxserver-3.2.0-11.i386.tar.gz 6796107 RMD160 2baf2d0ad6d0a04cc53249dcad6f8f7c95124fe7 SHA1 c6bccf67d331240b97c58d0eccfcaf6dc26d70e4 SHA256 921e5e2006eb5614f73ce76fca42426f80c0b873ec3e8fcf4bb33f7a75148ca8
 DIST nxserver-3.2.0-11.x86_64.tar.gz 7814424 RMD160 bdb653c36e9b19a034fa3b196b1dc6256acc2ec1 SHA1 a5212a59d1876d2f910d48f60ba2a2c4a5279a63 SHA256 5e14f23561bbae83d45a1340cd759ef0ec3a88da8aa7b679cfd67241a1f1a6b5
 DIST nxserver-3.2.0-13.i386.tar.gz 6790943 RMD160 025c41598c3a2aaf2735a331baa4d938393f32d4 SHA1 bcb11c3867d8e69ecd79f3564cadf04b84672b0f SHA256 87cacd497bd8f07c7337669e2e96347655757219f3a532d1d229a5cfbf5f9965
@@ -14,6 +15,6 @@ EBUILD nxserver-freeedition-3.2.0-r1.ebuild 2434 RMD160 7e7a667c91994ab1bba1e95b
 EBUILD nxserver-freeedition-3.2.0.13.ebuild 2546 RMD160 3525e046d5f9f8e4ea031ef8584dc72159ff15f9 SHA1 4edb8e825d44bc336812fc3b8e9092a1cea38fc7 SHA256 7fc357e351a10997d3100764c3c29b86421998bdc004ba9667f04ce0afa467bd
 EBUILD nxserver-freeedition-3.2.0.16.ebuild 2546 RMD160 21284f1ae279d4d2ad6aa40ee11b7232d1385852 SHA1 d466fabceb246ab1efa1467fa3cf4740f1d2ea37 SHA256 29327cd7521b1322a023799072f17e4db55bdb5911c8ff16c2957fd3ad96ca8d
 EBUILD nxserver-freeedition-3.2.0.ebuild 2423 RMD160 87cf046512418c56a148fffa8d5396a08cd702cf SHA1 8bb288ba636982e53cc2d29ad61df3923c12a264 SHA256 d4b78cc7511388cb3f3f4589da489ecc684d696675737f35339dd9251b260431
-EBUILD nxserver-freeedition-3.3.0.8.ebuild 2548 RMD160 dccf4dec09820dad40a079d8893d151af24ec764 SHA1 9609ecefcc6511e159ee2570b7abbedad5051376 SHA256 719ff6937f52e429c68f643acb98aa40e4230453d764c492725a575abc2a626e
-MISC ChangeLog 5808 RMD160 b66e5580e5dbc6dc49fca4b7773f1e1db1045077 SHA1 2f9aadb06d43f967c2c9adfded985c082e86c0bc SHA256 d4047e91a8befc4a8660acd711340c00af5f76cad2fdac2962cc14cb8ead622a
+EBUILD nxserver-freeedition-3.3.0.8-r1.ebuild 2615 RMD160 e0e11293abeaf1a9506d8763a71e62ac38f760cf SHA1 49582f60a4057755bca356d3bff380be36a697a6 SHA256 277a066f7429cd0d861af3c11092043caa7875383389f75613e5490be23f6be1
+MISC ChangeLog 6122 RMD160 bb5320463123686d2aa07b4ca18e0f4ed6ace1d7 SHA1 9dd87ec16df7989a20a9970620336c855ec2f302 SHA256 b0dbfde0eb7b636174c53379d46e5994c9f76fbd237bcd49f0486ab9c012ba6b
 MISC metadata.xml 229 RMD160 36b4bf7d904838e36addc9c65e276eba42746844 SHA1 713c86b664acaa5ddaa5551907f76eb0ea9209d3 SHA256 445516ce54a07930b5cf708034023dddbc5fd8125be710709912ef849e623bc5
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()