fixed segfault with ncurses-5.8. bug #359179

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 210 insertions, 17 deletions

diff --git a/app-misc/vifm/ChangeLog b/app-misc/vifm/ChangeLog
index 89fed5a1a12b..116ac7558100 100644
--- a/app-misc/vifm/ChangeLog
+++ b/app-misc/vifm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/vifm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/ChangeLog,v 1.19 2010/06/12 12:14:54 wired Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/ChangeLog,v 1.20 2011/03/29 20:41:03 wired Exp $
+
+*vifm-0.5-r1 (29 Mar 2011)
+
+  29 Mar 2011; Alex Alexander <wired@gentoo.org> +vifm-0.5-r1.ebuild,
+  +files/vifm-0.5-ncurses-5.8.patch:
+  fixed segfault with ncurses-5.8. bug #359179
 
   12 Jun 2010; Alex Alexander <wired@gentoo.org> metadata.xml:
   added myself as maintainer
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index c0784b51c540..4b66e53d6891 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vifm-0.5-ncurses-5.8.patch 4701 RMD160 d80614937998419dc3ffcf83a6a34429e6819038 SHA1 213674b84d1db03867a9eefde6e5257b7816f4d3 SHA256 50c65af0f0fbd1ad66621b48becfec15b95464c19fc52d3288fcbd1800e69e1f
 DIST vifm-0.3a.tar.gz 493981 RMD160 bcdeccbf96b8030cf1f3d0a393311e7cffe96e77 SHA1 123254555eb337b1b7391bbbbe3b57475717a60f SHA256 6afbd3ec09b8abc2f0fa5d122b6bcfbbc83f658f670dfede937afe448b0a5771
 DIST vifm-0.4.tar.bz2 353731 RMD160 004db08a4c0a977ca10a6096fca0ccf9c9f8fbec SHA1 ad548b6df513483865c8623c1ce83e173271d4bc SHA256 354b47f8a53a3a1cd3b7f9d5f4aa823ee6adbcdf5c2862b71b7162b8cfd3573f
 DIST vifm-0.5.tar.bz2 272835 RMD160 a48acbd471968a054aac3f34b13ee24ecbc711b8 SHA1 0563def0c538c846176e6910ae76cb24b2b1ed89 SHA256 11bc1138050d6b2887d7f099e12bc57d27cc60a6f14252744654c35d22d38164
 EBUILD vifm-0.3a.ebuild 1115 RMD160 65763bebcca75cb85425d747d324dfa02b52d8c0 SHA1 b92cee71c0f59084df5c55c250ecd66a54c05af9 SHA256 5cb57e2a1c8323e6e28483ba038e1f830106840a1231cc96acf52a36a32f11c7
 EBUILD vifm-0.4.ebuild 1116 RMD160 089a295c4e3c6e7d48aae862876f08810d42460d SHA1 f4427eb82c1190a61342a4e438ded6b1ba52d11e SHA256 aebc04b5f7debde43680916d0e5b154fcfcfaeaa19160ccf9e64dae0def7ddb9
+EBUILD vifm-0.5-r1.ebuild 1162 RMD160 48b4fcaa6faac5dd89392914a51bf1b20dbf8d30 SHA1 145c54a19e2946bc1e12395792a96ec01b1f3dd0 SHA256 f006f5b8b842fc147f6c71cbc312e806c0d360d887d44bbf2e1fcbfe46633edd
 EBUILD vifm-0.5.ebuild 1083 RMD160 20ee883e0d3335a4ac078c079a59001e3a55b4d8 SHA1 2d6d952c90a34d8a98871b05a7392bdb2d2b810d SHA256 0d5159f1ff4ff25e7de13e02301b35c3ef8b30036000b070e3f00af83f84a5c1
-MISC ChangeLog 2204 RMD160 620999a078097430a206f18d55e0d590155984ec SHA1 4d6886ab55771e0abe466d0401a34d3e3156510d SHA256 904f2bce014d7670d1cd687b6d2c988dd02e8972704a3ce7d5afc5093e5e04d4
+MISC ChangeLog 2387 RMD160 e295284defcd2b96fb3a2ec5e750d9ce3fa14979 SHA1 04a7d795067dafb2178232dd0bb112e4ce9c17eb SHA256 2e0e1f47e17f86077ac9ad57336312aa02e44a3119fb3f12520745eff3d129ea
 MISC metadata.xml 478 RMD160 f0e3f8f2ecfec9cee570d07aea86723ccead6c7e SHA1 f6f8e9a741b82f4bdd567c0710739850c9a29783 SHA256 2745672943add7588ed366755f4c84d9ddfd9591ae717f6fc25ce65011edd78f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJME3rWAAoJEDZF8K7rm0r6i+IQAI/SeqcOn2OmiJqq5KlabjKi
