summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-05-07 17:46:18 +0000
committerChristoph Mende <angelos@gentoo.org>2011-05-07 17:46:18 +0000
commitf1765984cbbded1ab833e3b2d0b60770759bc050 (patch)
treef377c7e29a3711ab00f085f3fdc3675815c590a5 /media-sound/horgand
parentalpha/arm/ia64/sh/sparc stable wrt #363767 (diff)
downloadgentoo-2-f1765984cbbded1ab833e3b2d0b60770759bc050.tar.gz
gentoo-2-f1765984cbbded1ab833e3b2d0b60770759bc050.tar.bz2
gentoo-2-f1765984cbbded1ab833e3b2d0b60770759bc050.zip
Fix possible overflow (bug #351290)
(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/horgand')
-rw-r--r--media-sound/horgand/ChangeLog6
-rw-r--r--media-sound/horgand/files/horgand-1.14-overflow.patch13
-rw-r--r--media-sound/horgand/horgand-1.14.ebuild9
3 files changed, 24 insertions, 4 deletions
diff --git a/media-sound/horgand/ChangeLog b/media-sound/horgand/ChangeLog
index 1e3cd198dc2f..b9dd10b7e1fb 100644
--- a/media-sound/horgand/ChangeLog
+++ b/media-sound/horgand/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/horgand
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.25 2011/03/20 20:09:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/ChangeLog,v 1.26 2011/05/07 17:46:18 angelos Exp $
+
+ 07 May 2011; Christoph Mende <angelos@gentoo.org> horgand-1.14.ebuild,
+ +files/horgand-1.14-overflow.patch:
+ Fix possible overflow (bug #351290)
20 Mar 2011; Justin Lecher <jlec@gentoo.org> horgand-1.14.ebuild:
x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
diff --git a/media-sound/horgand/files/horgand-1.14-overflow.patch b/media-sound/horgand/files/horgand-1.14-overflow.patch
new file mode 100644
index 000000000000..05e359b7c8d9
--- /dev/null
+++ b/media-sound/horgand/files/horgand-1.14-overflow.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Holrgan.h b/src/Holrgan.h
+index 1b93042..f8e9209 100644
+--- a/src/Holrgan.h
++++ b/src/Holrgan.h
+@@ -398,7 +398,7 @@ struct Ch3
+ struct Ch4
+
+ {
+- char Nom[10];
++ char Nom[12];
+ int type;
+ int fund;
+ int dist1;
diff --git a/media-sound/horgand/horgand-1.14.ebuild b/media-sound/horgand/horgand-1.14.ebuild
index 7ec5384bcf44..af526f5195fe 100644
--- a/media-sound/horgand/horgand-1.14.ebuild
+++ b/media-sound/horgand/horgand-1.14.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/horgand-1.14.ebuild,v 1.6 2011/03/20 20:09:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/horgand/horgand-1.14.ebuild,v 1.7 2011/05/07 17:46:18 angelos Exp $
-EAPI="1"
+EAPI=2
inherit eutils toolchain-funcs
DESCRIPTION="Opensource software organ"
@@ -23,8 +23,11 @@ RDEPEND="x11-libs/fltk:1
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-overflow.patch
+}
+
src_compile() {
- econf
emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \
$(pkg-config --cflags jack) $(pkg-config --cflags sndfile)" || die "emake failed."
}