Add patch to use /proc for pax mark on libffi 3.0.13 #457194

4 files changed, 42 insertions, 24 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 4b297f0cf5a6..bdfac5e49a0a 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.166 2013/03/28 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.167 2013/05/18 11:47:54 zorry Exp $
+
+  18 May 2013; Magnus Granberg <zorry@gentoo.org> libffi-3.0.13.ebuild,
+  +files/libffi-3.0.13-emutramp_pax_proc.patch:
+  Add patch to use /proc for pax mark on 3.0.13 #457194
 
   28 Mar 2013; Mike Frysinger <vapier@gentoo.org> libffi-3.0.11.ebuild,
   libffi-3.0.12.ebuild, libffi-3.0.13.ebuild:
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 9b430a58b150..5856443b0d45 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,29 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libffi-3.0.11-x86-pic-check.patch 3716 SHA256 247edfe37709f7a0d193169a31a0a8baa730b0d63606ec56928088aadf498c4f SHA512 addbab5c6a9a4701e43443ae438b2fe6cee6c2b5b09b5d40706ca648c311ef9d0d900b9234cfa7872aacb52bee9f499c9d3f8e27af1d983c2f791185fcb028ea WHIRLPOOL 395e3081d5c5b4da7cbbd60689e64459533eb348d8962b59a507f19d3167543b57e4a1ce82b5a979e4709daf7125bc61ef32d0870578951f30a1365745c8613e
+AUX libffi-3.0.13-emutramp_pax_proc.patch 791 SHA256 59254b9d64604896dd613566d4c2cd7bc361ba7ba8fb7af34d5ed6f12bbc36f9 SHA512 87e5f63a964cdfe2578351ef98d6c630f03e01e0ad6ec7016d8b7b3061ae0629677b673ac014b8e4859d471b0b679c4c02302412ccd91c4de66ba60b57ce57e0 WHIRLPOOL 1672ea1da6e4715e0cacabf70d57e274e68935d5c37afbdbff83aebcce6f8c0eecd01c242537ea50a177f412f79217392371e5ad405ad001a1175b2594244f0d
 DIST libffi-3.0.11.tar.gz 794220 SHA256 70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283 SHA512 0049388d16207078a3d6dce97c877f1d9647aa9d908a9372a3f67ca064b70d8c8b23ee458be4a15a6344a5d39ea3e6292be728dfbcc73e1efc0b1db03be874f3 WHIRLPOOL c5ee01a6415b2715a4542d0997e3a7f42cbc97e476589d4e093fcff44315cc83f78a02dc04929c96831309966ac196e6ceb134c8b14cfc02313e139a98e6c11a
 DIST libffi-3.0.12.tar.gz 844641 SHA256 2ea0db90c2bbcc907c3aefc3f76e9dfc3b35c7a0fb75a4319f5248e0172c1e9e SHA512 9ebd5f274aaf007a5f888d3eb3a1652f61f7ff46ea23283a94888b229bcc959fd22904a7101989cd238dfbb10c335129cfa3a947c650dad72522f7fcd0d9c79c WHIRLPOOL d1d2247b3727b4f75006db3bcd4b01dbde2817ea774dadbee30bd8cb4578d01176be089ed6e4bf373587f824fef06ae7fbd1d24f775da7d8f91bb9e753d2580b
 DIST libffi-3.0.13.tar.gz 845747 SHA256 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c SHA512 fc47f5d25197c631754efe05a349edb556d072807ecef19b41f17c1a8f39c95221be64926fbd05b1f8439181df1ddff8fc01462ce3a26005b75159ddc27e6f6a WHIRLPOOL d5b14d48a7b35f7349ec938d0deac62db7022ac4d611ab13bc7a6a2766a47e210fc1663fc8c6d7ee48d421c06b66f558010829ac2c215620c76d0bf7650e1308
 EBUILD libffi-3.0.11.ebuild 2077 SHA256 565af7f1d62cba0a40c56d2180f70ab2373d2729ba1ff29b9800fc26d13f95f5 SHA512 99b841085e12f72f822808b6cc9f10c3d466e188d019a6ebd975c74091cc72a4d075c1e8ee9480d20a54a9db01289fed5fae0f0283761ad2f0c2fc67be7b4813 WHIRLPOOL e2ad88ccce87f83976180c65e5ee564fcf1ce6824393d889751d733768a404eae72dfe6676e960cd1a08d5c5abc69493ad4aa52bf6f214438ab486a5eb19823b
 EBUILD libffi-3.0.12.ebuild 2086 SHA256 dccbca112750c875d512550c5cd563258e4227b0e605337cc3e39376ea7c9cae SHA512 54fd387ebe59d80d1eca707f44d3027377d980a7fbe29c17649755acbcf981684ace657e0aff23b9e0c9b84fece22eef17f686a3ebd6b7d0797db9b98ec9c15d WHIRLPOOL dd92f31a7ae9e9c5c0a8a51c38816ce5d83cc3f46e6c3401d3f9dfa6cba1c9c8662a3a812ba7629d72d187cad81848aa236fe2a02835a5075109e2dde8062917
