diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-21 10:05:08 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-21 10:05:08 +0000 |
| commit | b64b654579733647fdd1871820ee406430e9d546 (patch) | |
| tree | 8fb6007665aa77ffb64579666cd1cc41e4b4a438 /app-misc | |
| parent | Version bump. (diff) | |
| download | gentoo-2-b64b654579733647fdd1871820ee406430e9d546.tar.gz gentoo-2-b64b654579733647fdd1871820ee406430e9d546.tar.bz2 gentoo-2-b64b654579733647fdd1871820ee406430e9d546.zip | |
Don't crash when used as root wrt #250176.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.6.2_pre1-null.patch | 13 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.6.2_pre1.ebuild | 5 |
3 files changed, 21 insertions, 3 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/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." |