Fix for bug #312697, bad gnulib's spawn.

Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386

4 files changed, 76 insertions, 4 deletions

diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index cd0285508fa2..c937345f15a1 100644
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/bison
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.81 2010/04/04 17:16:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.82 2010/04/04 20:01:31 the_paya Exp $
+
+  04 Apr 2010; Javier Villavicencio <the_paya@gentoo.org>
+  bison-2.4.2.ebuild, +files/bison-2.4.2-gnulib_spawn.patch:
+  Add patch to fix gnulib's spawn, fixes bug #312697.
 
   04 Apr 2010; Markos Chandras <hwoarang@gentoo.org> bison-2.4.1.ebuild:
   Stable on amd64 wrt bug #311867
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 9cc203d36148..7487483ca022 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,5 +1,6 @@
 AUX bison-1.32-extfix.patch 1170 RMD160 41daa5ee80712e419a15233af15efbd174ac1adf SHA1 a7cab61f53ca9d9d97b99c8687df1f092e1c1dbc SHA256 a47285e1b6f1ee53b8def53380068ad6a86ccd09e3338481f6d3d14c7e8b31c4
 AUX bison-2.4-compat.patch 5896 RMD160 05f2e2db641baa2b24352e41e07bc116e05499e9 SHA1 98fea4f2a470bd65d0b29001fb35d1632c6156fe SHA256 7228583e34f08e643269161a073aa5e0d3a8157bf8f043ca3ad62542d1cdd425
+AUX bison-2.4.2-gnulib_spawn.patch 2667 RMD160 14cc23973b695702f61cf3c69dc492cb81cb193b SHA1 eeb124b49a9ae10e11cfaa0ec2fc073a80c07ea5 SHA256 3ad044de9d80449859a73d805accc2481c362c5bce6421f7336509f02e1ee39d
 DIST bison-1.875d.tar.bz2 882745 RMD160 37ab2ea1df81021c481625794938dcdacc09e4d2 SHA1 cf17c4f2df1344ee93bcc5c336f691db831d1ab5 SHA256 37ff8d673e35838c195d614bc402573d1268c997796e79b831053f4a22e03808
 DIST bison-2.3.tar.bz2 1080319 RMD160 c6a116d6b763fad3f4df6e303943e09ed080cb26 SHA1 7e489f35c6d8171f0cb0cad3dda0fb39f2cb0b62 SHA256 b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb
 DIST bison-2.4.1.tar.bz2 1467784 RMD160 d194a6e0f586cab2aab137d215d0138336be367c SHA1 fc96b28ee4a6a914b18cb1eddb68177d94b83361 SHA256 2354469782149e36c644ae7c3e5105895424ed21cda5c05b591cb3dc17068e6b
@@ -9,6 +10,6 @@ EBUILD bison-1.875d.ebuild 1782 RMD160 115959d78930a7c4638a16bee4eb48d7e1a92a0a
 EBUILD bison-2.3.ebuild 1070 RMD160 262d2d880834c4c24d86c7494abeb7ce1d363765 SHA1 3c17f2e23a60f63163bbb42ed018c8efa3c6ed9a SHA256 b761b01f372481b62c509f19f290d0be1993cba741e840b92757aebdcb7bfe36
 EBUILD bison-2.4-r1.ebuild 1418 RMD160 8860f76bbb96bc7ff32f539e59d9a75d1dbfaa98 SHA1 c801623fb7f32757d3152e86959a364799662d31 SHA256 9a3d9dc946e58521acbe13edd757835e717890c90c778b79b59f6956b7ef8cdb
 EBUILD bison-2.4.1.ebuild 1129 RMD160 84e5d00d46bbc74d33a1629446da074e2eb4b5ac SHA1 c6eb51bcfa426757c3917442b6ff3c1cafd194ff SHA256 8cb83129b9843b9ff19e2cc8d3e37f6884885613d593c2323f28135068f83d27
-EBUILD bison-2.4.2.ebuild 1129 RMD160 73b70d0096fc0d59da75b3dc6a58bc8d939138e8 SHA1 8a31af0606f7f1ab487ccbcc6ebb13897a3a0b7a SHA256 40dbeb491ca8ce712b2d4d7df992e3bdb451f044884e0ad9d69f135c0b461147
-MISC ChangeLog 11074 RMD160 b4e4d7de748681714f9e947094a8617008ce95f2 SHA1 3b967b2918577cda1c46f2454de3ce07bebcde1e SHA256 f093596f659af1e47d899004a7a0e47667858d4283b9f6740df2c3c02bd8d503
+EBUILD bison-2.4.2.ebuild 1235 RMD160 0806736821d0d32ae7fe240f9eb3623cc635e587 SHA1 c30fa90058f2f5ff0f2e2de2f0cd019d6990cd76 SHA256 b7689f87732960876eae0756c395a25fc5fdac0bcdf7e0334accda61aff7c708
+MISC ChangeLog 11248 RMD160 19785605a045b8fcce36109f6d6977acbfc715f5 SHA1 2044a963fdc9d694afa83d853f5918364bf99f49 SHA256 a6cd4b9413b9f9d5aa22d29d8bf32203af346c4570164c8c95c355818c3948e7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-devel/bison/bison-2.4.2.ebuild b/sys-devel/bison/bison-2.4.2.ebuild
index 0de2f479cd0d..981214b7b271 100644
--- a/sys-devel/bison/bison-2.4.2.ebuild
+++ b/sys-devel/bison/bison-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.4.2.ebuild,v 1.1 2010/03/29 04:58:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.4.2.ebuild,v 1.2 2010/04/04 20:01:31 the_paya Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -16,6 +16,12 @@ IUSE="nls static"
 DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="sys-devel/m4"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.4.2-gnulib_spawn.patch # 312697