-EBUILD libffi-3.0.13.ebuild 2034 SHA256 5accb0dc670814ce726025db1698783c3eab33b220cc99fae8c7cb3bf2cd1e80 SHA512 d4b9711d298f73b1632416d274592370e08a9cf8197497977cf0cbcff3a9d1278579091a50ef1a6dd509475290da4d1a00b5847ddb064f7a5428d460b91a0b4e WHIRLPOOL 1a9a74f3512cccbaada03a6db5229b7b6803c28330855fbd2741c4d45e0f380194ddda2d9e7e8e27f5e2365b5b1d9a9f1e3f1de16de7b76a19ec03757a3e5ccb
-MISC ChangeLog 22433 SHA256 97a8e2532d23132d5098f4b7172a2711705d6da9212a8dc29b6e6097ecb27733 SHA512 e7832e7e7d2e731122612185de2af586c46720470a55b5de5678bdd4e1c2c8cc532733fde35a2337f78a029e5f4d9be54f3be3bc82cff04108361a05c2b0702b WHIRLPOOL 908d9dc5d24c063bec2452a690774fafec91c641f28d48e27ecc2f736ae5ed75ecb22dcc02b22c5a10a6cbaa1be87466de4878f11a136dfc56c6bfc23e1180b3
+EBUILD libffi-3.0.13.ebuild 2093 SHA256 48c03805ae8b024eaea835acb077eb3028d3663afa719457cba5c8e341a69244 SHA512 2203210d2f49e83c5381cfd6e58ccf38216efa9f7f30fddb2f3b8209c0c242222d2f9187e2aa32324e4303d8fdc39c2879cd7acaf478bb431f8071e049920075 WHIRLPOOL fedc993bac23a89997877c12fe3f34cd22e5a9e3f9e54b5a4e42fb50ddb96b991e54f1ccb1e9ca516a2b09ab4734868f83aa7dd39d140ac1b3d8415e3cd67f2a
+MISC ChangeLog 22610 SHA256 aaf1562936f7719846b35b622d6cd09ea3d36b802a7ee558042f9ceb87cabac8 SHA512 ac7fffff5a05c34191f7b75567962b04f6f63dd2abbcce9e26706e5225153139be00a606b2eee4acc76632eadd6361818e15d747c57c34f9838b35331c265396 WHIRLPOOL 2ec8069cc05e6fbc7e74d4761b87ee7930ad75079574f7bf6bda10d465cc678e177a829027851ff8237e5a0975c224f0ad8cfc1b9354a571aaee31285c291c20
 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRVNfdAAoJELEHsLL7fEFWAuEQAID1Q/8yZ4Ns7UU2xZxUvNmK
-T8XFIonP0m8DwR2DmrmFUHNQeVlDefEZP/C+Btt8QKpnFojmRkhB379j4pz27/rH
-BW+nI7/434JBcoZ1XoJYEeXetRGYu3VZ6qOY1egpzNeiWHiGGbbpZa8SNQGTPPbs
-2wfXvucpdY/g6CT4O+Bl/4bFg+Mc5V/VxxYnDUtXvct7/faPE2k49iv0mjYGyrSX
-rN9Hi+EA5PfhvWj9Wi2V/XBtQ6ks+Mt+EOI5Krf3J5dYPZRVSpBbyeJapm5vMCMe
-TkIvDSSgOoXV+Nb/6BgjnzHbrwo58bjXeM0NXG5CTNjSRGsg00JF9tp5a+ZTztSS
-O11PhUI4vpImnajn9+7gOel9dJY8AcNEKw5QoIIypPDm7xkV6WvNE/T7PM93f9X/
-ByFTnjkPIZt8QqscKfutOCNn2pDlN2650gr1OTsXfD8gTh4dDJRduWcqTq9PgR28
-uJQFPoOB95ZytkDuU8II/lVx036WjU0CbEGc4BWNH1Ai5TzPaI4Lp6v1KBHdz23U
-kavol53Wf1UA7OKGsAiUFWVQbS7JU9+lNYJFwJFHy4oSxtPuIn8aecNN9IfqTG8T
-gDNN3Rl7mB8lnW6wEFeK82hSwkciC8XVzaJ0pA7DqUeiJhnzIz1bYERRCRr3NLb3
-KlqsWWb9SWvjJUkixwMW
-=Vsfv
------END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch b/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch
new file mode 100644
index 000000000000..eced7fec2118
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch
@@ -0,0 +1,32 @@
+--- a/src/closures.c	2013-03-17 23:27:11.000000000 +0100
++++ b/src/closures.c	2013-04-29 23:26:02.279022022 +0200
+@@ -181,10 +181,26 @@ static int emutramp_enabled = -1;
+ static int
+ emutramp_enabled_check (void)
+ {
+-  if (getenv ("FFI_DISABLE_EMUTRAMP") == NULL)
+-    return 1;
+-  else
++  char *buf = NULL;
++  size_t len = 0;
++  FILE *f;
++  int ret;
++  f = fopen ("/proc/self/status", "r");
++  if (f == NULL)
+     return 0;
++  ret = 0;
++
++  while (getline (&buf, &len, f) != -1)
++    if (!strncmp (buf, "PaX:", 4))
++      {
++        char emutramp;
++        if (sscanf (buf, "%*s %*c%c", &emutramp) == 1)
++          ret = (emutramp == 'E');
++        break;
++      }
++  free (buf);
++  fclose (f);
++  return ret;
+ }
+ 
+ #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \
diff --git a/dev-libs/libffi/libffi-3.0.13.ebuild b/dev-libs/libffi/libffi-3.0.13.ebuild
index dd4533e7309e..4d59bbbb61f8 100644
--- a/dev-libs/libffi/libffi-3.0.13.ebuild
+++ b/dev-libs/libffi/libffi-3.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.13.ebuild,v 1.2 2013/03/28 23:48:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.13.ebuild,v 1.3 2013/05/18 11:47:54 zorry Exp $
 
 EAPI=5
 inherit eutils libtool multilib toolchain-funcs
@@ -34,6 +34,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
+	epatch "${FILESDIR}"/${P}-emutramp_pax_proc.patch #457194
 	epatch_user
 	elibtoolize
 }