Ensure fli thread structs are maintained when running in a sandbox.

(Portage version: 2.1.2-r11)

5 files changed, 23 insertions, 4 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index f29db1de5da1..cc9733e3216a 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.67 2007/02/25 04:31:02 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.68 2007/02/26 07:42:26 keri Exp $
+
+  26 Feb 2007; keri <keri@gentoo.org>
+  +files/swi-prolog-thread-sandbox.patch, swi-prolog-5.6.25.ebuild,
+  swi-prolog-5.6.27.ebuild, swi-prolog-5.6.28.ebuild:
+  Ensure fli thread structs are maintained when running in a sandbox.
 
   25 Feb 2007; keri <keri@gentoo.org> +files/swi-prolog-set_prolog_IO.patch,
   swi-prolog-5.6.28.ebuild:
diff --git a/dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch b/dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch
new file mode 100644
index 000000000000..eaf86dace88b
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch
@@ -0,0 +1,11 @@
+--- pl-5.6.25.orig/src/pl-thread.c	2006-11-02 03:27:21.000000000 +1300
++++ pl-5.6.25/src/pl-thread.c	2007-02-26 20:16:26.000000000 +1300
+@@ -1004,7 +1004,7 @@
+     PL_register_atom(ldnew->prompt.first);
+   }
+   ldnew->modules		 = LD->modules;
+-  ldnew->IO			 = LD->IO;
++  memcpy(&(ldnew->IO), &(LD->IO), sizeof(LD->IO));
+   ldnew->_fileerrors		 = LD->_fileerrors;
+   ldnew->float_format		 = LD->float_format;
+   ldnew->encoding		 = LD->encoding;
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
index 0196d653aa50..d193070a6fb7 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.6 2007/02/23 22:03:15 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.7 2007/02/26 07:42:26 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -53,6 +53,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-ssl-cert.patch
 	epatch "${FILESDIR}"/${PN}-ssl-SIO_FLUSHOUTPUT.patch
+	epatch "${FILESDIR}"/${PN}-thread-sandbox.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
 	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
index 9972f6df7f80..5269447ec91b 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.4 2007/02/23 22:03:15 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.5 2007/02/26 07:42:26 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
 	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-ssl-cert.patch
+	epatch "${FILESDIR}"/${PN}-thread-sandbox.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
 	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild
index 733cc16482f6..f4a1ddc89dac 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.6 2007/02/25 04:31:02 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.7 2007/02/26 07:42:26 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -53,6 +53,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-ssl-cert.patch
 	epatch "${FILESDIR}"/${PN}-set_prolog_IO.patch
+	epatch "${FILESDIR}"/${PN}-thread-sandbox.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
 	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch