Add a fix for bug #245254.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27 x86_64

4 files changed, 47 insertions, 8 deletions

diff --git a/sys-apps/v86d/ChangeLog b/sys-apps/v86d/ChangeLog
index 9035919051d2..52bb4733c0be 100644
--- a/sys-apps/v86d/ChangeLog
+++ b/sys-apps/v86d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/v86d
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.28 2008/10/18 17:27:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.29 2008/11/03 23:38:43 spock Exp $
+
+  03 Nov 2008; Michał Januszewski <spock@gentoo.org>
+  +files/v86d-0.1.9-prot_write.patch, v86d-0.1.9.ebuild:
+  Add a fix for bug #245254.
 
   18 Oct 2008; Michał Januszewski <spock@gentoo.org> -v86d-0.1.5.2.ebuild,
   -v86d-0.1.6.ebuild, -v86d-0.1.7.ebuild, -v86d-0.1.8.ebuild:
diff --git a/sys-apps/v86d/Manifest b/sys-apps/v86d/Manifest
index 4418d67e5df8..36ae36717c49 100644
--- a/sys-apps/v86d/Manifest
+++ b/sys-apps/v86d/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX v86d-0.1.8-concurrent-make.patch 1233 RMD160 f1de30dd01c9a5578a013f329a0ea5bbfb2c1cdf SHA1 9488570bf4a3f2765fbcd226980fec655e8b2cb0 SHA256 aac841e238ecd5f38f3da25808ec59ee67266788669d74fd9034cfb32e689754
+AUX v86d-0.1.9-prot_write.patch 1020 RMD160 5cd1a337dbd5316e6ef1e7cb14c024f051bb3272 SHA1 fe63622120c164e5b95d37f347d234bfb5ed28a9 SHA256 faaf65c087887e1c78f6c8c92eed6fa89d87128d5cdff462fbb00081f0a3e4fb
 DIST v86d-0.1.3.tar.bz2 67044 RMD160 717aa7b043979bc9aa3fd702bd656fa9c473dcd8 SHA1 372b20cc10e8435343b05dc197d30721eb3faa61 SHA256 bf0ca221bc5e8a6b06f73a1eb6ae1470ec5b34b987669f7abeb499e6402af3b0
 DIST v86d-0.1.9.tar.bz2 69752 RMD160 e2d9cda4e8b40a5002c8448d1954a06c5fddb3bf SHA1 ca16ae61329847955ca65da3222131866703a02a SHA256 8167dec4ff919cfd73f854bbd3244f05c2b867e014fa8298044ea7cfd66d18a8
 EBUILD v86d-0.1.3-r1.ebuild 1434 RMD160 f7f71ca9878b1b90314704a82f9e21e30befdc81 SHA1 2146a7993ea29eb3489570416097526397bc8e64 SHA256 d27d54dbe5ecc2198232e426ac3d8999fee96c99baf47695c9f6f609f8720589
-EBUILD v86d-0.1.9.ebuild 1298 RMD160 666710fb56d1e7142f7f7923c1f85e38dc0586bf SHA1 b55f2875afbd64b19f7e009570ae511d75aec7a0 SHA256 785d16e7e30b6013b61094ed67d4c4c0d0521348bcc6d37b9b753eb226b591e5
-MISC ChangeLog 3846 RMD160 327528f08da8a0e17785b322e7790d639a411637 SHA1 fb2672ed5c3643403faa0531d0a0862039e6bbce SHA256 a7a91ad07d0d96adc1bab7bec6c58720476469399c59262368a41cc2375085ce
+EBUILD v86d-0.1.9.ebuild 1391 RMD160 9166a721c920e3bb7ca93ac33e396037315558cc SHA1 9a625e1d5f34375a1379b491f1dc7ac46996b3b4 SHA256 b49f5363c5bd62d986dba6ba838f02b9830395402cc2712948c1d2ee0379d058
+MISC ChangeLog 3987 RMD160 677f117f82fd0c0e8853dff4dc4d2dbfdd5d9c2b SHA1 a042c4d11c472d33391ba02f3d57b9d94671d860 SHA256 1a48b792397f6e793e55331150a60bbc4d812c8ab40c874aeeb1c7d4f21d9fe9
 MISC metadata.xml 293 RMD160 baa7275aad4d516d2ca2b2cd73cee55bbfca727a SHA1 485ccf88eeb2a9790eae473b9159ebca4df47826 SHA256 2adac1f8fca7b6ffc89212bebc389e621ba16e16d3185f468a064bb78ef1f6c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj6HH0ACgkQchej4aZK9/fd/wCfXDLcHdNflNf+C3sKveI4ne3K
