Fix strfry issue if len = 0. bug 251675, patch by bob5972

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 57 insertions, 3 deletions

diff --git a/sys-apps/dog/ChangeLog b/sys-apps/dog/ChangeLog
index 32ae894cce61..8d146d3b0155 100644
--- a/sys-apps/dog/ChangeLog
+++ b/sys-apps/dog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dog
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.23 2008/02/04 18:07:51 grobian Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.24 2009/04/10 04:34:37 darkside Exp $
+
+*dog-1.7-r3 (10 Apr 2009)
+
+  10 Apr 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/dog-1.7-strfry.patch, +dog-1.7-r3.ebuild:
+  Fix strfry issue if len = 0. bug 251675, patch by bob5972
 
   04 Feb 2008; Fabian Groffen <grobian@gentoo.org> dog-1.7-r1.ebuild,
   dog-1.7-r2.ebuild:
diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest
index a6f33fab9f48..2319254ed86e 100644
--- a/sys-apps/dog/Manifest
+++ b/sys-apps/dog/Manifest
@@ -1,7 +1,9 @@
 AUX 1.7-manpage-touchup.patch 498 RMD160 783727af6f707e71363052d3ef757fd10de89f3f SHA1 a9ede31d27c99f473a3297acdef410561649ebdb SHA256 dbb10044589ef4ea3bf22ccc1077aa025e001c46489ed86c61eb18fa9322f6e7
 AUX dog-1.7-64bit-goodness.patch 791 RMD160 fc20db4ef32d3b16b3f1884518e23f7f880671f7 SHA1 366b7bafc5f042e90684adcc32e1ad8a02b75168 SHA256 535678345069d597486bd1985ca15ce7ee1933bf20922c4d8a8d6407d2811ff6
 AUX dog-1.7-check-ctime.diff 1409 RMD160 938cafcd301ba8e198a6fdd3b00f1fdefbaa7c77 SHA1 752f4167a7d2091056af6579d0d27548e9ebc7e6 SHA256 d21ac7bf1bf2799daca0e621d00aae2c9369e83622f84ef83054a6b70228a0d8
+AUX dog-1.7-strfry.patch 288 RMD160 863b6d5a25d7c24826a6bef29bfa70d110d55dd7 SHA1 506de0c036cb41b9f54bae1036fff99f2d0dbfe8 SHA256 553a5a1a3078dc79ae65ff313e8a8dce66843510f004048a0d0b7f6ed1d5552d
 DIST dog-1.7.tar.gz 30433 RMD160 dd8867a5a8ff7208b92df8bc23a9b6b48cc74816 SHA1 a1af9c76daa0c9768cdf0c31839b3004e6ccc417 SHA256 6c5386d1b6401d6410baa8f0da343de5625cd3d59b6273dcee81997c372522ca
 EBUILD dog-1.7-r2.ebuild 811 RMD160 00e7ffac3144305c90723055f84caf62f3e11a44 SHA1 edb780972fd2b0a8428ca90ccd7ef9e21637777a SHA256 08d6d6fd2f128d470e9ff8abc750f16ac4ce0c2a7cf8dfb7aed7554b26e88a8e
-MISC ChangeLog 2803 RMD160 9311ed4fd104ef23338be37780011759f7b20e18 SHA1 aabc35b5c9c3d3d26f3c8c4861c3cc3d166c958c SHA256 c3c04877adbb7ff5ac38b265a7a505ab1a3540d844b7f96a38f920366fcd39ab
+EBUILD dog-1.7-r3.ebuild 855 RMD160 df12a9a8f066a207f5bf8000979f8ba969d47886 SHA1 a80c64dae970a53abb33717bdb2857d750ff78f7 SHA256 2f222535fdff9edd23fcc6fdca60c2d8e38265289fcb05da9027c81ea442c741
+MISC ChangeLog 2993 RMD160 1f804a642acf0527e0a55abd89d6d83010d78c9d SHA1 4f30d2ac485156eb0aa3b937fff0f58a8e5501fb SHA256 0193e892056ee13d42b6773d63b49986ccb1fa32dda5c2863e9c54eeb193674f
 MISC metadata.xml 234 RMD160 45a2ea12c9260edd2873e388e0c557b22b0340bf SHA1 5cb1e736d47030a98681b5b611f456dad51f9366 SHA256 1378728b80203e0b5e3fe90c0aef9a1cb191585d99a3e761a8817d4209e5cf72
diff --git a/sys-apps/dog/dog-1.7-r3.ebuild b/sys-apps/dog/dog-1.7-r3.ebuild
new file mode 100644
index 000000000000..159a07e49853
--- /dev/null
+++ b/sys-apps/dog/dog-1.7-r3.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/sys-apps/dog/dog-1.7-r3.ebuild,v 1.1 2009/04/10 04:34:37 darkside Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dog is better than cat"
+HOMEPAGE="http://jl.photodex.com/dog/"
+SRC_URI="http://jl.photodex.com/dog/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-check-ctime.diff
+	epatch ${FILESDIR}/${PV}-manpage-touchup.patch
+	epatch ${FILESDIR}/${P}-64bit-goodness.patch
+	epatch ${FILESDIR}/${P}-strfry.patch
+	sed -i \
+		-e 's,^CFLAGS,#CFLAGS,' \
+		-e "s,gcc,$(tc-getCC)," \
+		Makefile || die "sed Makefile failed"
+}
+
+src_install() {
+	dobin dog || die
+	doman dog.1
+	dodoc README AUTHORS
+}
diff --git a/sys-apps/dog/files/dog-1.7-strfry.patch b/sys-apps/dog/files/dog-1.7-strfry.patch
new file mode 100644
index 000000000000..b62b815aed50
--- /dev/null
+++ b/sys-apps/dog/files/dog-1.7-strfry.patch
@@ -0,0 +1,13 @@
+See Gentoo bug 251675. Upstream appears to be dead.
+
+--- dog.c.orig	2009-04-09 23:29:16.307661147 -0500
++++ dog.c	2009-04-09 23:30:11.353664890 -0500
+@@ -552,7 +552,7 @@
+ 	
+ 	// strfry()
+ #if ALLOW_STRFRY
+-	if (opt_strfry) {
++	if (opt_strfry && str_len > 0) {
+ 		strfry(str);
+ 	}
+ #endif