summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-04-25 09:36:45 +0000
committerJustin Lecher <jlec@gentoo.org>2011-04-25 09:36:45 +0000
commit5da8082c2a386a3b2e9a6a273cb6d5fbe4dfdb9f (patch)
tree9360011d078dcc36e2025d6248d9cd294e83681c /sci-libs/grib_api
parentStable on amd64 wrt bug #358789 (diff)
downloadgentoo-2-5da8082c2a386a3b2e9a6a273cb6d5fbe4dfdb9f.tar.gz
gentoo-2-5da8082c2a386a3b2e9a6a273cb6d5fbe4dfdb9f.tar.bz2
gentoo-2-5da8082c2a386a3b2e9a6a273cb6d5fbe4dfdb9f.zip
_FORTIFY_SOURCE indicates presence of overflow Fix, #351013
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/grib_api')
-rw-r--r--sci-libs/grib_api/ChangeLog8
-rw-r--r--sci-libs/grib_api/files/grib_api-1.9.5-32bit.patch24
-rw-r--r--sci-libs/grib_api/grib_api-1.9.5-r1.ebuild8
3 files changed, 35 insertions, 5 deletions
diff --git a/sci-libs/grib_api/ChangeLog b/sci-libs/grib_api/ChangeLog
index 72fa2f397a9c..8aa4ebee3210 100644
--- a/sci-libs/grib_api/ChangeLog
+++ b/sci-libs/grib_api/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/grib_api
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.2 2010/12/21 05:29:33 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.3 2011/04/25 09:36:45 jlec Exp $
+
+ 25 Apr 2011; Justin Lecher <jlec@gentoo.org> grib_api-1.9.5-r1.ebuild,
+ +files/grib_api-1.9.5-32bit.patch:
+ _FORTIFY_SOURCE indicates presence of overflow Fix, #351013
*grib_api-1.9.5-r1 (21 Dec 2010)
diff --git a/sci-libs/grib_api/files/grib_api-1.9.5-32bit.patch b/sci-libs/grib_api/files/grib_api-1.9.5-32bit.patch
new file mode 100644
index 000000000000..8bcad025feef
--- /dev/null
+++ b/sci-libs/grib_api/files/grib_api-1.9.5-32bit.patch
@@ -0,0 +1,24 @@
+ src/grib_ieeefloat.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/grib_ieeefloat.c b/src/grib_ieeefloat.c
+index 2190f56..36122a5 100644
+--- a/src/grib_ieeefloat.c
++++ b/src/grib_ieeefloat.c
+@@ -12,6 +12,7 @@
+ * *
+ ***************************************************************************/
+ #include "grib_api_internal.h"
++#include <stdint.h>
+
+ #if 1
+
+@@ -332,7 +333,7 @@ unsigned long grib_ieee_to_long(double x) {
+ #ifdef IEEE
+
+ unsigned long grib_ieee64_to_long(double x) {
+- unsigned long lval;
++ uint64_t lval;
+ #if IEEE_LE
+ unsigned char s[8]={0,};
+ unsigned char* buf=(unsigned char*)&x;
diff --git a/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild b/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild
index 85d3360c480e..1223ba84307a 100644
--- a/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild
+++ b/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild,v 1.1 2010/12/21 05:29:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.5-r1.ebuild,v 1.2 2011/04/25 09:36:45 jlec Exp $
EAPI=2
inherit eutils autotools
@@ -20,7 +20,9 @@ DEPEND="jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) )
RDEPEND="${DEPEND}"
src_prepare() {
- epatch "${FILESDIR}"/${P}-autotools.patch
+ epatch \
+ "${FILESDIR}"/${P}-autotools.patch \
+ "${FILESDIR}"/${P}-32bit.patch
eautoreconf
}