From: Javier Villavicencio Date: Sun, 28 Mar 2010 10:33:48 +0000 (+0000) Subject: Add patch to fix gnulib's spawn, fixes bug 310335. Keyword again. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f06bc77a0c0d019aec243e3b23bcf8de33498ae;p=gentoo.git Add patch to fix gnulib's spawn, fixes bug 310335. Keyword again. Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386 --- diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog index 30651e46598b..533e5969cd99 100644 --- a/sys-devel/m4/ChangeLog +++ b/sys-devel/m4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/m4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.128 2010/03/20 09:33:26 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.129 2010/03/28 10:33:47 the_paya Exp $ + + 28 Mar 2010; Javier Villavicencio m4-1.4.14.ebuild, + +files/m4-1.4.14-gnulib_spawn.patch: + Add patch to fix gnulib's spawn, fixes bug 310335. Keyword again. 20 Mar 2010; Javier Villavicencio m4-1.4.14.ebuild: Drop *-fbsd keywords see bug 310335 @@ -15,13 +19,13 @@ 01 Apr 2009; Mike Frysinger +m4-1.4.13.ebuild: Version bump. - 17 Mar 2009; Raúl Porcel m4-1.4.12.ebuild: + 17 Mar 2009; Raúl Porcel m4-1.4.12.ebuild: m68k stable wrt #258525, thanks to kolla for testing 24 Feb 2009; Thomas Anderson m4-1.4.12.ebuild: stable amd64, bug 258525 - 14 Feb 2009; Raúl Porcel m4-1.4.12.ebuild: + 14 Feb 2009; Raúl Porcel m4-1.4.12.ebuild: arm/ia64/s390/sh/x86 stable wrt #258525 12 Feb 2009; Brent Baude m4-1.4.12.ebuild: @@ -59,7 +63,7 @@ 11 Apr 2008; Santiago M. Mola m4-1.4.11.ebuild: amd64 stable wrt security bug #217229 - 11 Apr 2008; Raúl Porcel m4-1.4.11.ebuild: + 11 Apr 2008; Raúl Porcel m4-1.4.11.ebuild: alpha/ia64/sparc/x86 stable wrt security #217229 *m4-1.4.10-r3 (07 Apr 2008) @@ -76,10 +80,10 @@ 30 Mar 2008; Santiago M. Mola m4-1.4.10-r1.ebuild: amd64 stable wrt bug #215348 - 30 Mar 2008; Raúl Porcel m4-1.4.10-r1.ebuild: + 30 Mar 2008; Raúl Porcel m4-1.4.10-r1.ebuild: alpha/ia64/sparc stable wrt #215348 - 30 Mar 2008; Dawid Węgliński m4-1.4.10-r1.ebuild: + 30 Mar 2008; Dawid Węgliński m4-1.4.10-r1.ebuild: Stable on x86 (bug #215348) 29 Mar 2008; Brent Baude m4-1.4.10-r1.ebuild: @@ -113,10 +117,10 @@ 11 Oct 2007; Tom Gall m4-1.4.10.ebuild: stable on ppc64, bug #195257 - 10 Oct 2007; Raúl Porcel m4-1.4.10.ebuild: + 10 Oct 2007; Raúl Porcel m4-1.4.10.ebuild: alpha/ia64 stable wrt #195257 - 09 Oct 2007; Dawid Węgliński m4-1.4.10.ebuild: + 09 Oct 2007; Dawid Węgliński m4-1.4.10.ebuild: Stable on x86 for bug 195257 09 Oct 2007; Jeroen Roovers m4-1.4.10.ebuild: @@ -125,7 +129,7 @@ 09 Oct 2007; Jeroen Roovers m4-1.4.10.ebuild: Stable for HPPA (bug #195257). - 14 Jul 2007; Raúl Porcel m4-1.4.10.ebuild: + 14 Jul 2007; Raúl Porcel m4-1.4.10.ebuild: Back to ~arch *m4-1.4.10 (14 Jul 2007) @@ -148,7 +152,7 @@ 26 Jun 2007; Lars Weiler m4-1.4.9.ebuild: Stable on ppc; bug #183253. - 26 Jun 2007; Raúl Porcel m4-1.4.9.ebuild: + 26 Jun 2007; Raúl Porcel m4-1.4.9.ebuild: alpha stable wrt #183253 26 Jun 2007; Christoph Mende m4-1.4.9.ebuild: @@ -160,7 +164,7 @@ 11 May 2007; Joshua Kinard m4-1.4.9.ebuild: Stable on mips. - 24 Apr 2007; Raúl Porcel m4-1.4.9.ebuild: + 24 Apr 2007; Raúl Porcel m4-1.4.9.ebuild: ia64 + x86 stable 17 Apr 2007; Mike Frysinger m4-1.4.9.ebuild: @@ -193,13 +197,13 @@ 24 Mar 2007; Mike Frysinger m4-1.4.9.ebuild: Version bump. - 20 Feb 2007; Alexander H. Færøy m4-1.4.7.ebuild: + 20 Feb 2007; Alexander H. Færøy m4-1.4.7.ebuild: Stable on MIPS; bug #156293 20 Dec 2006; Steve Dibb m4-1.4.7.ebuild: amd64 stable, bug 156293 - 06 Dec 2006; Bryan Østergaard m4-1.4.7.ebuild: + 06 Dec 2006; Bryan Østergaard m4-1.4.7.ebuild: Stable on Alpha. 01 Dec 2006; Markus Rothe m4-1.4.7.ebuild: @@ -226,7 +230,7 @@ m4-1.4.6.ebuild, m4-1.4.7.ebuild: Dropped ppc-macos, see you in prefix. - 01 Nov 2006; Bryan Østergaard m4-1.4.6.ebuild: + 01 Nov 2006; Bryan Østergaard m4-1.4.6.ebuild: Stable on Alpha, bug 149046. 25 Oct 2006; Daniel Gryniewicz m4-1.4.6.ebuild: @@ -263,7 +267,7 @@ 29 Apr 2006; Joshua Kinard m4-1.4.4.ebuild: Marked stable on mips. - 30 Mar 2006; Diego Pettenò m4-1.4.4.ebuild: + 30 Mar 2006; Diego Pettenò m4-1.4.4.ebuild: Add ~x86-fbsd keyword. 19 Mar 2006; Fernando J. Pereda m4-1.4.4.ebuild: diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest index d45728d0c7e3..4adab75b69db 100644 --- a/sys-devel/m4/Manifest +++ b/sys-devel/m4/Manifest @@ -1,8 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX m4-1.4.14-gnulib_spawn.patch 1316 RMD160 ffd509b614c42fb8826ff9a04b9f58c564b8854c SHA1 04402c26d6e685eac0a7f6fdf29fec09dfb5d2ca SHA256 0dbe9373f4844bed1e35ed289ae293d3440421e2d7d1ec92b8c10fcfc4b4fca1 DIST m4-1.4.12.tar.lzma 768167 RMD160 0a510ac65fb0a0005a574b6d1dcf4a86718fd7af SHA1 ea93f11df1098e1ced67255c7a66b817bd29daef SHA256 a5caedee843ad8fc418fb5228da057156134ca4132eb850d1e9a3d7838477f46 DIST m4-1.4.13.tar.bz2 1008418 RMD160 36d624b8a0f27bbf239bb92548d812d879c1039a SHA1 7ba1834ebf96d0520d526c1c9f5764cc869a9f42 SHA256 fcc6fe95e31476dae0fe17a941603c9876cffd0172c8985787388b99a5caec06 DIST m4-1.4.14.tar.bz2 1125670 RMD160 d4145f84b629772d9e5bd8fd893f3633d26071a9 SHA1 f2df9a3db6bb3974f06e5cefe04b9ce3f4bf8b82 SHA256 0885ffa93256353a96b1cf0bcbc4d639ed09953b687e6cc412c4048e656f4dd2 EBUILD m4-1.4.12.ebuild 1134 RMD160 420b49b4173e23cc02ea717354524485fcbfc7d7 SHA1 291cea0647427b5e0debf395e595f1c3f6fbc98f SHA256 553aac4e1daf6011f1871e4782f752418b2807746a2b1204fd0d65a2488f786d EBUILD m4-1.4.13.ebuild 1144 RMD160 86f3851f97c16ea75eb6d78b0051282bf54206e1 SHA1 8698b550896f4f3814cdd44c499a64c25ba3644d SHA256 16fb216f6e146dd7e1c592cf74532f5752a01a168e456a840ae08e3e4168254b -EBUILD m4-1.4.14.ebuild 1124 RMD160 17b723cd981a2eaa4df2abb67ab40bfe2e7c4fc1 SHA1 0b6d68d6e8389a963148d09c68833f2f67eaaad4 SHA256 9920df1ee0cc0b73922fa81f02b3a96b2ecf6f10c2b749df2fa1252d0dac2f4d -MISC ChangeLog 14278 RMD160 76265a6243101769f1c111bce4f6a3176d4d2c1b SHA1 7d88ccec501a9729e0b415004fa77a1d8c969822 SHA256 246506c1789791f235ce4f7fffcc3c8f30189af3c60ae5351012d152112e4a52 +EBUILD m4-1.4.14.ebuild 1267 RMD160 366d63cf624f04e2f423a1f0e97c436a88f4de21 SHA1 44f14afbe3847e3ca7009d1f339945571547d5d8 SHA256 afd4511c474e3ab14ab3f19d01d8c003af4d7e3478b5d83b77d9387bb3255d6b +MISC ChangeLog 14496 RMD160 49c160e78a42e1a4680fe95463c46e974eb3aa47 SHA1 2995f6fc46f1452de6f21097695ca5086bb2c025 SHA256 231c1eaa51824833b038b90725776b024e8c1fca0707b473102afe6ded2e7841 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (FreeBSD) + +iEYEARECAAYFAkuvMJUACgkQgvV6MZSadQqI9ACgxVAGp+Oqcpi/+yQEkXub2b2S +PY4AoIRUEBFjt9H9+Hxuglpk3GEwPFuj +=YP3+ +-----END PGP SIGNATURE----- diff --git a/sys-devel/m4/files/m4-1.4.14-gnulib_spawn.patch b/sys-devel/m4/files/m4-1.4.14-gnulib_spawn.patch new file mode 100644 index 000000000000..ec233328584e --- /dev/null +++ b/sys-devel/m4/files/m4-1.4.14-gnulib_spawn.patch @@ -0,0 +1,36 @@ +Don't override the system defined values on FreeBSD 8. +See Gentoo bug #310335. +Patch from upstream gnulib: +http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=88baa1ed437db0f062e49b87cff59002ec8f7ab2 + +--- m4-1.4.14/lib/spawn.in.h.orig ++++ m4-1.4.14/lib/spawn.in.h +@@ -110,17 +110,19 @@ + + + /* Flags to be set in the `posix_spawnattr_t'. */ +-#if @REPLACE_POSIX_SPAWN@ ++#if !@HAVE_POSIX_SPAWN@ ++# 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 \ diff --git a/sys-devel/m4/m4-1.4.14.ebuild b/sys-devel/m4/m4-1.4.14.ebuild index b129b4e44ca8..32e84292e4fc 100644 --- a/sys-devel/m4/m4-1.4.14.ebuild +++ b/sys-devel/m4/m4-1.4.14.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.14.ebuild,v 1.2 2010/03/20 09:33:26 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.14.ebuild,v 1.3 2010/03/28 10:33:47 the_paya Exp $ + +inherit eutils DESCRIPTION="GNU macro processor" HOMEPAGE="http://www.gnu.org/software/m4/m4.html" @@ -8,13 +10,19 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="examples" # remember: cannot dep on autoconf since it needs us DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )" RDEPEND="" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.4.14-gnulib_spawn.patch # 310335 +} + src_compile() { local myconf="" [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"