Revision bump; added a patch that fixes a segmentation fault when trying to read a .todo file after adding a multi-line item (fex 'cat $somefile | tda').

(Portage version: 2.0.53_rc6)

5 files changed, 79 insertions, 13 deletions

diff --git a/app-misc/devtodo/ChangeLog b/app-misc/devtodo/ChangeLog
index 8119601e7e25..041efbb9730a 100644
--- a/app-misc/devtodo/ChangeLog
+++ b/app-misc/devtodo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/devtodo
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.53 2005/09/17 15:20:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/ChangeLog,v 1.54 2005/10/29 15:18:20 ka0ttic Exp $
+
+*devtodo-0.1.19-r1 (29 Oct 2005)
+
+  29 Oct 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/devtodo-0.1.19-fix-multiline-segv.diff, +devtodo-0.1.19-r1.ebuild:
+  Revision bump; added a patch that fixes a segmentation fault when trying to
+  read a .todo file after adding a multi-line item (fex 'cat $somefile |
+  tda').
 
   15 Aug 2005; Luis Medinas <metalgod@gentoo.org> devtodo-0.1.19.ebuild:
   Stable on AMD64.
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index 3efeed98da0e..eaa3f7045631 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 f15a0660be6d92598e1a6c4ec881e9af ChangeLog 7924
 MD5 09cf4262be1e0bfc3de7f9f36b91c7cb devtodo-0.1.18-r2.ebuild 1383
+MD5 7bb197a5af10817114d97b069ad30bbb devtodo-0.1.19-r1.ebuild 1469
 MD5 0b04bf001ab92637893c47ad1eaa36cb devtodo-0.1.19.ebuild 1437
-MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
-MD5 c147ded21fdead646e57467be15ad539 ChangeLog 7604
 MD5 30a6fe495de6d0a0aaf435d52f83e254 files/devtodo-0.1.18-gcc4.diff 225
 MD5 d2457f597a941172dfdc9e12d13ce605 files/devtodo-0.1.18-gentoo.diff 4853
+MD5 04eeb19cdcf171b06b7e0982f1ed2b96 files/devtodo-0.1.19-fix-multiline-segv.diff 702
 MD5 d4832a9a5c0f6bd3d6a400be666a60d4 files/devtodo-0.1.19-gentoo.diff 4623
 MD5 fb4916ad754050b018e360663a1f3497 files/devtodo.bash-completion 1546
 MD5 e254b7fe4623f6fb5dfb4c9169e75ef7 files/digest-devtodo-0.1.18-r2 66
 MD5 07ddb19b677965f01eb612985e082441 files/digest-devtodo-0.1.19 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLDRDKf2g/qXtneoRAptHAKCT7/l1Kc/JkaOg4aFoI31EwQ0GbACfS8qi
-/bK7Vqr/94fDuM/UnI4382E=
-=+712
------END PGP SIGNATURE-----
+MD5 07ddb19b677965f01eb612985e082441 files/digest-devtodo-0.1.19-r1 66
+MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
diff --git a/app-misc/devtodo/devtodo-0.1.19-r1.ebuild b/app-misc/devtodo/devtodo-0.1.19-r1.ebuild
new file mode 100644
index 000000000000..4485bdfd5580
--- /dev/null
+++ b/app-misc/devtodo/devtodo-0.1.19-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.19-r1.ebuild,v 1.1 2005/10/29 15:18:20 ka0ttic Exp $
+
+inherit eutils bash-completion flag-o-matic
+
+DESCRIPTION="A nice command line todo list for developers"
+HOMEPAGE="http://swapoff.org/DevTodo"
+SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.1.18-gcc4.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-fix-multiline-segv.diff
+}
+
+src_compile() {
+	einfo "Running autoreconf"
+	autoreconf -f -i || die "autoreconf failed"
+	replace-flags -O[23] -O1
+	econf --sysconfdir=/etc/devtodo || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog QuickStart README doc/scripts.sh \
+	doc/scripts.tcsh doc/todorc.example || die "dodoc failed"
+
+	dobashcompletion contrib/${PN}.bash-completion ${PN}
+	rm contrib/${PN}.bash-completion
+	docinto contrib
+	dodoc contrib/*
+}
+
+pkg_postinst() {
+	echo
+	einfo "Because of a conflict with app-misc/tdl, the tdl symbolic link"
+	einfo "and manual page have been removed."
+	bash-completion_pkg_postinst
+}
diff --git a/app-misc/devtodo/files/devtodo-0.1.19-fix-multiline-segv.diff b/app-misc/devtodo/files/devtodo-0.1.19-fix-multiline-segv.diff
new file mode 100644
index 000000000000..5eb38ea7f0be
--- /dev/null
+++ b/app-misc/devtodo/files/devtodo-0.1.19-fix-multiline-segv.diff
@@ -0,0 +1,12 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN devtodo-0.1.19.orig/util/XML.cc devtodo-0.1.19/util/XML.cc
+--- devtodo-0.1.19.orig/util/XML.cc	2005-10-29 11:02:17.000000000 -0400
++++ devtodo-0.1.19/util/XML.cc	2005-10-29 11:03:39.000000000 -0400
+@@ -51,7 +51,7 @@
+ 			"*[[:space:]]*(/?)>");
+ 		xmlScan.addPattern(XmlEnd, "</[a-zA-Z0-9_-]+>");
+ 		xmlScan.addPattern(XmlDataBegin, "<!DATA[[:space:]]*\\[\\[");
+-		xmlScan.addPattern(XmlContent, "([^<]|[\n\r])+");                                     
++		xmlScan.addPattern(XmlContent, "([\n\r]|[^<])+");                                     
+ 
+ 		commentScan.addPattern(CommentEnd, "-->[[:space:]]*");
+ 		commentScan.addPattern(CommentBody, "[\n\r]|.");
diff --git a/app-misc/devtodo/files/digest-devtodo-0.1.19-r1 b/app-misc/devtodo/files/digest-devtodo-0.1.19-r1
new file mode 100644
index 000000000000..92ca1a8b9d5a
--- /dev/null
+++ b/app-misc/devtodo/files/digest-devtodo-0.1.19-r1
@@ -0,0 +1 @@
+MD5 723c86eae76c425ab9f271760bb951a3 devtodo-0.1.19.tar.gz 442920