+}
+
 src_compile() {
 	use static && append-ldflags -static
 	econf $(use_enable nls)
diff --git a/sys-devel/bison/files/bison-2.4.2-gnulib_spawn.patch b/sys-devel/bison/files/bison-2.4.2-gnulib_spawn.patch
new file mode 100644
index 000000000000..b72409f2bc3e
--- /dev/null
+++ b/sys-devel/bison/files/bison-2.4.2-gnulib_spawn.patch
@@ -0,0 +1,61 @@
+Don't override the system defined values on FreeBSD >=8.
+See Gentoo bugs #310335 and #312697.
+(Shortened) patch from upstream gnulib.
+
+--- bison-2.4.2/lib/spawn.in.h
++++ bison/lib/spawn.in.h
+@@ -110,26 +112,38 @@
+ 
+ 
+ /* Flags to be set in the `posix_spawnattr_t'.  */
+-#if @REPLACE_POSIX_SPAWN@
++#if @HAVE_POSIX_SPAWN@
++/* Use the values from the system, but provide the missing ones.  */
++# ifndef POSIX_SPAWN_SETSCHEDPARAM
++#  define POSIX_SPAWN_SETSCHEDPARAM 0
++# endif
++# ifndef POSIX_SPAWN_SETSCHEDULER
++#  define POSIX_SPAWN_SETSCHEDULER 0
++# endif
++#else
++# if @REPLACE_POSIX_SPAWN@
+ /* Use the values from the system, for better compatibility.  */
+ /* But this implementation does not support AIX extensions.  */
+-# undef POSIX_SPAWN_FORK_HANDLERS
+-#else
+-# define POSIX_SPAWN_RESETIDS           0x01
+-# define POSIX_SPAWN_SETPGROUP          0x02
+-# define POSIX_SPAWN_SETSIGDEF          0x04
+-# define POSIX_SPAWN_SETSIGMASK         0x08
+-# define POSIX_SPAWN_SETSCHEDPARAM      0x10
+-# define POSIX_SPAWN_SETSCHEDULER       0x20
++#  undef POSIX_SPAWN_FORK_HANDLERS
++# else
++#  define POSIX_SPAWN_RESETIDS           0x01
++#  define POSIX_SPAWN_SETPGROUP          0x02
++#  define POSIX_SPAWN_SETSIGDEF          0x04
++#  define POSIX_SPAWN_SETSIGMASK         0x08
++#  define POSIX_SPAWN_SETSCHEDPARAM      0x10
++#  define POSIX_SPAWN_SETSCHEDULER       0x20
++# endif
+ #endif
+ /* A GNU extension.  Use the next free bit position.  */
+ #define POSIX_SPAWN_USEVFORK \
+-  ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1)                   \
+-    | POSIX_SPAWN_SETPGROUP | (POSIX_SPAWN_SETPGROUP - 1)               \
+-    | POSIX_SPAWN_SETSIGDEF | (POSIX_SPAWN_SETSIGDEF - 1)               \
+-    | POSIX_SPAWN_SETSIGMASK | (POSIX_SPAWN_SETSIGMASK - 1)             \
+-    | POSIX_SPAWN_SETSCHEDPARAM | (POSIX_SPAWN_SETSCHEDPARAM - 1)       \
+-    | POSIX_SPAWN_SETSCHEDULER | (POSIX_SPAWN_SETSCHEDULER - 1))        \
++  ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1)                     \
++    | POSIX_SPAWN_SETPGROUP | (POSIX_SPAWN_SETPGROUP - 1)                 \
++    | POSIX_SPAWN_SETSIGDEF | (POSIX_SPAWN_SETSIGDEF - 1)                 \
++    | POSIX_SPAWN_SETSIGMASK | (POSIX_SPAWN_SETSIGMASK - 1)               \
++    | POSIX_SPAWN_SETSCHEDPARAM                                           \
++    | (POSIX_SPAWN_SETSCHEDPARAM > 0 ? POSIX_SPAWN_SETSCHEDPARAM - 1 : 0) \
++    | POSIX_SPAWN_SETSCHEDULER                                            \
++    | (POSIX_SPAWN_SETSCHEDULER > 0 ? POSIX_SPAWN_SETSCHEDULER - 1 : 0))  \
+    + 1)
+ typedef int verify_POSIX_SPAWN_USEVFORK_no_overlap
+             [2 * (((POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP
+