diff options
Diffstat (limited to 'dev-libs/libffi')
| -rw-r--r-- | dev-libs/libffi/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/libffi/Manifest | 18 | ||||
| -rw-r--r-- | dev-libs/libffi/files/libffi-3.1-execstack.patch | 11 | ||||
| -rw-r--r-- | dev-libs/libffi/libffi-3.1-r1.ebuild | 57 |
4 files changed, 85 insertions, 9 deletions
diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog index 50158b7a34af..ff062c280c21 100644 --- a/dev-libs/libffi/ChangeLog +++ b/dev-libs/libffi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libffi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.186 2014/05/27 17:14:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.187 2014/05/28 13:29:34 ssuominen Exp $ + +*libffi-3.1-r1 (28 May 2014) + + 28 May 2014; Samuli Suominen <ssuominen@gentoo.org> + +files/libffi-3.1-execstack.patch, +libffi-3.1-r1.ebuild: + Fix execstack in libffi.so.6 wrt #511634 by Anthony Basile and Magnus Granberg 27 May 2014; Samuli Suominen <ssuominen@gentoo.org> -files/libffi-3.0.11-x86-pic-check.patch, -libffi-3.0.11.ebuild, diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index c4f6d3932c77..4b5c40bf60e8 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -2,20 +2,22 @@ Hash: SHA256 AUX libffi-3.0.13-emutramp_pax_proc.patch 911 SHA256 955aa3d87522cb220133fa853bd3a5a7af1fe7cf5cc6b9eb74ffffb9ac563aba SHA512 402712b21feec0f162758adad630ecc588596eaebd2e79bb86802f313e102b8ef6d08eca0580a1aae25dabec3e018c499e2ce1960edc6af9182f67cd8cc9b0e1 WHIRLPOOL 22f76ca6f909c80228958115a8db37fbe5f12e291cdbc1fad672a0903c54a7918e2cee37fdc263e9c350f3c79a7870cc8f7a05789668a8dc87cb8434a6e20f9c +AUX libffi-3.1-execstack.patch 218 SHA256 fe316eeb5a602005978df42d709f34cfb7a2e61499081f2074f55095b33ca541 SHA512 3c020451e6873d6ed45d6126ba6c7581af7b1f1136373b2dbdd05a235a92ccc9e851274e6125d614880dfd9c9d80af9b329be229d06c7094775c5acd96182f95 WHIRLPOOL 69846b8fde104c133f13c67c643053a3b17cd87f8ba9b80897a324e8c9e7bb3611c0583394221d2456b7430d717bf0699d9814fb6acd3ba3fb502270f5914404 DIST libffi-3.0.13.tar.gz 845747 SHA256 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c SHA512 fc47f5d25197c631754efe05a349edb556d072807ecef19b41f17c1a8f39c95221be64926fbd05b1f8439181df1ddff8fc01462ce3a26005b75159ddc27e6f6a WHIRLPOOL d5b14d48a7b35f7349ec938d0deac62db7022ac4d611ab13bc7a6a2766a47e210fc1663fc8c6d7ee48d421c06b66f558010829ac2c215620c76d0bf7650e1308 DIST libffi-3.1.tar.gz 937214 SHA256 97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb SHA512 8994973d75facf5ad928c270e17b1a56e24d1543af75b93731a0048e747df27e4190a736b6dc2dca7d43de1d7e88891220304802c10fcccdcebee9c9ffd3d1b9 WHIRLPOOL 19c08cffd39c998fcd762b1e3767b4fd86915427226833411302bebd2d5bcf93d515e6df4a4cab11327595d3966e46442e457fbe09ae986b58bdfb2bb6adb913 EBUILD libffi-3.0.13-r1.ebuild 2287 SHA256 1dcdf46337f8e607873440179bf0b044d97d3212426141266c98ba944d71d3a9 SHA512 bde4d9f8155bf3997ede4855358004d9adb4423feabac292fc144dd52c159b551dae2cbddd57d640cdbbb1b37e30aa787538accede3087ad460bc61f25942bcf WHIRLPOOL bd249b6b882aa00beb098931fd5fefed9717ee2bfa94c69bc840ce467d32a8a635765d2f6aef71fd35eacc91614b722cb035a24a754c942ed8cad7472165b152 +EBUILD libffi-3.1-r1.ebuild 2130 SHA256 abd210d6c2079afc8187bf3faf39c173cd5de2a600cdb6f612fb42d8465a4644 SHA512 0a93fa840b6e0481e28494c32880d8f91a8eda115d6d460a6b1adccfa8140bc6425d83b1a6523a068ffee07fd2b24d5fba625be53f4b74f3bc182837eae381d7 WHIRLPOOL fa3b4212d8107ba9ccbe1a4313f6a40016ebd136456d400839ddf0eb18eda791e33bd53999d34b59452338dcd2442f5628508d5cf269967b9ebfb8b6a77665ec EBUILD libffi-3.1.ebuild 2076 SHA256 1aea0b48ab15e2308d6be2aa0b6b8a6a91eaef18ddc389d340fbc7917a82bbe0 SHA512 411f34b01dd006726b5f4a16d0f0760729f6f5f533231986576f6672e6fe1bac4aceaafbca1d04a9bc2b67d3bedd677d9add36aded87237874fb884b2fed7d7d WHIRLPOOL e651a392293fa88b6685fd33fe83f679666cc2cf544f9541588c3b4408d870d5f22172d977af7ac5ad08c24008770ed0500d2b8a5375325ee33397b5d61191cc -MISC ChangeLog 25106 SHA256 1af162ac6cd918f66db5e1af02c153989b19cd63af420d85cea7e401c409cb7e SHA512 6ecdfe63c71347f36f1f60fac9b70fb0a82a5bac0566b33ed6e3de68fdaf3458ef18a523f425138b18c98100b149f37591f092af87585f2c20786f5f35ca2dc2 WHIRLPOOL 3efa33ad4d650f9e14bf149c3f819eecb6906d6e4d0619a0c096534d5cfc6d0e22981b28a5945a289b3c4a29922e2ac88e4a4070f348b85466e78e6643cd5c7a +MISC ChangeLog 25332 SHA256 b53ea87502a789634f5091f0df93eaf2adf1f02ba6a98a1cbf118c0c7d11cf85 SHA512 304afc1e7bac604b9a8470a8f2826d5aa46f2a0a2ddd3fd648cc92e74715312dbcc83bcfe5c2341ea9057d51ed09633b4da1d2b4e370dd76f63ed11f0f59b3c6 WHIRLPOOL 610fbee47c5b49508dfce86637139569598c5345d96cebc17fd7346a072c2d535b581994a664fa2cd073bc46880afdf433ef0571b2cdbd2bc81b8cf0da29fdea MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJThMd1AAoJEEdUh39IaPFN/OMH/ijRbt3bRXihkH5qm2a2Bgjp -DKzdSssCVTvVjL7M0P5uPFNFQjQWLCqjDCYtqM5MgAbfFIEUBa4xZaNUrG6zY3lY -lW9ohK4qs/CjatxxCQi3nazzOblqG5iRowlVHwhhZCUGHUodoWehewCV3byOiKAI -BvCwd2WP1MskEV8wI3dg2xC3tskydDarjVYm8BdzAB9DetgzZMwmCfHLyzoO3o+7 -d+7o2N820XKe95xdQsnCIj3p7z1+S1zupeh/3maQHkc70QBLDrIDsQlwirFRhBd4 -gmc3BHHpjPuIQ0fI1HgohNaoPdaEPavuwepvPRTrAqV9Xi1esfqFkuOqRKlu6ig= -=irXQ +iQEcBAEBCAAGBQJTheRTAAoJEEdUh39IaPFNw6gIAJCQgilPI2Ipyx5iuKxMS3NO +YPhIjPKolZ+cYLYBA872Fm6AKV9fpXCUa9yqrsU78LxIJ5YfhwXAfrr/J6FXpWWk +fwXq8ITmBNaH+y6BbV6q5nBZTl4g+RmGSzP51GiOtpL2RstNXh2LbxwN1BkvmJHH +pj9+G+OnVPGQKkGixYhCca2CWJoF0XxVvpZx/0TWvYLYDP0K1h1n4CkszuDWAUfB +XcqfJEJJ8IwXdXmXAdidTWc3XT4RVcrgiEjvG8QdYoCI/oUu6u7WiE+u/kG+XO7S +he+84ULH4VL9XX2vGFU2+9w+9H4JqAOHjD2VhpmNNMp6SuEXX2JkNSeBgKJcf1k= +=KThh -----END PGP SIGNATURE----- diff --git a/dev-libs/libffi/files/libffi-3.1-execstack.patch b/dev-libs/libffi/files/libffi-3.1-execstack.patch new file mode 100644 index 000000000000..3a98d94aa595 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.1-execstack.patch @@ -0,0 +1,11 @@ +http://bugs.gentoo.org/511634 + +--- src/x86/win32.S ++++ src/x86/win32.S +@@ -1304,3 +1304,6 @@ + + #endif /* !_MSC_VER */ + ++#if defined __ELF__ && defined __linux__ ++ .section .note.GNU-stack,"",@progbits ++#endif diff --git a/dev-libs/libffi/libffi-3.1-r1.ebuild b/dev-libs/libffi/libffi-3.1-r1.ebuild new file mode 100644 index 000000000000..0d9ff1060326 --- /dev/null +++ b/dev-libs/libffi/libffi-3.1-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1-r1.ebuild,v 1.1 2014/05/28 13:29:34 ssuominen Exp $ + +EAPI=5 +inherit eutils libtool multilib multilib-minimal toolchain-funcs + +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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug pax_kernel static-libs test" + +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +DEPEND="test? ( dev-util/dejagnu )" + +DOCS="ChangeLog* README" + +ECONF_SOURCE=${S} + +pkg_setup() { + # Check for orphaned libffi, see http://bugs.gentoo.org/354903 for example + if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then + local base="${T}"/conftest + echo 'int main() { }' > "${base}".c + $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null + if [ $? -eq 0 ]; then + eerror "The linker reported linking against -lffi to be working while it shouldn't have." + eerror "This is wrong and you should find and delete the old copy of libffi before continuing." + die "The system is in inconsistent state with unknown libffi installed." + fi + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-execstack.patch #511634 + sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 + epatch_user + elibtoolize +} + +multilib_src_configure() { + use userland_BSD && export HOST="${CHOST}" + econf \ + $(use_enable static-libs static) \ + $(use_enable pax_kernel pax_emutramp) \ + $(use_enable debug) +} + +multilib_src_install_all() { + prune_libtool_files + einstalldocs +} |