Don't crash when used as root wrt #250176.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 24 insertions, 5 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 524e4940e0d8..1a9030c239a5 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.148 2009/05/28 17:45:05 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.149 2009/07/21 10:05:07 ssuominen Exp $
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> mc-4.6.2_pre1.ebuild,
+  +files/mc-4.6.2_pre1-null.patch:
+  Don't crash when used as root wrt #250176.
 
   28 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   mc-4.6.2_pre1.ebuild:
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 5cab46f42921..faac877eb92c 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -8,6 +8,7 @@ AUX mc-4.6.1-find.patch 5522 RMD160 edba65b5c797d4ac1a4230c24d5746c8f5d06664 SHA
 AUX mc-4.6.1-invalid-mtime.patch 787 RMD160 fb02c6c2c672780551a79d942cd7b3be8eb96c1c SHA1 4ef7584019cc5e7632c2a687705d4b2bd7ba457e SHA256 e6cd8c235aed5362538689daf2a92eddb36e2c79387e26c78d8ac71210224520
 AUX mc-4.6.1-largefile.patch 6919 RMD160 f6bcb19aed609d89a0fdf36646b991d13f45f1ca SHA1 1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64 SHA256 005bbc46f6b4ee3ff8ce29cf1b8974af69e38b4ca5676512927a3a8cd290ee57
 AUX mc-4.6.1-nonblock.patch 394 RMD160 414e6d99045ad73d3634e135892d1615cb3322fd SHA1 34b3e6d4807c9e055dbafeede0ed3aa74efe7224 SHA256 49487dbe67eef61543ca9d36f81d2d8884787d2c18dd7ca90ba032ef0ed3c10e
+AUX mc-4.6.2_pre1-null.patch 367 RMD160 5f539024b86bff08072832fef30f69f00d727858 SHA1 1d93268505de54202b1e689096ca85fcf69bf265 SHA256 e360cd5b02f330e8317cafc1035b470dfda99925ee048dfab5cd099460216878
 AUX mc.gentoo 322 RMD160 957d5127be68de3eca20ac3121607faa1370d997 SHA1 c13e3625613764aa7c06aaba4519efa30c5722c1 SHA256 6dff61a04bf35cbc5c9570e3ad194a8d8ffd255096c977997d11aa59cd0f24c9
 AUX mc.ini 43 RMD160 2254610744c484553cd3332a4f45e439b13cceed SHA1 dde4fa7bc44867f9e1b34e170aec07484e8497dc SHA256 ed0921487e74b913fa34f4d672584b64da6cf5d592b17c65328621934a4d46f1
 DIST mc-4.6.1-utf8-r2.patch.bz2 30449 RMD160 ffe89eb0cef217ba87398c93b65ebc0e5fefac5d SHA1 f0994ddc412b4f86a7dab83686e846156fc36de2 SHA256 f58de9e412694958c00c7ef831995f2b56b7add7ea1e26567281516db02f483e
@@ -16,6 +17,6 @@ DIST mc-4.6.2-pre1-patches-1.tbz2 48513 RMD160 d003bbc281fce5eb1b7040ff29f9ddff6
 DIST mc-4.6.2-pre1.tar.gz 4009197 RMD160 335d032a9562814ebcab1b2848312d3ee1cb5bab SHA1 9eca70f0b1da9f66207b66c07c6bea49c08b818e SHA256 6aeb0ae5371c8beedec37958f73804f6da44bf9cf738647065b17d959b27be34
 DIST u7z-4.29.tar.bz2 2951 RMD160 1ab0cfea1563e81bdde9c0552d37efe710ea14bf SHA1 1a8c65dcb58a8f1be9d7fa8a3b91b1819fbb3360 SHA256 0d046e76fade7c7e31be01626bb3fcb0afcb5f62809733d0c70e0e12c655348d
 EBUILD mc-4.6.1-r4.ebuild 4458 RMD160 310edd888d035b6bce6ebe685cafd96954a24507 SHA1 53d9725cb2fdcae43423727ab0964c07b89cf356 SHA256 1ce723b96dfad2a2a6038600ed5b38bd0205cd6eaeed5efab6a93419f7ff249c
-EBUILD mc-4.6.2_pre1.ebuild 3104 RMD160 245f22225ef159164db6499edc3652f224cc195c SHA1 c0e8c8d23a6b1567e834efae63d6fafd056fc813 SHA256 5610a3458de3824fe604aef7f496b6a2e4ab614febf46c824a2069ec73a5d4a0
-MISC ChangeLog 21397 RMD160 198b1013db0bdc8652fcba48e3bf6eda41557d91 SHA1 a388f9a7f263332a73ceeb6b411bf5915e8ede8a SHA256 13ab25d8c4fbf6971b21970d370c22203bce90cae799cfed38884ddffabeca13
+EBUILD mc-4.6.2_pre1.ebuild 3143 RMD160 51fbe4e52de4449477e9523136397e4760f048c2 SHA1 25eecf2e647656b0cf481685eeaf03bef43dc0f4 SHA256 d52916bbc47ae4a6a03e57b6684216361164e4b9bb214c742cde2dcdb0d113f1
+MISC ChangeLog 21555 RMD160 75341014ab4f697dcaea26b117f32c08a0583c37 SHA1 40885307704826d69108b356fee3792d3e868bd2 SHA256 6654a3e2f2c1e266ac2667b4a94649891142b29520a97d4fb7e5210b93ca169d
 MISC metadata.xml 300 RMD160 9f102fd6d3f520bc53b394229456e9b70e91807f SHA1 020bf4ff7b164e352b8340434ed3762430db87bc SHA256 f1f97640f02ba1eca452c927887656187f24f40a0f8ba97223dcbedb21497ef5
diff --git a/app-misc/mc/files/mc-4.6.2_pre1-null.patch b/app-misc/mc/files/mc-4.6.2_pre1-null.patch
new file mode 100644
index 000000000000..1c52dbaa310a
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.2_pre1-null.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=250176
+
+--- ./src/tty.c.orig	2008-12-07 13:42:47.456151505 +0100
++++ ./src/tty.c	2008-12-07 12:57:22.461666666 +0100
+@@ -226,7 +226,7 @@ tty_tgetstr (const char *cap)
+     return SLtt_tgetstr (str_unconst (cap));
+ #else
+     {
+-	char *unused;
++	char *unused = NULL;
+ 	return tgetstr (str_unconst (cap), &unused);
+     }
+ #endif
diff --git a/app-misc/mc/mc-4.6.2_pre1.ebuild b/app-misc/mc/mc-4.6.2_pre1.ebuild
index d1919891473a..cdf0973f0481 100644
--- a/app-misc/mc/mc-4.6.2_pre1.ebuild
+++ b/app-misc/mc/mc-4.6.2_pre1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v 1.10 2009/05/28 17:45:05 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.2_pre1.ebuild,v 1.11 2009/07/21 10:05:07 ssuominen Exp $
 
 EAPI=1
-
 inherit eutils toolchain-funcs
 
 MY_P=${P/_/-}
@@ -47,6 +46,8 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
 
+	epatch "${FILESDIR}"/${P}-null.patch
+
 	# Prevent lazy bindings in cons.saver binary for bug #135009
 	sed -i -e "s:^\(cons_saver_LDADD = .*\):\1 -Wl,-z,now:" \
 		src/Makefile.in || die "sed failed."