Add fix from PLD Linux for buffer overflow detected by FORTIFY_SOURCE=2 on 64bit arches. Research done by Arkadiusz Miskiewicz <arekm AT pld-linux DOT org> for bug 348559

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 36 insertions, 9 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 4ec052483f28..f06125ffef23 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/erlang
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.204 2010/12/12 12:12:35 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.205 2011/01/12 09:35:47 fauli Exp $
+
+  12 Jan 2011; Christian Faulhammer <fauli@gentoo.org> erlang-14.2.1.ebuild,
+  +files/erlang-14.2.1-fortify.patch:
+  Add fix from PLD Linux for buffer overflow detected by FORTIFY_SOURCE=2 in
+  on 64bit arches. Research done by Arkadiusz Miskiewicz <arekm AT pld-linux DOT
+  org> for bug 348559
 
 *erlang-14.2.1 (12 Dec 2010)
 
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 06418392cd16..0be5a2612574 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494
 AUX erlang-14.2-respect_LDFLAGS-wx.patch 505 RMD160 4bcb17f832299eb8489640dc0f16f4596a94121a SHA1 de26cc5b539ef8317b1907a8dc75dda70c484a5d SHA256 1564956d52671c908dd08842ba6fc8bfdc572ca57715355dccd6a1def346f7cd
+AUX erlang-14.2.1-fortify.patch 723 RMD160 ca620d8782672f2694f831a62bb92a66c3e04278 SHA1 498426674348810116cda4379a7f6d21bfaf1849 SHA256 f75aa36199ae806965872167e35c33cd1142a6deee1b257e6bb9cfcc61324adc
 DIST otp_doc_html_R13B04.tar.gz 27440785 RMD160 7257fad19ecfeee69b1c7021692374d1e29aba79 SHA1 dc0e68cb1dd6f45cbd5ea792260b16f91eaa0e2f SHA256 fdad0db55ab9339703e7cd61626b5cca95f187084d1dabf07ac97f528b4f47aa
 DIST otp_doc_html_R14B.tar.gz 27735095 RMD160 a7a100971543cc238dfeaf010028dea7261673f5 SHA1 d752b4bdc89d64bffde41e64b118eb7c0a8f7c72 SHA256 0189a784a4ea0c192c857835b20fa97a0c9f85054ae5b9868061574f329842a5
 DIST otp_doc_html_R14B01.tar.gz 28332965 RMD160 e5f29f31ce2614e9363bdb74b9a9527e1b734701 SHA1 db406964187a12e9ba1b7d49ec6e092ab1f4dbb8 SHA256 6c16435fb589c4eb777af273f3b789844764331e4bf72fe727612da59ac2c97b
@@ -15,14 +16,14 @@ DIST otp_src_R14B.tar.gz 59800980 RMD160 69578a2019fcaab4e7c11f2d1d2d5eef21d5c5f
 DIST otp_src_R14B01.tar.gz 64846537 RMD160 d91401fb100c18eb79899c9292e05574a51e88c8 SHA1 f0e0529ed73587c2c4aaeb3f3a01555bd6cfe05c SHA256 88349fa9f112e21b09726434ee5f4013d3ed3fb1d0f2623f22689dc20886f2f8
 EBUILD erlang-13.2.4.ebuild 5164 RMD160 2d746d7d8383a0504bd4f80a24505bb20e4cbeda SHA1 ecdd965ef4c747762671a4bb6f8b44aeb1b41193 SHA256 203e4238e06787b5e988366c56c763e3656d63eb44c52038ed6ff271dace9bd7
 EBUILD erlang-14.2-r1.ebuild 5384 RMD160 67956026df6643572045a6262a62320113907988 SHA1 c24cb867ed5d51c3562934b2f58a1638555fa664 SHA256 282073dcceff8a87045d2f0ac5e3c626dcbfecbb5cef2e23395616c49b45291f
