_FORTIFY_SOURCE indicates presence of overflow Fix, #351013

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 42 insertions, 11 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/Manifest b/sci-libs/grib_api/Manifest
index 3f5e4b0f8238..1a9b2a5c7941 100644
--- a/sci-libs/grib_api/Manifest
+++ b/sci-libs/grib_api/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX grib_api-1.9.5-32bit.patch 714 RMD160 e74d83441b841d01461a3fe1dab19da2b768c19a SHA1 66bc600e3ae086bf58dbb3cecb5c9e5d7f27d333 SHA256 3c34e481b41fd36390daa6cb5c20d00b5df29e75d561413b8d6c852e776216d6
 AUX grib_api-1.9.5-autotools.patch 18564 RMD160 612b32ebfddfa83278b1b9e60ffdaa0a1dd01a6f SHA1 bde7a32b0f61e1921ea3eed25f9c073d149e4116 SHA256 f09112c393b5d0e62de5a6ad9f78a320393cbfa10c4d04ba1f16558e53795fbe
 DIST grib_api-1.9.5.tar.gz 6031267 RMD160 b0067f8b99a341d44ed1e2b1569cd7b8dba09c69 SHA1 278ca8213ea358b58a295774d66efcb65046b104 SHA256 1fbaa92e9f026548b7260e77dbd0e8201bd5629240ec4d157d6322cf7444137f
-EBUILD grib_api-1.9.5-r1.ebuild 1377 RMD160 4202949862e176580ac4282a76ca20246bec17f3 SHA1 fce42c50f8a857b22b7af67e0c8cd2a82a0118d3 SHA256 fc7a365064d3c418a721aed8927968f122220fcaf827be6617b1475f968a88a6
-MISC ChangeLog 648 RMD160 6988ab027805b9f9d1f212ae1748359501aab9d6 SHA1 fcc8fc75f121aee4d13bc5e533302c85fd4b0858 SHA256 8dc5d3bd420ea438d7fe1e8ddc6b9acf249d3917870caf8eab6f24bd147f8fe7
+EBUILD grib_api-1.9.5-r1.ebuild 1412 RMD160 43ded834e9ded27ac8d90ab87eaed42564723fe0 SHA1 e1a5953845d92d9e95e9b12726d85f8078fa1a5b SHA256 edb6dac64f93c3dc83209ff0f75d07918fe83088b4a3e96162aba3d9c5cf3278
+MISC ChangeLog 817 RMD160 2e2968c0742fa1e819d0455cf67428f8c6039a04 SHA1 861296722114fd0f793432723b693792e0490e58 SHA256 e5966cc39c567a2e6413142cf32c764d8169c50cc72794d919a255d4bca9a569
 MISC metadata.xml 547 RMD160 027cff497339b515ee70e6a88002b6a13ae0636b SHA1 2178680f3965b593491d88e874777af50e2451ac SHA256 d8075d9dc0ecd812d815ff4a8ceb01209b7576160a1a8bc6bd5ac0aae88ba609
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0QO00ACgkQ1ycZbhPLE2Ct6QCeOg6a/JDf0J076cYUuJ7d+4o1
-cnUAnRcNe+nQhLo2a85O2SJyJXVkX+jI
-=XLwI
+iEYEARECAAYFAk21QLEACgkQgAnW8HDreRYC1gCfcikUkisL6cwL/p6F0ifClFEw
+CmAAoMfFkKli0MJFsqAuQZUHYd2U7q1R
+=V9z1
 -----END PGP SIGNATURE-----
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
 }