-N9VYvRZP7rTkFzCfYipSMW72IIkl2TdLhqGPFs2bCNWVt6N5j1Me50/5eDIp1rwZ
-7RzBIDAi1fE5OuCsdMQII5BUm8s3t2NdoFfV2JKqTm2FD0mzTmE4XX/BphmcTiOV
-9O7MiGfah7JKvj3kJDLJHbPG2iJUShPFhiJDB/uMp4H5dajVjJC3B2QbxPIDEUbw
-iT9iP5/yKEf6ZwzWUvJLI6jyVeDlzuhw0whF19mPcyo52dtstJpHaI8CVr0vZHQs
-vV2zAKEhXJ2X58D985ellWWbDH77yCsIl8QklA0Cn/zDRWiVw8Vuwecmvig72+Ux
-0CQrNwOf2zUwr21Q5Mwg0cSxxyWse3s6u86tjPg5TSnVtvz3dI9Kpi8IB4Eu08xV
-Y6ju8wrSOqZ7YnKcBh6vjgkNA1vtTe4UtM6+uqTd+b2EVFLT3HVdRIwFkTJOvuYa
-Rin/1X10wuKyvqclFCe7TpTklDgMrN2wDNmLEOaTsWn3GsKMy1LEngLwtTUKc0t/
-2rGipprOFV642vyYe1W+BkISmeQSV+yfxyGn1YU7MlFH8YEkgmaNwjJRSJXwzlD6
-ktkJqbN0gBx3C+Icduo2VQYUX356ZXZh3vjvR4GhP9hzTxQVv8OtkHih13Jz6M0e
-1vjaUI2J9ipXPnkBa5Ny
-=xSp5
+iQIcBAEBCAAGBQJNkkTFAAoJEDZF8K7rm0r6E54P/iSzghn+krP9Nhn9RaoQImVD
+C6cGSn0CSPhNkouWy0iKbN5W+rwZgF8FJZxEQTynXmQ2E6Xz3rjkXFqBWeNgUJMp
+0XM25b0ezAC92bOWzEoNhP+2ONQK8hfEVrsltcMdA+3Bnh33p3VDg9kU9fII0aok
+KngyV0YzxLTNfVFGOBqhHjE6leEtbyZUdOdTTQqy13SAQ/goJ1Vzwb76jtQkj3Gs
+C/7x3qIVgC0glL19MsUpdXCvKF7jHGmESt9/GX3UwEbJy84EaELWjRJp/CazjZ0x
+7hV9rFnXjLIyZ58AdPsb4DCCl7YhXV4oV2+ryhDAN86y+Kul0DeuX+Fb+0aNt4AB
+0uJUsTFOwjexmNPVApNqlIlm0X3nQpZe0c7CSZ/Sd77SNhsQj7B0CTzHpXw8P0rc
+qli9RmsgIuWD/AbcoW3OSn0S8mBH6/yAvazcqmPRarKH69gJLzwFEQLdOr8envdp
+tTpVclt76Uh/zI2ChNt05/pdRI9Wn0tzgQbojOKSsimHXGeUoZ5wrahCxzO5h7zj
+27HahTH/FRMUl5cxNr/zjF76JK44IYyb7ZzJn+jsj2Oh8IFb+RDs2H6sWc+xS3Bb
+jR7xdYEJ28x+R6gGUH583dA4DDs6u8SJ6To1N7Qsd2i3YcKGXzhQ0FLSW4x58/nD
+xQkK+lTbyfokfZQoVoL0
+=S4UJ
 -----END PGP SIGNATURE-----
