Fixed stack struct overflow (bug #343577 by Diego Elio Pettenò).

Package-Manager: portage-2.2.0_alpha191_p33/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

5 files changed, 146 insertions, 9 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index be9bfb190590..219862e99e1c 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/dosemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.58 2013/08/05 09:55:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.59 2013/08/05 10:24:20 slyfox Exp $
+
+*dosemu-1.4.1_pre20130107-r3 (05 Aug 2013)
+
+  05 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +dosemu-1.4.1_pre20130107-r3.ebuild,
+  +files/dosemu-1.4.1_pre20130107-fortify.patch,
+  dosemu-1.4.1_pre20130107-r2.ebuild:
+  Fixed stack struct overflow (bug #343577 by Diego Elio Pettenò).
 
   05 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org>
   dosemu-1.4.1_pre20130107-r2.ebuild:
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 57d974f56d00..f51d779ca643 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX dosemu-1.3.4-shm.diff 394 SHA256 2c0091f53f97c55ad9624ccaae91c21ef5245066c8dba5e612ad9f5309694ab7 SHA512 b189f113a32931c1e8d95df3bf300802c3f3d503be029899c5936c664e61600a67881235b55a2c047bdc3cb8f096d31e84ee6fbb4f28871de184c0d23328e99d WHIRLPOOL e2f16aafbae8049848ddc36ea2258e87fb679b12c4beb6c3297e1be109cac8daecf4d6e6124ba6e5fd2f21fab046b485dc158666a95de88334c3b07bdcc1b255
 AUX dosemu-1.4.0.1-gcc433.diff 346 SHA256 000225ce7198fb8d799fa49e5e8262b000e37a2a4557a5cc01e2b63dc30f6e7b SHA512 325488028bf6490fcbaf38d7c6b7d39b853777f995659d31d17c5c0659e472a25d004d296d0e244e673d3eb1671914045657bd89250d411ae8ae85fbb303b84e WHIRLPOOL 542a31f2ae75de903d3380b459689cff404d768f77e2e8a5fb26f013d9fd9f1b78feb948f5ae910558d9689a46d081f6687e0399ba53d0ebdef7e4f133fb9440
 AUX dosemu-1.4.1_pre20091009-flex.patch 1225 SHA256 ee49be4ef83463bf619ea8143d3d6405fd4ee74abdb1a1af8ff90cd1b23d315b SHA512 46698fa76bf34db5fd39a1bd14670022faec0146c39e7c1ba61a1899880f1ea8521b771cb7d6174b34b61869fd35926f4eb28b6a84079fac8e8a83368ddc2b4f WHIRLPOOL cd9ce575f7c1836249c7d6c52eb4a4a3a8895f2f928f7a64ce9ddb79350e65587b11692cbc6a91726e5fcbbcfa26dd7a7f183e5cfb61ac483c42e3e32c6f6ee0
+AUX dosemu-1.4.1_pre20130107-fortify.patch 1961 SHA256 fdb67267e5fc45de64567605078a29738ad507a16716ae0d77a70a1815166790 SHA512 90a5dbc6b00d2b13086c15997cf056e1a54721518a76a85425c7adb6d859782e26391c28386e847fd914a01f0c243615c21c1317a58c19ed9603133e0256971a WHIRLPOOL 62bbfb3de8d26101b220757af27d1c80c0401e270aaf545b2be9fe0002d38062b81517e49a809b88bfb3e82e14691c0693f556b272c630a05e59e2bdf4dd93d5
 DIST dosemu-1.4.0.tgz 2295595 SHA256 fc92f77186498e9fd13882748a764df863f118d4cfaffab39cea564178e53f50 SHA512 fdeb48c9d2051eed101919dbf7e9c698c6035770e94bb3b77cf2addf55373526f573ee48cfdac48b263281169c6ae5c44c811e53cd1865614c10c551e12a6794 WHIRLPOOL b41225ec09035ad513cf18ddc69f8459607ffba012ecff73603ecda1f672f02acab07ebee48e7d802e8d4c74d65c1f81c6d09640f130766ff977c01a9a25c3a2
 DIST dosemu-1.4.1_pre20091009.tar.bz2 1965194 SHA256 bf57f3a567008892fcaf0a58f69aae37a4b251f08855968958fa8fc6c06b1d4b SHA512 45aa0fff97f11270a50f9d5f10ec0be137e585c33a163e2b3318e924fe60f6aff90433fa52e90a5f8f9f1557b69720c4750ea685f3f72b644345021a01efc6ae WHIRLPOOL 607a1f92a60f31540d9e7e4033ef913d115a1e2f0a578e4083f8b55c2d0144352fe9f04273dfe953f80ad7bf38dab901dc6b7a4fce2ea3b0676329837b2719cb
 DIST dosemu-1.4.1_pre20130107.zip 2767256 SHA256 072e1d8ea9c574b02e556d926a287c9c55b82384ed652bb8dd6f3488801901aa SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864 WHIRLPOOL d2835f82515e40d3c85c1ee53c7add5ba055637864ee63997ec912f53862006e33b4139a253b98cb76ca3cdbd7bdca6614609d9e8e716b074283e77cd8105e3c
@@ -11,14 +12,15 @@ DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268e
 DIST patch-1.4.0.1.gz 69968 SHA256 e581715732421a5f2c6744a6fbeae7055fbdc319eaf8677e1739990ed3f06b66 SHA512 b6b06b2b253c3fcca55b00a995a7a35eb8d4b1ba7e0a6d2517882ef89905206a446b1fadec8ef299fb2bc8b828c640e3172e5667c099027bd5e5dc15482c5d9b WHIRLPOOL 1567326c005c7ae967df6c75f064da822fb413609b907659262b3b7a871201cd7d6c71f6c1f8dc2a01290ea1ba797816041fcdc94bbecf5520857a6402232113
 EBUILD dosemu-1.4.0.1.ebuild 1623 SHA256 b44ec6af54d141980f5df0ede0a3e0fd6f0a71e1fb0329db8913dfff13d626a8 SHA512 18137c6ff60146c1bd6705febfed709379e6fbfe6dc58a15766e4d63bf9171d4ebd703151ba552f22b099bafd36f901a7ffd154eef1c12f1de1ad61e4e79be5b WHIRLPOOL c130dbbdc804143dd35cf4a9a5584c1bf52355aa9ab4913212f6a65b50529b4d7e1906d24ca43b1d21db172adffdd7fa9a8efdfee41fed6088b6753b65bd3351
 EBUILD dosemu-1.4.1_pre20091009.ebuild 1549 SHA256 a59ac809f3cf04d24704814e07ecc820fb81e14e0fda69d3881420e6cf6df97e SHA512 2d544901681f7423e239c3364d29135888ac0a6dc9c116bdafa564e46ded80f964ca7be84e2d4fa4ccd7f975274bb16a9a2de670305d04e77e736b4e2a73c414 WHIRLPOOL b9c23a187b024a839b9b48168630ef65c1b68596284b15d55d785c9735d2abbce29ab61c4caa7a8d545a07f6ca3bf76960ab2236d1c4a53260c709a33612c58e
-EBUILD dosemu-1.4.1_pre20130107-r2.ebuild 2054 SHA256 fec70f4818b2f082b1e02ea9d946abba4730aa08f149150e3ce48ce310742693 SHA512 e8104d7a7276ebe2c31402bf4d2ed0dde517a8a2f1ee4bd6378f0c110862d52bde39e2c94194bafc59bd04f4d1f54d5524d97b65c7fb9538785e19e3518cbeb2 WHIRLPOOL d88bb579b9ad81b3c2267c017ed11dad07489a2e62079f7f392c271633a24557d98adf85b8ffb3828983fcd0dde732fc5840a9fd88893629c1cfc9e1d3ebe95e
+EBUILD dosemu-1.4.1_pre20130107-r2.ebuild 2103 SHA256 e419670c72550ea0b4734e1c0733fb150f41d89691d9a0cc0ed2f0aa01afc91e SHA512 a92ab9354931a17491306929cf43a96835c977c6ebdf07ba24da249b56b14d3e341417307d1cc6b8c1f594e76ec427827b2176c37eb50439bca5d892a0fa99cf WHIRLPOOL 3fd0b5e88d9c8efc11040c53dc82b478ec07aea461867b96f2a6429a8f85b1c4a768b66a526bf7c935db794790a63f1baa8d21cecb89ad4ce345c170d8b3c105
+EBUILD dosemu-1.4.1_pre20130107-r3.ebuild 2103 SHA256 0dfe5c86ec2747c341e0e7f0318bdd1d0f5b9e1cce2f5b7177720ce35208ff13 SHA512 a303ba6fc40831af099f394e725fc7495b088209e331f8fc984763c6b2bf69bd60ff174b2967d2033234e7a264805eb8448df66c220b30fae36460816a75d729 WHIRLPOOL 71bbd2f6b317a078b742f464edd884beb202ab5a408de8bfb77db4ab477cacf3349eea0768b6a1525e46320daeb161eb9c7a9edff540d09077a7d5d2b3989762
 EBUILD dosemu-1.4.1_pre20130107.ebuild 1636 SHA256 73e86612ae6a334f094606cf878fdc4e13c122bda0ac133bdc94c687bf73d868 SHA512 4c7d5be4203da20f5664a7c09afc2009c6d23500a032504eee2918400e3335984d2d7e2eb84720595ef96605c8abf601fd46e0ea1862ebb53404d3cf6744fa6a WHIRLPOOL aff03e1a463d81ff405f43c0a2b3b029cc3bbe68bf13d960cb4f91b8b3a752a469d1c7dab946a8dbf748f79fb00a502f410a327f95c2f8b53fb48826bab5c7a1
-MISC ChangeLog 8231 SHA256 dd4c4ba3a6faf9f15cc6c03e3435ed47ac1acb88ad1b31ceaa795a9239605972 SHA512 f1d1a4ebe877c31a35af986d267325c2137d2bf878cd26acc21a976ebec4d38818c4e6608c43ce9df611e6d1977ce3d7e5aae4349a59d1d4fa3df14c9e51b727 WHIRLPOOL 42467625acb40026ad38a8206a8883f9f5858e01c7f65d6187838785f0ef181de2318a338b0d785c7bfc6cdd67f401cbfc3d62186b66abfa07b9fc7d0efc2e33
+MISC ChangeLog 8524 SHA256 6a64190caef477d3266f9e4634fc29a8ad0254769ee2a38f47d22a9a9c1c54cf SHA512 fa915049aac1348a8a47fe493bedf7d69b8251758e236b7e9fe281df353e483c627da2b41116adfa0859d8019a938ed34adf1ede2b0101e2a00cb33b0ed018da WHIRLPOOL f4381984f53015c2342c38e48d52ad4c20a03f5a5bca04df8430b1d83a9298f4580fde643394a554a8c92254537318e7cbef56fc8147719b140ea2d3e0e6471c
 MISC metadata.xml 401 SHA256 eb9ea49d2195e37b44eaf175a027aee38822146d6d70b1904d38313340a1ea25 SHA512 69b23927daeaa01cdb3a37cf389a355022d2bb799e8c67c583137b113a46ee617523427e9cf48ed53c1fd4ad51db00aac9be11da2353c99b6f56e7674df94936 WHIRLPOOL 29161f429054e7fe17a07b1f91149b62f1709bbc9a2dd21d21f5c36442e2db0cce12f4a882bb7d9567c42beb3a4003af9f1d8dea1a0efdc03483c79fd154a6d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH/docACgkQcaHudmEf86pgjQCeMQso+EeS+1h6CNGbAtGcGNP1
-eoEAnRDePnGH5B2+Tijj3E3VcNP20NH3
-=fIwj
+iEYEAREIAAYFAlH/fKcACgkQcaHudmEf86phmQCfdblwOoiTWKqCx61FG2C2ecqn
+bB0AnjESnLgK95QKuNCx7WhZDSuA6I06
+=WVa7
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild
index b068ede308f5..103e7a29716a 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild,v 1.2 2013/08/05 09:55:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r2.ebuild,v 1.3 2013/08/05 10:24:20 slyfox Exp $
 
 EAPI=5
 
-inherit flag-o-matic pax-utils
+inherit eutils flag-o-matic pax-utils
 
 P_FD="dosemu-freedos-1.0-bin"
 COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}-code-${COMMIT}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fortify.patch
+
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2
 
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
new file mode 100644
index 000000000000..3d39079201a8
--- /dev/null
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild,v 1.1 2013/08/05 10:24:20 slyfox Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic pax-utils
+
+P_FD="dosemu-freedos-1.0-bin"
+COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
+
+DESCRIPTION="DOS Emulator"
+HOMEPAGE="http://www.dosemu.org/"
+SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
+	http://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X svga gpm debug alsa sndfile fluidsynth"
+
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXxf86vm
+		x11-libs/libXau
+		x11-libs/libXext
+		x11-libs/libXdmcp
+		x11-apps/xset
+		x11-apps/xlsfonts
+		x11-apps/bdftopcf
+		x11-apps/mkfontdir )
+	svga? ( media-libs/svgalib )
+	gpm? ( sys-libs/gpm )
+	alsa? ( media-libs/alsa-lib )
+	sndfile? ( media-libs/libsndfile )
+	fluidsynth? ( media-sound/fluidsynth
+		media-sound/fluid-soundfont )
+	media-libs/libsdl
+	>=sys-libs/slang-1.4"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xf86dgaproto )
+	>=sys-devel/autoconf-2.57"
+
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fortify.patch
+
+	# Has problems with -O3 on some systems
+	replace-flags -O[3-9] -O2
+
+	# This one is from media-sound/fluid-soundfont (bug #479534)
+	sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\
+		-i src/plugin/fluidsynth/mid_o_flus.c || die
+}
+
+src_configure() {
+	econf $(use_with X x) \
+		$(use_with svga svgalib) \
+		$(use_enable debug) \
+		$(use_with gpm) \
+		$(use_with alsa) \
+		$(use_with sndfile) \
+		$(use_with fluidsynth) \
+		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
+		--sysconfdir="${EPREFIX}"/etc/dosemu/ \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	# r - randmmap: dosemu tries to get address mapping
+	#     exactly where asked, loops otherwise.
+	# m - allow RWX mapping: as it's an emulator / code loader
+	pax-mark -mr "${ED}/usr/bin/dosemu.bin"
+}
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fortify.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fortify.patch
new file mode 100644
index 000000000000..5daa4e9fee41
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fortify.patch
@@ -0,0 +1,48 @@
+From ff9bea065f4cc6068dcb8d6ea9423105305ca590 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 5 Aug 2013 13:03:21 +0300
+Subject: [PATCH] src/tools/tools86.c: fix stack buffer overflow in
+ 'change_aout'
+
+Detected by gcc:
+
+gcc -std=gnu99 -c -MP -MMD -I../../src/include -I../../src/plugin/include  -Wall -Wstrict-prototypes -Wmissing-declarations -Wnested-externs  -fno-strict-aliasing -pipe -O2 -fomit-frame-pointer -o tools86.o tools86.c
+In file included from /usr/include/stdio.h:937:0,
+ from tools86.c:98:
+ In function 'fread',
+     inlined from 'change_aout.constprop.1' at tools86.c:174:12,
+         inlined from 'main' at tools86.c:391:18:
+         /usr/include/bits/stdio2.h:293:2: warning: call to '__fread_chk_warn' declared with attribute warning: fread called with bigger size * nmemb than length of destination buffer [enabled by default]
+           return __fread_chk_warn (__ptr, __bos0 (__ptr), __size, __n, __stream);
+             ^
+Gentoo-bug: http://bugs.gentoo.org/343577
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/tools/tools86.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/tools86.c b/src/tools/tools86.c
+index 141610d..35a0b96 100644
+--- a/src/tools/tools86.c
++++ b/src/tools/tools86.c
+@@ -137,7 +137,7 @@ struct bsd_header {            /* a.out header */
+ #endif
+ 
+ #ifdef __linux__
+-static int header_ld86out_to_gnuasout(struct bsd_header *bsd, struct gnu_header *gnu)
++static int header_ld86out_to_gnuasout(const struct bsd_header *bsd, struct gnu_header *gnu)
+ {
+   if (bsd->a_magic[0] != 0x01 || bsd->a_magic[1] != 0x03 ||
+       bsd->a_flags != 0x00 || bsd->a_cpu != 0x10) return -1;
+@@ -171,7 +171,7 @@ static int change_aout(char *objfile, int update_symtable)
+     return errno;
+   }
+ #ifdef __linux__
+-  if (fread(&bsd,sizeof(gnu),1,f) != 1 ) {
++  if (fread(&bsd,sizeof(bsd),1,f) != 1 ) {
+     fclose(f);
+     return -1;
+   }
+-- 
+1.8.3.2
+