summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2009-04-10 04:34:38 +0000
committerJeremy Olexa <darkside@gentoo.org>2009-04-10 04:34:38 +0000
commitaaffa5756e0081f7ee06e6a5adc03ad20d490f8c (patch)
tree6c89efa191e94b6004300e06453d0add9c340c6a /sys-apps/dog
parentQA, remove version for bug 209710 (diff)
downloadgentoo-2-aaffa5756e0081f7ee06e6a5adc03ad20d490f8c.tar.gz
gentoo-2-aaffa5756e0081f7ee06e6a5adc03ad20d490f8c.tar.bz2
gentoo-2-aaffa5756e0081f7ee06e6a5adc03ad20d490f8c.zip
Fix strfry issue if len = 0. bug 251675, patch by bob5972
(Portage version: 2.1.6.11/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/dog')
-rw-r--r--sys-apps/dog/ChangeLog10
-rw-r--r--sys-apps/dog/dog-1.7-r3.ebuild33
-rw-r--r--sys-apps/dog/files/dog-1.7-strfry.patch13
3 files changed, 54 insertions, 2 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/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