diff --git a/app-misc/vifm/files/vifm-0.5-ncurses-5.8.patch b/app-misc/vifm/files/vifm-0.5-ncurses-5.8.patch
new file mode 100644
index 000000000000..17e62bd2f117
--- /dev/null
+++ b/app-misc/vifm/files/vifm-0.5-ncurses-5.8.patch
@@ -0,0 +1,144 @@
+this makes vifm compatible with ncurses-5.8
+
+patch source:
+http://projects.archlinux.org/svntogit/community.git/plain/vifm/repos/community-x86_64/ncurses58.patch
+bug:
+https://bugs.gentoo.org/show_bug.cgi?id=359179
+--- vifm-0.5/src/keys.c
++++ vifm-0.5-new//src/keys.c
+@@ -721,7 +721,6 @@
+ 			redrawwin(stat_win);
+ 			redrawwin(status_bar);
+ 			redrawwin(pos_win);
+-			redrawwin(lwin.title);
+ 			redrawwin(lwin.win);
+ 			redrawwin(num_win);
+ 			redrawwin(rborder);
+@@ -740,7 +739,6 @@
+ 			touchwin(num_win);
+ 			touchwin(rborder);
+ 
+-			redrawwin(rwin.title);
+ 			redrawwin(rwin.win);
+ 			redrawwin(lborder);
+ 			redrawwin(stat_win);
+@@ -768,10 +766,8 @@
+ 		touchwin(num_win);
+ 		touchwin(rborder);
+ 
+-		redrawwin(lwin.title);
+ 		redrawwin(lwin.win);
+ 		redrawwin(mborder);
+-		redrawwin(rwin.title);
+ 		redrawwin(rwin.win);
+ 		redrawwin(lborder);
+ 		redrawwin(stat_win);
+--- vifm-0.5/src/ui.c
++++ vifm-0.5-new//src/ui.c
+@@ -158,32 +158,32 @@
+ 	
+ 	werase(stdscr);
+ 
+-	menu_win = newwin(screen_y - 1, screen_x , 0, 0);
++	menu_win = newwin(screen_y - 1, screen_x , 1, 1);
+ 	wbkgdset(menu_win, COLOR_PAIR(WIN_COLOR));
+ 	werase(menu_win);
+ 
+-	sort_win = newwin(NUM_SORT_OPTIONS + 3, 30, (screen_y -12)/2, (screen_x -30)/2);
++	sort_win = newwin(NUM_SORT_OPTIONS + 3, 30, (screen_y -12)/2 > 0 ? (screen_y -12/2) :1, (screen_x -30)/2 > 0 ? (screen_x -30)/2: 1);
+ 	wbkgdset(sort_win, COLOR_PAIR(WIN_COLOR));
+ 	werase(sort_win);
+ 
+-	change_win = newwin(20, 30, (screen_y -20)/2, (screen_x -30)/2);
++	change_win = newwin(20, 30, ((screen_y -20)/2 > 0 ? (screen_y -20)/2 : 1), (screen_x -30)/2 > 0 ? (screen_x -30/2) :  1 );
+ 	wbkgdset(change_win, COLOR_PAIR(WIN_COLOR));
+ 	werase(change_win);
+ 
+-	error_win = newwin(10, screen_x -2, (screen_y -10)/2, 1);
++	error_win = newwin(10, screen_x -2, (screen_y -10)/2 > 0 ? (screen_y -10)/2 : 1, 1);
+ 	wbkgdset(error_win, COLOR_PAIR(WIN_COLOR));
+ 	werase(error_win);
+ 
+-	lborder = newwin(screen_y - 2, 1, 0, 0);
++	lborder = newwin(screen_y - 2, 1, 1, 1);
+ 
+ 	wbkgdset(lborder, COLOR_PAIR(BORDER_COLOR));
+ 
+ 	werase(lborder);
+ 
+ 	if (curr_stats.number_of_windows == 1)
+-		lwin.title = newwin(0, screen_x -2, 0, 1);
++		lwin.title = newwin(0, screen_x -2, 1, 1);
+ 	else
+-		lwin.title = newwin(0, screen_x/2 -1, 0, 1);
++		lwin.title = newwin(0, screen_x/2 -1, 1, 1);
+ 		
+ 	wattrset(lwin.title, A_BOLD);
+ 	wbkgdset(lwin.title, COLOR_PAIR(BORDER_COLOR));
+@@ -204,16 +204,16 @@
+ 	lwin.window_rows = y -1;
+ 	lwin.window_width = x -1;
+ 
+-	mborder = newwin(screen_y, 2, 0, screen_x/2 -1);
++	mborder = newwin(screen_y, 2, 1, screen_x/2 -1 > 0 ? screen_x/2 -1 :  1);
+ 
+ 	wbkgdset(mborder, COLOR_PAIR(BORDER_COLOR));
+ 
+ 	werase(mborder);
+ 
+ 	if (curr_stats.number_of_windows == 1)
+-		rwin.title = newwin(0, screen_x -2  , 0, 1);
++		rwin.title = newwin(0, screen_x -2  , 1, 1);
+ 	else
+-		rwin.title = newwin(1, screen_x/2 -1  , 0, screen_x/2 +1);
++		rwin.title = newwin(1, screen_x/2 -1  , 1, screen_x/2 +1 > 0 ? screen_x/2 +1 :1);
+ 
+ 	wbkgdset(rwin.title, COLOR_PAIR(BORDER_COLOR));
+ 	wattrset(rwin.title, A_BOLD);
+@@ -224,7 +224,7 @@
+ 	if (curr_stats.number_of_windows == 1)
+ 		rwin.win = newwin(screen_y - 3, screen_x -2 , 1, 1);
+ 	else
+-		rwin.win = newwin(screen_y - 3, screen_x/2 -2 , 1, screen_x/2 +1);
++		rwin.win = newwin(screen_y - 3, screen_x/2 -2 , 1, screen_x/2 +1 > 0 ? screen_x/2 +1 : 1);
+ 
+ 	keypad(rwin.win, TRUE);
+ 	wattrset(rwin.win, A_BOLD);
+@@ -235,32 +235,32 @@
+ 	rwin.window_rows = y - 1;
+ 	rwin.window_width = x -1;
+ 
+-	rborder = newwin(screen_y - 2, 1, 0, screen_x -1);
++	rborder = newwin(screen_y - 2, 1, 1, screen_x -1 > 0 ? screen_x-1 : 1);
+ 
+ 	wbkgdset(rborder, COLOR_PAIR(BORDER_COLOR));
+ 
+ 	werase(rborder);
+ 
+-	stat_win = newwin(1, screen_x, screen_y -2, 0);
++	stat_win = newwin(1, screen_x, screen_y -2 > 0 ? screen_y -2 : 1, 1);
+ 
+ 	wbkgdset(stat_win, COLOR_PAIR(BORDER_COLOR));
+ 
+ 	werase(stat_win);
+ 
+-	status_bar = newwin(1, screen_x - 19, screen_y -1, 0);
++	status_bar = newwin(1, screen_x - 19, screen_y -1 > 0 ? screen_y -2: 1, 1);
+ 	keypad(status_bar, TRUE);
+ 	wattrset(status_bar, A_BOLD);
+ 	wattron(status_bar, A_BOLD);
+ 	wbkgdset(status_bar, COLOR_PAIR(STATUS_BAR_COLOR));
+ 	werase(status_bar);
+ 
+-	pos_win = newwin(1, 13, screen_y - 1, screen_x -13);
++	pos_win = newwin(1, 13, screen_y - 1 > 0 ? screen_y -1 : 1, screen_x -13 > 0 ? screen_x -13 : 1);
+ 	wattrset(pos_win, A_BOLD);
+ 	wattron(pos_win, A_BOLD);
+ 	wbkgdset(pos_win, COLOR_PAIR(STATUS_BAR_COLOR));
+ 	werase(pos_win);
+ 
+-	num_win = newwin(1, 6, screen_y - 1, screen_x -19);
++	num_win = newwin(1, 6, screen_y - 1 > 0 ? screen_y -1 : 1, screen_x -19 > 0 ? screen_x -19 : 1);
+ 	wattrset(num_win, A_BOLD);
+ 	wattron(num_win, A_BOLD);
+ 	wbkgdset(num_win, COLOR_PAIR(STATUS_BAR_COLOR));
diff --git a/app-misc/vifm/vifm-0.5-r1.ebuild b/app-misc/vifm/vifm-0.5-r1.ebuild
new file mode 100644
index 000000000000..090e5cd8e1b1
--- /dev/null
+++ b/app-misc/vifm/vifm-0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.5-r1.ebuild,v 1.1 2011/03/29 20:41:03 wired Exp $
+
+EAPI=3
+inherit base
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="http://vifm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.8"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS TODO README )
+
+PATCHES=( "${FILESDIR}"/"${P}"-ncurses-5.8.patch )
+
+src_prepare() {
+	sed -i -e "s:(datadir)/@PACKAGE@:(datadir)/${P}:" Makefile.in
+
+	cd "${S}"/src
+	sed -i -e "s:(datadir)/@PACKAGE@:(datadir)/${P}:" Makefile.in
+	sed -i -e "s:/usr/local/share/vifm:/usr/share/${P}:g" config.c
+
+	base_src_prepare
+}
+
+pkg_postinst() {
+	elog "To use vim to view the vifm help, copy /usr/share/${P}/vifm.txt"
+	elog "to ~/.vim/doc/ and run ':helptags ~/.vim/doc' in vim"
+	elog "Then edit ~/.vifm/vifmrc${PV/a/} and set USE_VIM_HELP=1"
+	elog ""
+	elog "To use the vifm plugin in vim, copy /usr/share/${P}/vifm.vim to"
+	elog "/usr/share/vim/vimXX/"
+}