Version bump. Added a patch to overcome buffer overflows in integer to string conversions

Package-Manager: portage-2.2.01.21476-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 210 insertions, 6 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 0f28197f03fb..4e02b74f1478 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/gdl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.34 2012/12/11 19:42:52 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.35 2013/01/02 21:44:31 bicatali Exp $
+
+*gdl-0.9.3 (02 Jan 2013)
+
+  02 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/0.9.3-sstream.patch, +gdl-0.9.3.ebuild:
+  Version bump. Added a patch to overcome buffer overflows in integer to string
+  conversions
 
   11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> gdl-0.9.2-r2.ebuild:
   Keyword amd64-linux and x86-linux
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index bae3fdfb104f..5372d970cb90 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -7,14 +7,17 @@ AUX 0.9.2-numpy.patch 557 SHA256 a7c2f55cb652a711375c5b427112bc2fb5c6383e6350f5c
 AUX 0.9.2-proj4.patch 1185 SHA256 4c6b4d97823ddeebae4c3170dc80c14bb68681117de599077ce6a845fb2ae26f SHA512 15ac5f961217cd9067c1872d53f7399c4a4f93db5912c2c7e0de489922f83bc75c0720d6679474d003a5bf8617cccb85600f17f10c1ab80615a290c17893693a WHIRLPOOL 5c9b6bb3449513728a9071185e5194e561229a83010ffb35b483839322d42674621ebeabf47cc666c57aef21636b04032a8f97139df5abd3f9d3100d9f9330e1
 AUX 0.9.2-semaphore.patch 770 SHA256 cbdfe65ddd23a62f04b2beee46f9f6e80bd12ff55a3563ea7059a7e2c083aac4 SHA512 6f921539e3dc09af453403f3b4137fc3e7d6fd4b81f05cb3214b4ab6a2feecbe2f3aeae1cdf03d92db13e60f7562825fa1a9bebfd75ac47fc6625b88f367b5ac WHIRLPOOL e1b8a55f0ce9d2626b53882528d0ee7056ad28ea5bbf746a7d77b4074d63977c1940bba478eb6b54a56d1b64e843a55106f53a21fb166d6566197828aef16208
 AUX 0.9.2-tests.patch 8616 SHA256 4cf7fa89353265361bdbcf38fbeb3bacb572f2b8920ca00a73ce1d66a57c5a9e SHA512 885d2196d617eb4d37bcba056ece4ffb06366847cc213f0ee8c0a693925d16f27131a5d5bd92c5a7a555876a8d40e0a27dd59113aab9f76c319288e38dccf01a WHIRLPOOL 1191100da88814048c8fbd1c3e5881b1ea99f03e1de4d5945214230b6c4617ed643794d5cadb497bb7228bc37c811fe4db2593eff711c447ae3a30a1f402524b
+AUX 0.9.3-sstream.patch 891 SHA256 ef02cd0e1b2b80ee61096ea8867091b720b2111e841d6b4fe14b6986db4fa199 SHA512 d88c9ccab80ba0ec5d1e9b2e3d71be5d2c0c09aaef2ccf4d26cde2110a42eb23568b14f527ddefebc608f197a3e37bb539a2fc90a38a8059f76908dff3e3ddd7 WHIRLPOOL fac6aba02aa1d584a2d4d7bf17fc59bda8469fd5bfb241acfb3490e84dd518934c9c21a2b20d9a272cf6cb799c6f976964e7b71b204b5b39f9c27501b3d2c3a4
 DIST gdl-0.9.2.tar.gz 2436946 SHA256 59907d941877327e9653a9cda5d801ea0b45f67af4c7da22acfcdd7cad291acf SHA512 44531b03fa698f268eea7a4e9dfe9a2c5746b4432c0198d616eb0938e9d9228bb3a2e3cf70b86f26d4cd720bf626b8c85f19bb79d3218727eba57689e07c9367 WHIRLPOOL 6ee960519adb2f3850808fd690cfd77571ef625b1f82cbe81a93c30a96ae3a19f9716e00fd44e6d541abb3211d4c255b5f773113e095d0f64057493f1d33903d
+DIST gdl-0.9.3.tar.gz 2540106 SHA256 6d3c30c06ce2772a1017b3685dfc8fb74308e5f9d258fcb764b765c33d20f500 SHA512 63bb656c1280c24429dd0f8093f9ec7aab69b32e33b489461b863068409c7f49843e1997c2ff423fecf58d042e5d95d9b745f00495be4ea37ccb911936722e7c WHIRLPOOL 1652519dbdf99f95ec4ba11528c2d5dcfc3d40c708a01b390900002f6a9933800bee7af6af175452a3ecde517ce213791a06f779c85161e34c95616e9f0ccf60
 EBUILD gdl-0.9.2-r2.ebuild 3933 SHA256 1c7506e3ddf9ac6f8bdf2a2a72e85fbb40843d978251126d97e2a36f5a78f83e SHA512 2841ab91467bbe6ed4448e38e0552ee0321e89644139fe936a5d9622c57ae86d42c91c5c948e7237727cebca5df048650113a59b11961aae7f1575b467d17dc4 WHIRLPOOL 7a6fbe54824343325a73b5d591971e3fa7e24721886cf29a5c02c5fe8403fbf92447ea131a5cdd6909d681dfef6724db85a998e8923e272b193bc9fde7e47275
-MISC ChangeLog 7914 SHA256 1c4082ebd29e5d398bb7b562091a997fe9b8a689c50ec16cab541b7a71ffe5c5 SHA512 48d1de988f4ad8dda53a0475b503f7a0f4dc256e8f5d4560a1f20184f6158f383c6ab59172ec2ec877d2031148683168faa0abff6f006835bec15f158ec83df0 WHIRLPOOL df0902975650eacabdc36d7abd18f8e3183f139fdb1f008eaaafce1ce282d025f8f9eb413be798427472c9cb4008c69c8db44cba0217edfb67aedc77ea78be50
+EBUILD gdl-0.9.3.ebuild 4085 SHA256 b4a2908a6d32b71a99b0283b25611e025ff67516173be0ab724ab4bba09044e7 SHA512 6ce2b659a858950454cc0c5e168aa67954f90d79d3c5b7711f1679712405dee90713810640a34c01b8140880d63a6618e7973d58befd20697d8a4b8b8014148d WHIRLPOOL 8eb035a72eea648cbbe912860f134942876f960f0256b422bc5f8043d04e5d6122c61457dd85176a9b2877b71e7db0a066850fc939ea71c0fff2a4eabc8d24ae
+MISC ChangeLog 8139 SHA256 a68b12f08b0ee14dfa9be2464d6588362f183bbad7402a83b716a64a05695f46 SHA512 d7f21f3f27b3de4988f37bb62f2e64b240a9a9b3823b2b5c3a0efa36968479b0fb082ed078124d94f9f578f7d0509fcbef6e14594385862f1fa50a0f580dd5bd WHIRLPOOL 1b96c1a8025ba554b5e01403b812196be8a94736d07b28c32c64fe9579ca49c80cc0954380da9dd2b56a6a10eb8fdf3d03abbd82df6ae800a0e8bab9420ef620
 MISC metadata.xml 868 SHA256 8fe2970b31ca708b5948308b6de3ddb28c097df8f4a542bf051857ca724897d6 SHA512 1f95c2d1f7791e6644fdd27ec08fe0096d0ac7c4b9232c89c236e5d50b9f99130904b056d42fb663e005acfe97781246402a12e0e955812cee0b4dca0a1e4f56 WHIRLPOOL 31b23b40fb3209f0529917ce29f8e231f44bc04a88630f3a4a907a1ba5c01f1e51bdd21c84dfd4b2e2bce613a8151ae9371f284d16229eb08c0ab961dad833ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDHjMEACgkQ1ycZbhPLE2AxBgCfXRGvkjTxwYmh1MX5k3eNhfLe