-EBUILD erlang-14.2.1.ebuild 5226 RMD160 c0ed05af2e1a64f2aae433c1ade4612d541a4355 SHA1 a922da27eeee963d5a25ec4f518fa6920ee25b67 SHA256 51ad65fdc57f58fdabc0e45069ba950524e8b97ca910bb33299a2ae8bdcd7c59
+EBUILD erlang-14.2.1.ebuild 5280 RMD160 b59d14772a32515099e625718be32c081ebb79e1 SHA1 67c6f9175b9c89dc294753801b2d7373eb6a4304 SHA256 c5e7b4ce23d33604c44aa974d036026fe2232dcf6124871a463fc8123077f288
 EBUILD erlang-14.2.ebuild 5509 RMD160 2062caa472f9d11fc2959fda1978ad0d389c9e4f SHA1 716db64602f732fa7c3b3e409f3f75cb4b4fa967 SHA256 a3b644ca2c4d937bae04410dea074ecb1a1276c0af176d413fd57621ec97f837
-MISC ChangeLog 32699 RMD160 15a531d385f4b08085feb7be664f3bd8e50e4c8c SHA1 5e3e1ffc0ec4233fa7086c3f47cf92e58f6f1f42 SHA256 1b823a7269dec2502c0821bb87e2f8a98bfb1007eb7df6824b8ac68483cb73cc
+MISC ChangeLog 32995 RMD160 3eaf4409164b30ac7b6f51f21c16b03ffde25a74 SHA1 d64b57de44c17911b1a71c9c291ad0c419471e38 SHA256 b90b1506721bc65ebc057a66c464d0ece9e86afa32680e33f4c9bf8ebc2d819d
 MISC metadata.xml 693 RMD160 6c8d43bd35549421b055b468c45f1f2e5d39357d SHA1 7c778bbc7faf1dfdc11a6155e1c525e42d63ebb5 SHA256 ee0ac0699562802a5191deaef78770c25a342875a3b363ea95a0b92da6f107e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0EvMEACgkQNQqtfCuFneNxMwCfeu7OxVCSWrzbZ5FaZpAsPrD5
-HmwAn0bkLlCV6TCWgms60Ia82rtE3MX4
-=DB+Y
+iEYEARECAAYFAk0tdvAACgkQNQqtfCuFneP0CwCfZRAo00LXpwWFrHR3xFDBH2CG
+jXgAnRJAIoXivqWXj3fLsapDtaYA0A0F
+=D20g
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-14.2.1.ebuild b/dev-lang/erlang/erlang-14.2.1.ebuild
index 8976afb2b5a9..7366bbf50aab 100644
--- a/dev-lang/erlang/erlang-14.2.1.ebuild
+++ b/dev-lang/erlang/erlang-14.2.1.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/dev-lang/erlang/erlang-14.2.1.ebuild,v 1.1 2010/12/12 12:12:35 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-14.2.1.ebuild,v 1.2 2011/01/12 09:35:47 fauli Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -52,6 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-fortify.patch" # bug 348559
 	use odbc || sed -i 's: odbc : :' lib/Makefile
 
 	# bug 263129, don't ignore LDFLAGS, reported upstream
diff --git a/dev-lang/erlang/files/erlang-14.2.1-fortify.patch b/dev-lang/erlang/files/erlang-14.2.1-fortify.patch
new file mode 100644
index 000000000000..4fb771187ee6
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-14.2.1-fortify.patch
@@ -0,0 +1,19 @@
+
+Erlang 14B01 (aka 14.2.1 in Gentoo) fails with 64bit arches and FORTIFY_SOURCE=2 or greater, consisting of a buffer overflow warning.
+
+Upstream report: http://www.erlang.org/cgi-bin/ezmlm-cgi?2:mss:2135:bdnooaggpdnbokaboakj
+Taken from PLD Linux: http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/erlang/erlang-fortify.patch
+
+http://bugs.gentoo.org/show_bug.cgi?id=348559
+
+--- otp_src_R14B01/erts/emulator/drivers/common/efile_drv.c
++++ otp_src_R14B01/erts/emulator/drivers/common/efile_drv.c
+@@ -174,7 +174,7 @@
+ 
+ #else
+ #  define FILENAME_BYTELEN(Str) strlen(Str)
+-#  define FILENAME_COPY(To,From) strcpy(To,From) 
++#  define FILENAME_COPY(To,From) memcpy(To,From,strlen(From)+1)
+ #  define FILENAME_CHARSIZE 1
+ #endif
+