From 71b769576e7928925293def360f33a372a5a6529 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Mon, 26 Feb 2007 07:42:26 +0000 Subject: [PATCH] Ensure fli thread structs are maintained when running in a sandbox. Package-Manager: portage-2.1.2-r11 --- dev-lang/swi-prolog/ChangeLog | 7 +++- dev-lang/swi-prolog/Manifest | 36 ++++++++++--------- .../files/swi-prolog-thread-sandbox.patch | 11 ++++++ dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild | 3 +- dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild | 3 +- dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild | 3 +- 6 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 dev-lang/swi-prolog/files/swi-prolog-thread-sandbox.patch 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 + +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 +files/swi-prolog-set_prolog_IO.patch, swi-prolog-5.6.28.ebuild: diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 30e62a04539a..a8c47ac56dcd 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -154,6 +154,10 @@ AUX swi-prolog-test_date.patch 4324 RMD160 998a7451af5f0de4a73f7f6497ffa57c012f3 MD5 aaac0d487788ab74f26c127a713923a0 files/swi-prolog-test_date.patch 4324 RMD160 998a7451af5f0de4a73f7f6497ffa57c012f3ee6 files/swi-prolog-test_date.patch 4324 SHA256 0998d9f89e0b84e53efb16a70fdc8c4a7f2ac0f700e9f8502fb53c1d8dd89388 files/swi-prolog-test_date.patch 4324 +AUX swi-prolog-thread-sandbox.patch 446 RMD160 27835ada2b287bd88c348974cd59661f7c7075ba SHA1 7139f8164fe4a775d5a6c231f7c10925ed1034ed SHA256 d3b71cb08cc4bc190f0f2b04241e8bc4fcfa874f45de1c03b6c5e5812374b8b7 +MD5 00285097904eaf962e8990a70df65b37 files/swi-prolog-thread-sandbox.patch 446 +RMD160 27835ada2b287bd88c348974cd59661f7c7075ba files/swi-prolog-thread-sandbox.patch 446 +SHA256 d3b71cb08cc4bc190f0f2b04241e8bc4fcfa874f45de1c03b6c5e5812374b8b7 files/swi-prolog-thread-sandbox.patch 446 AUX swi-prolog-thread-tests-r1.patch 2821 RMD160 0b99d2a1d94b3d974d03ed0040d235854f37dd96 SHA1 dbab7c3cf5d1d514ee6f808e0c703b7c35b2a7ed SHA256 fab16c1c5d1cda97f2f67b6693086870178f4679168a707baa096d58b1087872 MD5 445f1faeb5404dc415e0dc16d457bb6f files/swi-prolog-thread-tests-r1.patch 2821 RMD160 0b99d2a1d94b3d974d03ed0040d235854f37dd96 files/swi-prolog-thread-tests-r1.patch 2821 @@ -221,22 +225,22 @@ EBUILD swi-prolog-5.6.24.ebuild 3442 RMD160 e57b33a2d5e3f911cd5abc5e815191544342 MD5 526d97ded7389423ff88faed8c9aeb91 swi-prolog-5.6.24.ebuild 3442 RMD160 e57b33a2d5e3f911cd5abc5e8151915443426a9f swi-prolog-5.6.24.ebuild 3442 SHA256 05a0ba0adb0321b21ac543124a86fd67719577f03d7308fd47b8ce6254512517 swi-prolog-5.6.24.ebuild 3442 -EBUILD swi-prolog-5.6.25.ebuild 3775 RMD160 2e8e8f9da61adef3e153a64c4681528c177a3411 SHA1 2bdb455c4515c56cce3d7e507279445ebdc9ada3 SHA256 676fd5b53816533034cb8ea0befdfc5e0e06cde6e0f957026fd530d71b2e6987 -MD5 ff321bf567cd31d838e06676f97a8a0a swi-prolog-5.6.25.ebuild 3775 -RMD160 2e8e8f9da61adef3e153a64c4681528c177a3411 swi-prolog-5.6.25.ebuild 3775 -SHA256 676fd5b53816533034cb8ea0befdfc5e0e06cde6e0f957026fd530d71b2e6987 swi-prolog-5.6.25.ebuild 3775 -EBUILD swi-prolog-5.6.27.ebuild 3626 RMD160 8f69edb8f1f827f89326eded518df97aff494a6c SHA1 01bcc1d2c1988b519dd17ef983c1c42a1f73408b SHA256 a33f6bd214218b66970120daf0d7d711d0d796e00d7af14bf96c273174d438a6 -MD5 7c8223ff19ce5ba9e1556dc7b93ad154 swi-prolog-5.6.27.ebuild 3626 -RMD160 8f69edb8f1f827f89326eded518df97aff494a6c swi-prolog-5.6.27.ebuild 3626 -SHA256 a33f6bd214218b66970120daf0d7d711d0d796e00d7af14bf96c273174d438a6 swi-prolog-5.6.27.ebuild 3626 -EBUILD swi-prolog-5.6.28.ebuild 3717 RMD160 7f57fd0d5c3827a15e634fcc8c8215fa8a303b1c SHA1 584ed75b5f1f549de28b08166ed79eac4b36caa0 SHA256 807ad6c1e5211fb0faeb61d8857eda6190479d80efc6368511102d0b03b9fe34 -MD5 c2ca81114a7b9c1f85c98124fb4e1b86 swi-prolog-5.6.28.ebuild 3717 -RMD160 7f57fd0d5c3827a15e634fcc8c8215fa8a303b1c swi-prolog-5.6.28.ebuild 3717 -SHA256 807ad6c1e5211fb0faeb61d8857eda6190479d80efc6368511102d0b03b9fe34 swi-prolog-5.6.28.ebuild 3717 -MISC ChangeLog 13258 RMD160 41adf6a4afc16e1b3c7448b1df59d0567a215fd9 SHA1 493c7812436a24ac45a3b8fd9ced786252fa4412 SHA256 c9dfd61e4f74966258b8ed7627244c2ad588125da7e0c9b8cfdfe8cc67f8dcdd -MD5 07ddb349747e56da06921e406b04b67f ChangeLog 13258 -RMD160 41adf6a4afc16e1b3c7448b1df59d0567a215fd9 ChangeLog 13258 -SHA256 c9dfd61e4f74966258b8ed7627244c2ad588125da7e0c9b8cfdfe8cc67f8dcdd ChangeLog 13258 +EBUILD swi-prolog-5.6.25.ebuild 3824 RMD160 0599077151a7054489adb0ced3121388caeaabaf SHA1 c352bb9c0d2ee32bcd0e2c4c48b5716fc5635425 SHA256 ca7747f32b4d8ddd856b98de041652944626f32e6b161f5af63c14bbc55f9c72 +MD5 522cfb161633ccf3f6b817e3c6ab81d5 swi-prolog-5.6.25.ebuild 3824 +RMD160 0599077151a7054489adb0ced3121388caeaabaf swi-prolog-5.6.25.ebuild 3824 +SHA256 ca7747f32b4d8ddd856b98de041652944626f32e6b161f5af63c14bbc55f9c72 swi-prolog-5.6.25.ebuild 3824 +EBUILD swi-prolog-5.6.27.ebuild 3675 RMD160 91013e7d5e60edf669e3c37791514884a1325f4d SHA1 383668d8535e2945939796fcc39f5b5293a7ed9c SHA256 310da5256e2d95dc778c09d271b0e1208c791ce786467578205e14c711ad21c1 +MD5 b5810801f4e1a46c4db69afc86231b17 swi-prolog-5.6.27.ebuild 3675 +RMD160 91013e7d5e60edf669e3c37791514884a1325f4d swi-prolog-5.6.27.ebuild 3675 +SHA256 310da5256e2d95dc778c09d271b0e1208c791ce786467578205e14c711ad21c1 swi-prolog-5.6.27.ebuild 3675 +EBUILD swi-prolog-5.6.28.ebuild 3766 RMD160 f471047dd8e414cbc344a77f5a4d36841a6e9f32 SHA1 b360d1a4e925a9d1c7de532589611116fa198441 SHA256 8b9e79c9f5aa2614e6d422e4ca03fc2b189743932997fcf83f8c078293a20eb3 +MD5 2ce9dca31f3ec2e7ceef78be0c4f4209 swi-prolog-5.6.28.ebuild 3766 +RMD160 f471047dd8e414cbc344a77f5a4d36841a6e9f32 swi-prolog-5.6.28.ebuild 3766 +SHA256 8b9e79c9f5aa2614e6d422e4ca03fc2b189743932997fcf83f8c078293a20eb3 swi-prolog-5.6.28.ebuild 3766 +MISC ChangeLog 13489 RMD160 a8fdd2233fba53ae7c792708068dce8c5ef735d3 SHA1 4cd02927602d64729fb4494c04f19ff324477b84 SHA256 855e9f7f3f215c1e05239677835df6d470c03dccc2ee49ed9ceadba4dfa3b7ad +MD5 c670269d2588bc1213593a345aa4c7ea ChangeLog 13489 +RMD160 a8fdd2233fba53ae7c792708068dce8c5ef735d3 ChangeLog 13489 +SHA256 855e9f7f3f215c1e05239677835df6d470c03dccc2ee49ed9ceadba4dfa3b7ad ChangeLog 13489 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 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 -- 2.26.2