-WEoAnidG+dLKQMs57doxmfWz4Wfwaakn
-=i4Wo
+iEYEAREIAAYFAlDkqkQACgkQ1ycZbhPLE2B/XwCgiQlrxaOzq/ezV57zFpuQug+9
+FVMAn1UvEQrJCyVlCtVd2O4QZg7YwM5n
+=BUMi
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/0.9.3-sstream.patch b/dev-lang/gdl/files/0.9.3-sstream.patch
new file mode 100644
index 000000000000..77322d00a074
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.3-sstream.patch
@@ -0,0 +1,42 @@
+--- src/magick_cl.cpp.orig	2013-01-02 13:39:02.387184167 -0800
++++ src/magick_cl.cpp	2013-01-02 13:40:14.876543262 -0800
+@@ -30,6 +30,7 @@
+ #include <string>
+ #include <fstream>
+ #include <memory>
++#include <sstream>
+ //#include <Magick++.h>
+ 
+ #include "datatypes.hpp"
+@@ -57,25 +58,17 @@
+ 
+   string GDLutos(unsigned int i)
+   {
+-    int mema=3;
+-    char *n=new char(mema);
+-    while (snprintf(n, sizeof n, "%u", i) >= sizeof n)
+-      {			delete n;mema++; n=new char(mema);   }
+-    string s=n;
+-    delete n;
+-    return s;
++    istringstream s;
++    s >> i;
++    return s.str();
+   }
+ 
+   
+   string GDLitos(int i)
+   {
+-    int mema=3;
+-    char *n=new char(mema);
+-    while (snprintf(n, sizeof n, "%d", i) >= sizeof n)
+-      {			delete n;mema++; n=new char(mema);   }
+-    string s=n;
+-    delete n;
+-    return s;
++    istringstream s;
++    s >> i;
++    return s.str();
+   }
+ 
+ 
diff --git a/dev-lang/gdl/gdl-0.9.3.ebuild b/dev-lang/gdl/gdl-0.9.3.ebuild
new file mode 100644
index 000000000000..14c94a52b3e2
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.3.ebuild,v 1.1 2013/01/02 21:44:31 bicatali Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit cmake-utils eutils wxwidgets python toolchain-funcs virtualx
+
+RESTRICT_PYTHON_ABIS="3.3 2.7-pypy-*"
+
+DESCRIPTION="Interactive Data Language compatible incremental compiler"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fftw grib gshhs hdf hdf5 imagemagick netcdf openmp proj postscript python
+	static-libs udunits wxwidgets"
+
+# very buggy tests
+RESTRICT=test
+
+RDEPEND="
+	sci-libs/gsl
+	sci-libs/plplot
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	x11-libs/libX11
+	fftw? ( >=sci-libs/fftw-3 )
+	grib? ( sci-libs/grib_api )
+	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( sci-libs/hdf5 )
+	imagemagick? ( media-gfx/imagemagick )
+	netcdf? ( || ( sci-libs/netcdf-cxx sci-libs/netcdf[cxx] ) )
+	proj? ( sci-libs/proj )
+	postscript? ( dev-libs/pslib )
+	python? ( dev-python/numpy )
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
+
+DEPEND="${RDEPEND}
+	>=dev-java/antlr-2.7.7-r5:0[cxx,script]
+	virtual/pkgconfig"
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+	use python && python_pkg_setup
+	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
+		die "You have openmp enabled but your current g++ does not support it"
+}
+
+src_prepare() {
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+	epatch "${FILESDIR}"/0.9.2-{antlr,proj4,include,tests,semaphore}.patch
+	epatch "${FILESDIR}"/0.9.3-sstream.patch
+	# make sure antlr includes are from system and rebuild the sources with it
+	# https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659
+
+	rm -r src/antlr || die
+	einfo "Regenerate grammar"
+	pushd src > /dev/null
+	local i
+	for i in *.g; do antlr ${i} || die ; done
+	popd > /dev/null
+
+	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
+	sed -i \
+		-e 's:proj4:proj:' \
+		-e 's:lib_proj\.h:proj_api\.h:g' \
+		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
+
+	# gentoo: avoid install files in datadir directory
+	sed -i \
+		-e '/AUTHORS/d' \
+		CMakeLists.txt || die
+
+	if use python; then
+		local abi
+		for abi in ${PYTHON_ABIS}; do
+			mkdir "${S}"-${abi}
+		done
+	fi
+	if has_version sci-libs/netcdf-cxx; then
+		sed -i \
+			-e 's/netcdfcpp.h/netcdf/g' \
+			CMakeLists.txt src/ncdf_var_cl.cpp \
+			src/ncdf_cl.hpp src/ncdf_{att,dim}_cl.cpp || die
+	fi
+}
+
+src_configure() {
+	# MPI is still very buggy
+	# x11=off does not compile
+	local mycmakeargs=(
+		-DMPICH=OFF
+		-DBUNDLED_ANTLR=OFF
+		-DX11=ON
+		$(cmake-utils_use fftw)
+		$(cmake-utils_use grib)
+		$(cmake-utils_use gshhs)
+		$(cmake-utils_use hdf)
+		$(cmake-utils_use hdf5)
+		$(cmake-utils_use imagemagick MAGICK)
+		$(cmake-utils_use netcdf)
+		$(cmake-utils_use openmp)
+		$(cmake-utils_use proj LIBPROJ4)
+		$(cmake-utils_use postscript PSLIB)
+		$(cmake-utils_use udunits)
+		$(cmake-utils_use wxwidgets)
+	)
+	configuration() {
+		mycmakeargs+=( $@ )
+		BUILD_DIR="${BUILDDIR:-${S}_build}" cmake-utils_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && python_execute_function -s \
+		configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && python_src_compile
+}
+
+src_test() {
+	# upstream does not include tests if python module is on
+	# there is check target instead of the ctest to define some LDPATH
+	use python || Xemake -j1 -C ${BUILD_DIR} check
+
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		installation() {
+			exeinto $(python_get_sitedir)
+			newexe "${S}"-${PYTHON_ABI}/src/libgdl.so GDL.so
+		}
+		python_execute_function -s installation
+		dodoc PYTHON.txt
+	fi
+	echo "GDL_PATH=\"+${EROOT}/usr/share/gnudatalanguage\"" > 50gdl
+	doenvd 50gdl
+}