-k2kAnA9HXok/XcaAqhf7PxwdG5B66vFG
-=hF07
+iEYEARECAAYFAkkPi5kACgkQchej4aZK9/d54QCfWMu7yCoLjlWMSeys4Ves2Cje
+v2wAn2aWou8WAmPclb4+pXPK/VA1QPg4
+=vvfN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/v86d/files/v86d-0.1.9-prot_write.patch b/sys-apps/v86d/files/v86d-0.1.9-prot_write.patch
new file mode 100644
index 000000000000..109c1c731b7b
--- /dev/null
+++ b/sys-apps/v86d/files/v86d-0.1.9-prot_write.patch
@@ -0,0 +1,28 @@
+diff --git a/v86_mem.c b/v86_mem.c
+index 4cedbbe..23eb7c0 100644
+--- a/v86_mem.c
++++ b/v86_mem.c
+@@ -293,7 +293,13 @@ int v86_mem_init(void)
+ 	}
+ 	vbios_size = tmp[2] * 0x200;
+ 	ulog(LOG_DEBUG, "VBIOS at %5x-%5x\n", VBIOS_BASE, VBIOS_BASE + vbios_size - 1);
+-	mem_vbios = map_file(NULL, vbios_size, PROT_READ,
++
++	/*
++	 * The Video BIOS and the System BIOS have to be mapped with PROT_WRITE.
++	 * There is at least one case where mapping them without this flag causes
++	 * a segfault during the emulation: https://bugs.gentoo.org/show_bug.cgi?id=245254
++	 */
++	mem_vbios = map_file(NULL, vbios_size, PROT_READ | PROT_WRITE,
+ 							MAP_SHARED, "/dev/mem", VBIOS_BASE);
+ 
+ 	if (!mem_vbios) {
+@@ -303,7 +309,7 @@ int v86_mem_init(void)
+ 	}
+ 
+ 	/* Map the system BIOS */
+-	mem_sbios = map_file(NULL, SBIOS_SIZE, PROT_READ,
++	mem_sbios = map_file(NULL, SBIOS_SIZE, PROT_READ | PROT_WRITE,
+ 					MAP_SHARED, "/dev/mem", SBIOS_BASE);
+ 	if (!mem_sbios) {
+ 		ulog(LOG_ERR, "Failed to mmap the System BIOS as %5x.", SBIOS_BASE);
diff --git a/sys-apps/v86d/v86d-0.1.9.ebuild b/sys-apps/v86d/v86d-0.1.9.ebuild
index 245308776b0a..8252b76eb366 100644
--- a/sys-apps/v86d/v86d-0.1.9.ebuild
+++ b/sys-apps/v86d/v86d-0.1.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/v86d-0.1.9.ebuild,v 1.2 2008/10/04 09:38:55 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/v86d-0.1.9.ebuild,v 1.3 2008/11/03 23:38:43 spock Exp $
 
-inherit linux-info multilib
+inherit eutils linux-info multilib
 
 DESCRIPTION="A daemon to run x86 code in an emulated environment."
 HOMEPAGE="http://dev.gentoo.org/~spock/projects/uvesafb/"
@@ -27,6 +27,12 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-prot_write.patch"
+}
+
 src_compile() {
 	./configure --with-klibc $(use_with debug) $(use_with x86emu) || die
 	emake KDIR="${KV_DIR}" || die