From 837ce4165ac09474242c41127e2ba1f730061c14 Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sat, 17 Oct 2009 18:22:33 +0000 Subject: Patch to fix a segfault bug in editor (#287113) Package-Manager: portage-2.2_rc46/cvs/Linux x86_64 --- app-misc/abook/ChangeLog | 10 +++++++-- app-misc/abook/Manifest | 14 ++++++++++++- app-misc/abook/abook-0.5.6-r1.ebuild | 33 ++++++++++++++++++++++++++++++ app-misc/abook/files/0.5.6-01_editor.patch | 18 ++++++++++++++++ 4 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 app-misc/abook/abook-0.5.6-r1.ebuild create mode 100644 app-misc/abook/files/0.5.6-01_editor.patch (limited to 'app-misc/abook') diff --git a/app-misc/abook/ChangeLog b/app-misc/abook/ChangeLog index 2a4caf8d7a6e..f6324b5b325d 100644 --- a/app-misc/abook/ChangeLog +++ b/app-misc/abook/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/abook -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/ChangeLog,v 1.48 2007/07/21 21:08:54 grobian Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/ChangeLog,v 1.49 2009/10/17 18:22:32 tove Exp $ + +*abook-0.5.6-r1 (17 Oct 2009) + + 17 Oct 2009; Torsten Veller +abook-0.5.6-r1.ebuild, + +files/0.5.6-01_editor.patch: + Patch to fix a segfault bug in editor (#287113). Thanks Arseny Solokha. 21 Jul 2007; Fabian Groffen abook-0.5.6.ebuild: Dropped ppc-macos keyword, see you in prefix diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest index 40ab21693d36..28c23345263e 100644 --- a/app-misc/abook/Manifest +++ b/app-misc/abook/Manifest @@ -1,4 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 0.5.6-01_editor.patch 464 RMD160 b6d8459089dee9b4d07a2cd8575c2870d278edca SHA1 bc74e7847d6ac56c4e3ed6b8388cd7700433dba9 SHA256 dcd37cb0cdecb0b52e680210acd8df84031466d697e037a02888e199d8cbc671 DIST abook-0.5.6.tar.gz 393097 RMD160 e6a6e77fb7c8ba6608482b1103b948015c37b737 SHA1 79f04f2264c8bd81bbc952b6560c86d69b21615d SHA256 0646f6311a94ad3341812a4de12a5a940a7a44d5cb6e9da5b0930aae9f44756e +EBUILD abook-0.5.6-r1.ebuild 870 RMD160 3b193b2c296d987b2e2d2ec7bd7c5ea53156b1fb SHA1 08f35334ae4f637b58761cc05edab658b51c10e6 SHA256 0955c201dc8f3b8e49b6fcbd7ba4911b733df3e9b09b2a147f4839431546aed5 EBUILD abook-0.5.6.ebuild 803 RMD160 c0b7dbd2db2b76f57e3fa2214ae388a591fc9e7e SHA1 3d129600b7d73aa1e6232eb77336cb7b54fcfc7e SHA256 f0310735e0e5422731fca5701bac12ea66a105c30ae67f605bdd16410c433283 -MISC ChangeLog 5396 RMD160 1e1cb69be40de999dff7821c5873e753bbe58cec SHA1 f5b4d445aa2510239274c45934461f104fa0e986 SHA256 9d2807151a0eb13bbe8dcc67e84276557811a793fe050c48b2e04ee154ed0f3f +MISC ChangeLog 5603 RMD160 81b4325b8bbe3ad8bcdbd3cdfa69710c241dd7fd SHA1 3f6bf3874b4d79924f5537ec6bd0d3aa7fcec6e8 SHA256 3ea8c4f292ebba00ed12cf998886b8d4500b22a3da53ab5c5d28bc83cef481f2 MISC metadata.xml 277 RMD160 714f3386e1e40ab95489b87a15b97b05f230a093 SHA1 88d0606eee1253fec75e34633e68677c1b07d7be SHA256 b4d9ec08fcedf6ef469e5eda6cf968678daa03f8c9ad244d97acc5b3223bde1a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkraC1MACgkQV3J2n04EauzqYgCgycDTNOWkRQVsqt09EIZQ07Ov +iLMAmweLgZ+5niSumgJqTb0uWRupmyvH +=MevH +-----END PGP SIGNATURE----- diff --git a/app-misc/abook/abook-0.5.6-r1.ebuild b/app-misc/abook/abook-0.5.6-r1.ebuild new file mode 100644 index 000000000000..4d26bc364dfe --- /dev/null +++ b/app-misc/abook/abook-0.5.6-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/abook/abook-0.5.6-r1.ebuild,v 1.1 2009/10/17 18:22:32 tove Exp $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client." +HOMEPAGE="http://abook.sourceforge.net/" +SRC_URI="mirror://sourceforge/abook/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="nls" + +RDEPEND="nls? ( virtual/libintl )" +DEPEND="nls? ( sys-devel/gettext )" + +src_prepare() { + epatch "${FILESDIR}"/${PV}-01_editor.patch +} + +src_configure() { + econf $(use_enable nls) || die "configure failed" +} + +src_install() { + make DESTDIR="${D}" install || die "install failed" + dodoc BUGS ChangeLog FAQ README TODO \ + sample.abookrc || die "dodoc failed" +} diff --git a/app-misc/abook/files/0.5.6-01_editor.patch b/app-misc/abook/files/0.5.6-01_editor.patch new file mode 100644 index 000000000000..bacfd55a491d --- /dev/null +++ b/app-misc/abook/files/0.5.6-01_editor.patch @@ -0,0 +1,18 @@ +--- ui.c 10 Apr 2006 08:15:46 -0000 1.57 ++++ ui.c 6 Sep 2006 02:24:33 -0000 1.58 +@@ -569,9 +569,13 @@ + } else { + char *s; + s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0); +- strncpy(findstr, s, MAX_FIELD_LEN); +- free(s); + refresh_screen(); ++ if(s == NULL) { ++ return; /* user cancelled (ctrl-G) */ ++ } else { ++ strncpy(findstr, s, MAX_FIELD_LEN); ++ free(s); ++ } + } + + if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0 && -- cgit v1.2.3-65-gdbad