Backport upstream patch for strncmp usage bug by request from Arfrever Frehtes Taifersar Arahesis. Use EAPI=2. This will effectively kill upgrade path from older systems since it's a depend for dev-lang/python and thus portage. But python ebuilds are newer EAPIs too, so we don't care anymore.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 69 insertions, 2 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 2fa117f79983..99c2599652b2 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.109 2011/01/06 19:52:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.110 2011/02/04 18:40:32 ssuominen Exp $
+
+*libffi-3.0.9-r2 (04 Feb 2011)
+
+  04 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> +libffi-3.0.9-r2.ebuild,
+  +files/libffi-3.0.9-strncmp.patch:
+  Backport upstream patch for strncmp usage bug by request from Arfrever
+  Frehtes Taifersar Arahesis.
 
   06 Jan 2011; Fabian Groffen <grobian@gentoo.org> libffi-3.0.9-r1.ebuild,
   +files/libffi-3.0.9-powerpc64-darwin.patch:
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index b5d9418737bd..67a9a9404073 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -3,8 +3,10 @@ AUX libffi-3.0.9-define-generic-symbols-carefully.patch 1913 RMD160 5e2219a61025
 AUX libffi-3.0.9-interix.patch 2456 RMD160 c7d92621a610ace2730da00f070db8b6b240355b SHA1 85b56c85218fd42d86c3b5ddccad7fb421892589 SHA256 ecf5e44ae756929d0edf9f5c50682e4e23684ff90955ad454fd9cf087c849c8c
 AUX libffi-3.0.9-irix.patch 1516 RMD160 0e7ecd3d857899972733375943bc1268aa92c2d5 SHA1 46ef3e873548761db84ef8738a60c3af45e0164c SHA256 b5b44a871c387e88ee66b27af1ea768342debc3d4b471b4b8665ea9ec2e31bc3
 AUX libffi-3.0.9-powerpc64-darwin.patch 531 RMD160 0eff6b065037c5d2ba3e4aa2575f6291aa427a7d SHA1 c44fbbf616e0735f4675666e2d74b6bb11302b83 SHA256 8b4cbef53013ac1e0e9a977b7b9295a721fe1897730cac6d282b8953581d3df7
+AUX libffi-3.0.9-strncmp.patch 433 RMD160 da46944b5c07db3a931c9f4b6ce022dde5968313 SHA1 99032e2ada8631375d2cc195c9a53c2c918aedef SHA256 27c04f9c5527606d3689f24d4fdd1eb8a689fac5d922965b7704ce6f24bc633c
 DIST libffi-3.0.9.tar.gz 731719 RMD160 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a SHA1 56e41f87780e09d06d279690e53d4ea2c371ea88 SHA256 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452
 EBUILD libffi-3.0.9-r1.ebuild 1361 RMD160 1613c58d115c3f84441fb8527d4c3285a49f1d32 SHA1 ce9f318764eaeedc7d7ac83acb6a910f539ac5ad SHA256 ff664ab0055c64993c0f0f4e562d02fb4d9dd22e354d8e1f3fca6befce5bbd0f
+EBUILD libffi-3.0.9-r2.ebuild 1375 RMD160 3427fbf579ad88f25500a1024a598e68753f9512 SHA1 14919917e3dfaffef83f1e4f6b049c21cb6cb118 SHA256 ee8cb681b7f6a79b48b07615fdfcfd9ff00221e1b2b2eb263c2d09ddaaaac31c
 EBUILD libffi-3.0.9.ebuild 1241 RMD160 65dae7ee8f9e173433b4c03f2e12b735a32918e9 SHA1 99153a28229846f0737a38d28efb9af2a9c9840a SHA256 d2f4ad38e4c2c4010974a1893c72462dde9accc7eecc2532f70076ac5bb63d63
-MISC ChangeLog 14921 RMD160 9c5a09243752fa56a29b2350190f8eda66483b1f SHA1 221b62b78789994df53bf05ec49e849ae90dbf88 SHA256 ea6fad7d0d03a2ba8343fe9ce51807418e5c14e1fe6fd461dcf65e3ccda2b1a5
+MISC ChangeLog 15175 RMD160 1e03109081c7aadcef92e6c6b215624a53618da8 SHA1 5acd36f908921f514f8e891ab00e58a8bf54213d SHA256 8573a7d44e94e56c4d9befdae1900b7be4095f8134b94db432559cd2bdf0bd79
 MISC metadata.xml 1663 RMD160 d2ead0beb5a34033489150623558bbe4e0083516 SHA1 8a54e9af62c01a17431ee8359edbe1d35099d3c3 SHA256 f03f0b55cdf4405ead462ba1c1b8ff2f1b6821c22c3f23d484490f8c875f6073
diff --git a/dev-libs/libffi/files/libffi-3.0.9-strncmp.patch b/dev-libs/libffi/files/libffi-3.0.9-strncmp.patch
new file mode 100644
index 000000000000..a919f2881790
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.0.9-strncmp.patch
@@ -0,0 +1,15 @@
+src/closures.c (selinux_enabled_check): Fix strncmp usage bug.
+
+http://github.com/atgreen/libffi/commit/eaf444eabc4c78703c0f98ac0197b1619c1b1bef
+
+--- src/closures.c
++++ src/closures.c
+@@ -146,7 +146,7 @@
+       p = strchr (p + 1, ' ');
+       if (p == NULL)
+         break;
+-      if (strncmp (p + 1, "selinuxfs ", 10) != 0)
++      if (strncmp (p + 1, "selinuxfs ", 10) == 0)
+         {
+           free (buf);
+           fclose (f);
diff --git a/dev-libs/libffi/libffi-3.0.9-r2.ebuild b/dev-libs/libffi/libffi-3.0.9-r2.ebuild
new file mode 100644
index 000000000000..9b237a1e60b7
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.0.9-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.9-r2.ebuild,v 1.1 2011/02/04 18:40:32 ssuominen Exp $
+
+EAPI=2
+inherit eutils libtool
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions."
+HOMEPAGE="http://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+
+RDEPEND=""
+DEPEND="test? ( dev-util/dejagnu )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-interix.patch \
+		"${FILESDIR}"/${P}-powerpc64-darwin.patch \
+		"${FILESDIR}"/${P}-irix.patch \
+		"${FILESDIR}"/${P}-arm-oabi.patch \
+		"${FILESDIR}"/${P}-define-generic-symbols-carefully.patch \
+		"${FILESDIR}"/${P}-strncmp.patch
+
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog* README
+	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
+}