Fixed crash caused by too many warnings, bug #405463, thanks Sebastian Luther

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 26 insertions, 8 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 26bb4c17c11c..43fccc72ab44 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.194 2012/02/09 17:35:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.195 2012/02/27 02:55:58 bicatali Exp $
+
+  27 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.14.1.ebuild,
+  +files/R-2.14.1-warnings-buffer-overflow.patch:
+  Fixed crash caused by too many warnings, bug #405463, thanks Sebastian Luther
 
   09 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.14.1.ebuild,
   +files/R-2.14.1-pcre830.patch:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 3765e96341e1..ae72e7cc8e46 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -7,17 +7,18 @@ AUX R-2.13.1-zlib_header_fix.patch 464 RMD160 908fd31070ac6e3311ad4105763a7b89f5
 AUX R-2.14.1-pcre830.patch 949 RMD160 45dfda7325392d88c7b3b382db3cd29a188c3d7c SHA1 1a7fbcd00f145f22659cda568ff42bbd0d4b1187 SHA256 720ed76bdbb47169fd354d861b86b8443c3e6f923a5b220b47d46634b9c45bb2
 AUX R-2.14.1-rmath-shared.patch 986 RMD160 ec0adb2b8c8d8932eedebda776cf204e3c7ea01e SHA1 a837510d2f154cf33ba1f70272a0bb10266c9b3f SHA256 c05463dbf9ec5bba34cc987df4f6878154a738e57aaeaac46cc4f728c0c837a7
 AUX R-2.14.1-tiff.patch 1711 RMD160 cb6b5b2c160011c7dfebabc0f4bcae5a5ab03a90 SHA1 0b2b5cbd3cfef9eee1968ff7dab2c8fca051e9d4 SHA256 ff77e062a80eeb403dc98ffb0b6fedce28859f18082981891ae6e2a95cf61142
+AUX R-2.14.1-warnings-buffer-overflow.patch 380 RMD160 acf41913d9eda01ebbb7c077edf9bf1bbb47c3ae SHA1 bb6fc5b8216b1ccfed7e37fc57870215016676c5 SHA256 e6b3e825ef837342c0a4bbfc05d7441d1ec5a98e31cf3bdb3d25000337a8538f
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
 DIST R-2.14.1.tar.gz 23697861 RMD160 9dcd1d135701e3c682585346e7c48ac2c62012fd SHA1 5803a213480a749e36bccc155aecb13070ade096 SHA256 d8a18914005975f40ed8fb37e3532422f769fb454651a9ed75f73c2bee9c0c4c
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4514 RMD160 7f170bfc025de21298d01f6b44ac3714605146fd SHA1 2a4d80e1e2ab22e2b3bfa2e910770185b81ee584 SHA256 86e6ab59bf58155d0dc313ecc3a07281b471074b3a178058c96fa8e4e3e3dea8
-EBUILD R-2.14.1.ebuild 4265 RMD160 bdaead15c1b3895a491632ce61586db12831e332 SHA1 cdcc86fc1b333c95b79a63ccfa3da6bde2b4a294 SHA256 4bd99cdec6c3cde1745d0f5e02d38a70807d2136c5922a2ae6845fc7e3e84f3c
-MISC ChangeLog 29229 RMD160 8b00924d48b96a19458025f9fc605e77019330f0 SHA1 de94e9d9a52a093bc798f86b5833302835633863 SHA256 900b7b680a11906ee9a2186b31479214c3ded2aeca87710c8c4de59ebed5d24b
+EBUILD R-2.14.1.ebuild 4327 RMD160 ff7b567055bdb11dc8ba276f50a0486cebda9910 SHA1 f23735533c94b4435c5f3dfebe2b729ab5a72be9 SHA256 015dca3585c42f807f0907c7f6e1809123d79055c13cd4d3e83e5d02c17bb8ba
+MISC ChangeLog 29432 RMD160 cbb8bb79f780cfce02a7698acff0909ee62fb14e SHA1 2b0b6d74c49ba9439ca7baff39a648f85f73d052 SHA256 06bfe1a764e30e96c9b0aa3c560abe5b91b502a6fdf8cff8d2999ec959478982
 MISC metadata.xml 1033 RMD160 d200586401de4f212758a5632040059b86cebe79 SHA1 7e6e9da0f5fe1f39a440ecdb298775685f14bb31 SHA256 c0e2a21f7e4e5eeadfd2502b7d035633b81a8f0228e4986758fb0f45990ec016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk80BCAACgkQ1ycZbhPLE2AZQgCdFia90yGWYPWgVLIU8iU+kWqC
-ToAAni6Xsdhe6yyO9kM/Oqb9i0b/7Vs6
-=3QSo
+iEYEARECAAYFAk9K8MgACgkQ1ycZbhPLE2BHeQCghUxPL3u5Tvi62kxUyfCJq/tm
+xGoAn1aiiE3C5VhRNU/FSKZ2oaMc67d7
+=Rjnx
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.14.1.ebuild b/dev-lang/R/R-2.14.1.ebuild
index 1c03e404734f..83c7dbb10335 100644
--- a/dev-lang/R/R-2.14.1.ebuild
+++ b/dev-lang/R/R-2.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.3 2012/02/09 17:35:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.4 2012/02/27 02:55:58 bicatali Exp $
 
 EAPI=4
 
@@ -65,7 +65,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
 		"${FILESDIR}"/${PN}-2.14.1-tiff.patch \
 		"${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch \
-		"${FILESDIR}"/${PN}-2.14.1-pcre830.patch
+		"${FILESDIR}"/${PN}-2.14.1-pcre830.patch \
+		"${FILESDIR}"/${PN}-2.14.1-warnings-buffer-overflow.patch
 
 	# fix packages.html for doc (bug #205103)
 	sed -i \
diff --git a/dev-lang/R/files/R-2.14.1-warnings-buffer-overflow.patch b/dev-lang/R/files/R-2.14.1-warnings-buffer-overflow.patch
new file mode 100644
index 000000000000..9a5caf244f36
--- /dev/null
+++ b/dev-lang/R/files/R-2.14.1-warnings-buffer-overflow.patch
@@ -0,0 +1,12 @@
+--- src/main/main.c.orig	2012-02-23 21:57:10.478788427 +0100
++++ src/main/main.c	2012-02-23 21:56:12.186789729 +0100
+@@ -674,7 +674,7 @@
+ #ifdef ENABLE_NLS
+     char localedir[PATH_MAX+20];
+ #endif
+-    char deferred_warnings[6][250];
++    char deferred_warnings[11][250];
+     volatile int ndeferred_warnings = 0;
+ 
+     InitConnections(); /* needed to get any output at all */
+