Merge pull request #300 from mischief/dev-libs-libpcre

bump(dev-libs/libpcre): sync with upstream

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/ChangeLog

@@ -1,6 +1,38 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.250 2015/05/10 08:25:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.259 2015/07/14 07:42:31 vapier Exp $
+
+  14 Jul 2015; Mike Frysinger <vapier@gentoo.org> libpcre-8.37-r2.ebuild:
+  Update to EAPI=5 and use subslots with readline.
+
+*libpcre-8.37-r2 (06 Jul 2015)
+
+  06 Jul 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/libpcre-8.37-CVE-2015-3210.patch,
+  +files/libpcre-8.37-CVE-2015-5073.patch, +libpcre-8.37-r2.ebuild:
+  Add backport from upstream for CVE-2015-3210 #551240 by Thomas D.  Add
+  backport from upstream for CVE-2015-5073 #553300 by Agostino Sarubbo.
+
+  09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Updating remote-id in metadata.xml
+
+  02 Jun 2015; Jack Morgan <jmorgan@gentoo.org> libpcre-8.36.ebuild:
+  sparc stable wrt bug #548234
+
+  30 May 2015; Mikle Kolyada <zlogene@gentoo.org> libpcre-8.36.ebuild:
+  x86 stable wrt bug #548234
+
+  30 May 2015; Mikle Kolyada <zlogene@gentoo.org> libpcre-8.36.ebuild:
+  arm stable wrt bug #548234
+
+  20 May 2015; Matt Turner <mattst88@gentoo.org> libpcre-8.36.ebuild:
+  alpha stable, bug 548234.
+
+  15 May 2015; Pacho Ramos <pacho@gentoo.org> libpcre-8.36.ebuild:
+  ppc stable wrt bug #548234
+
+  13 May 2015; Jack Morgan <jmorgan@gentoo.org> libpcre-8.36.ebuild:
+  ia64 stable wrt bug #548234
 
 *libpcre-8.37-r1 (10 May 2015)
 

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest

@@ -1,32 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libpcre-7.9-pkg-config.patch 1487 SHA256 d247cbd8bf85a4e898e0f7512e27bebaaf121e020fd2b85dc04eb6a3c041cd70 SHA512 eda853380d8612d7309c5fbd09d7de70582c1fdbb12fd31a835db5a3f866b4f085b66681b5481c83b2be4934b927d88c69798c8274e5228cb2532e58f99c886a WHIRLPOOL 5d63a40bda7e6b630e0a7b5e151b4c547eb284eac4ca8f4c644033dacb23ae20e0636a89f93fbd7fd4f5b083b5dcfffb3dc335cbadde5bab52cfab0370a7b959
+AUX libpcre-8.37-CVE-2015-3210.patch 2881 SHA256 317f96a803076fcf66a0a1efb78877cbf02b149d9a68f78b010906137ea4e0ac SHA512 ef0c1c45695350b1e31401bcaeb0dc0e03508f8f64c3c44c46f689e2f7f8925191b86499887728e71c791884f809e866562460897c187d4fa505013ddccaf6c4 WHIRLPOOL d2c8aeb8cb59ac40fdba79a1b037817f3425201b5fade9c61503d80d498b6f76ba650ce92653311099c7065a5fea1b1ec5e3331a69fa31cf7a9eadf04dbe4805
+AUX libpcre-8.37-CVE-2015-5073.patch 2215 SHA256 11624ba419d97b076b22aa7bf393dc3d06414385ae46d93f7821f65b75d91d1f SHA512 59320f0260f5d002b34c591d918b06e550a48ada6d38ad2b62d15bdc8f0663dc970dbc7f9b622721b0f3212fe99ae101da8e0a06e71ed420a1cdfbf3613105b5 WHIRLPOOL e31bb3769731b94b6c79b105e784d6d2f5a254dc61b5f6c6a956320ee7975297065ff57fcde73490c80fa683ecb59db2da7691089e085a9f7cea3aae306a8378
 DIST pcre-7.9.tar.bz2 861580 SHA256 40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740 SHA512 b4c47a9b196750d4bead9e3904702fc793d282a22af1b34e24081077b4c167ec787cf7dec9a565fa9df4dafb5927b7accdd49568f5c2f8733842cbbec5d4d25c WHIRLPOOL 412cf0a128861cbb991a0424e9f4ba551093b7853465776e17465f9c2b4222002a8b26d7a234b91a49e055a04ae840ad5d6c1613615c98db3d44413a723a6152
 DIST pcre-8.35.tar.bz2 1522220 SHA256 a961c1c78befef263cc130756eeca7b674b4e73a81533293df44e4265236865b SHA512 e94c652b40de60b391e28afbddc67b5a034650f6f62027e52f2d7aef53caf5f0da9f2d4f6872d1558f965dd9d4d696e5e23d2a50f20a4fbc9f0a707fb6f55fae WHIRLPOOL 677dd9673299438c4d76c68947124069b9c2b88ac837e59d00fc4e92113498357041f173ec4ae1cd61e760debad0a2392710f986794796678e596b9a22ba62a2
 DIST pcre-8.36.tar.bz2 1533818 SHA256 ef833457de0c40e82f573e34528f43a751ff20257ad0e86d272ed5637eb845bb SHA512 acd2bc6911be7b518ad4aca3c3ccbe98bdbeabf0e77d6b04009838c7825b563a001377f8c3a6a8a0583ec32ee9fefe05e3c1a69f272fe5084469a6b6c2148fbf WHIRLPOOL 4c144e3c468a76d8bac3d8a0d4642f7b2e2bd03f84ca915d51a81af7128d7d9c6ed7272bf25e2b9c5eb435037b77ffc41b871bd7257efde0a14a20f5fb4b8432
 DIST pcre-8.37.tar.bz2 1557603 SHA256 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d SHA512 19344c9add2ebbd26c528505d07d3b028d79bc3e6103d51453a449cebd76bc76f5bc7ddd9ef0de41f98c50be74a2d9a65db539ed60f1add1086d99bde8a81466 WHIRLPOOL 43f723a9107fd6d78a88d4682502d79d5b9b0df90a579667a80b9862611a1c7bee25a1d5a1f9facec7c077f89605d7d96e3843d4aa5b94113b49b06a974331e5
-EBUILD libpcre-7.9-r1.ebuild 1980 SHA256 e660a985ccc75e1aec99cbb3acc2e2c5a957757cd59abf95bf300b967044f92a SHA512 d2a4c701bbed7416dbd3c19bd997e17833880973244ec071584be426acf3330147d14fef6273f0bce6ea4bd348eb790f56e1bda4eac31cb51ab8d46cad393b37 WHIRLPOOL f29bc8ede8fb69176a4a1d8570063afc83183f0f52edcb08b4a972262db87a137b2af0269d1d6fe9382b181a62cd72be51063c2f6264de33fad1d809a6115a9f
+EBUILD libpcre-7.9-r1.ebuild 1872 SHA256 8db0511de7f6524150743222c385d892903ce76cef45a25c2325c58c822249b1 SHA512 46a7f47e80c2b14f66a60679fac409ff7759f10bb72a2d152ef8952f36406854a0a7abadbb94b27deba323d2cb8285bb0868d99dc90b42df5e94f04870ad19eb WHIRLPOOL c5949737eabed82022a0d88539d1cf11150d72fa7d4ab901565c2dc4ff9f28f5e14ce0e7b1b6168c137a046ffda00fca8f44944fded001e920cd41e8853b2241
-EBUILD libpcre-8.35.ebuild 3035 SHA256 a5078f50bba582910f13ecf7c8861349fcbbb621ffe86db9863f708d3c911dcd SHA512 1b06d18940f5822df43f3c1d68bc619caa2a079ecbe95a546e06b5a2bfbcc0c45b316b807dd4c219997306ab02823023cb1eea404ad3428e1a0556af8356bcb5 WHIRLPOOL 98a3238a3b15e629b9719bb2388c12150bc78971ec25b7ce21ee59a247c430d5fe2e0e9eaa0b086333468da76fe004cef50d4ae53fa6004fe9e381516b6324e2
+EBUILD libpcre-8.35.ebuild 2930 SHA256 d726abf44494478c1bdb391eb4620c8aabbf41d4e8cec74710edb6b2d06db6a4 SHA512 b8cd3687d7a2992fab826dd1a640f5b12751d813132efab647b0ba2b422b5f5f03ddaf30eab90199000453b6fffe026e0b56681c2aee438dfdaef109258a4a66 WHIRLPOOL 59f856c8b7ff011d1a999a494d06d7c1f6432d2e37c61da18b74e4c8a36b10dbdcb939a2faa9117cdcf7afff9a7f32d5bbd275a69fbe11be31eb62deffc4ae28
-EBUILD libpcre-8.36.ebuild 3045 SHA256 bf44c9682b30b5df1fdce0badfa19eb33f1a7739b59cf0ef71b0aa612d962a1a SHA512 700ca6ccc1e0ffdc41279b088174685d25de24a37476910eef2198379b48c8b009edeb20f92fe62b125963698526b4c6cb388925af0cdd422172b1bce46c72f8 WHIRLPOOL 8c4df34c6a9ae4118d761014f8db17a2ace35d0100e25bf90e3601c7a67dc702b8e9aef17decaeec9c47cc983efce76622e1b21ed2e518fd12ddd6c1207bd957
+EBUILD libpcre-8.36.ebuild 2934 SHA256 37c6db7e9cbf2e416bb74c131b3e09f4cff87eb4f29c9197acd3dec9306f80e8 SHA512 f7f5a88e7f25d7f4d3e8a6b72e1ea77bd3d822232b37574b177479e75d40f2d1d0769c1e4189a94f6211b3a24c3a0e47d9a577d17e1d9c8d28f52bd22bcc103c WHIRLPOOL 045ce9e9253ab1827718c97e41420fa7cc63b8176fa736b2e0d7a089bb6f4828b45aaf12bb5b0856bb9483ee8c90d219af611863820cf80ee06225e1e6f8668d
-EBUILD libpcre-8.37-r1.ebuild 2959 SHA256 3a452f3e5d0a0dddee17ff39a28cad3f3746f960b541f9016c62404842fc7d97 SHA512 b07ecffa0596316d9e9b7e8be545b4d0cda30136facb4307358edbcfd6cab7573a95eeff3882ca85d8ab68a0bf6be1db470a652b921e9a6e3fc2c441238cb9ff WHIRLPOOL 8a0cd68aa65430bb6c135d87c192eb43b333a9539f6c10d2b3bbfbbeaf71bb8ced3228d369a57821ebbb53c47bcaa484853cad9cb3ce3f16f529f9a6cf89465a
+EBUILD libpcre-8.37-r1.ebuild 2846 SHA256 c17e08921e6f3e5e5c96028a7f3b9e5a13bd7826855c2016bf1fa5a4f8e4b218 SHA512 1565c8a9356e12880bdeec3e11b918e6e918c2d541489cbf3ce7249cd93dca33858e02f273561d3cb43c74b6973f1c4868188517f45c45f3c2a5978606517408 WHIRLPOOL 1448940b222f02bcf75b4ff511595eed57ad2ea7b12b7a64031f355bd5b5b73c10237f2d4f8fabc536945d5e8b753e83072b233e00e2f5b12028056771d756f4
-EBUILD libpcre-8.37.ebuild 3053 SHA256 7346a3b08e4cd3a4eb2ac73469892d6128576243b5e805953e2ec8b71fb7fb74 SHA512 49137aaadad2ee930baea96c42ecd99f4214357cad8c11837835110c7accf7ba5e0db24f3cc824291b5043b198ca4fe1e339ec1f723bc70a9a53eef61a656ceb WHIRLPOOL fbe9540229f09300dc34af4e9603fabccdaed1e2f5004a52fc3b83f9dfc07d186e2ee4ddf166796f099795fef7521ada3b7c9faedecf208d00d63ebfd9cd1469
+EBUILD libpcre-8.37-r2.ebuild 2959 SHA256 f1c695d1ad2d89342cf47ef4a7ed88960d650d421341821f53e0617f8d7e5bd5 SHA512 0acb71f4852bf4d914ed626ccf7843a209b8f9ea78e4778bdccc9060f0ee682d124ba722223b786921e91aa0c1c779c499ff49fe1365f1b7d96dd516aa6ca080 WHIRLPOOL 5dfe09b124806a7c8e9811a1006cfacb74c80c3ae35472af6c847c483f5d91f28e53a120fa9d5236c54328973ee64df67e6652cebebbed0eba546f1aaa7ad889
-MISC ChangeLog 34178 SHA256 484edbaa240d381d1139ddee055355639a0a5d6654f14620853f53767b65122a SHA512 dc9e27366cec711b3ded107949c5ec0ff0ccc1bc847c1595bd51f89f2c649accc12f3150d483347228331cde6c5b3e7d38f39a0e75ca69449d6eeabef0a464e6 WHIRLPOOL c6baa82eb40ad079beb671c2d0f7221b5db2ba5c1b2696bd56910c3e9ddb368b179ad9737b1e179a94f0516464cd45247bbbe9ad3639c5d05a0d0b991fc2f282
+EBUILD libpcre-8.37.ebuild 2943 SHA256 be46dc4743c50242a62e9e64693cddd0d6c892221c633df08dad6e0c7e8e5526 SHA512 66e4c228eef5bf3ee33e430ae3725bcde47a9695c1e80846c38cae2f1790f5eb8ade01e7040d497bd94366d12564188c73807eb07223325c0d5662df278a3f6d WHIRLPOOL 7b46beb57f05a5e9641e94d3ad17a2b1040ef0d3802dfa552dbbe9a627d24baf8b32a3c8af82c38597c583fc4abf25811b6c4c14955c8fd2464ef598a54a7a6c
-MISC metadata.xml 1026 SHA256 bb540ffc66e93c6175107c2b017a7cbd2eba63c8dc2c42507a832635b8be5c6c SHA512 fa809405351bb1ec3d2af81a637f0221e2075c406556612de3aae251b77d720a091440f6ab383177b4a09722ec1f6757754d1dd4b942d57f45bac16a8d4189b9 WHIRLPOOL d03007b73990af2c9ff5e68b65a8f997410fccc953848b73eaaf8d35ad0db7fed04b28b8767e6bb02541439796f62a8fd9eff06e9840b99fa4ed3fcacf0bc836
+MISC ChangeLog 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
------BEGIN PGP SIGNATURE-----
+MISC metadata.xml 1023 SHA256 ba00f7b82e98957bb11e252f04248323f385c183e0a89109770b3f0eeb75da04 SHA512 61e620f72d2bfa6784a172d011a81e177bc9eb75c9af2b2908f8718ed45f071146d048a884e37e9bc2b778ad6b2dd4d7d7a9771f505c3f67ce6ee0668a6b4c82 WHIRLPOOL cc27337f8cbcf9bb174b43cb2f835b63a10ec6770ec86298b5dce91d1e0ece36d6c00a09d9695b12ebea1af128d1d180e2e639a67188719b12520cb6ba9328ca
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVTxXsAAoJEPiazRVxLXTF+vIQALNuvbvHP/HjG2xu9QS9hBIu
-M0Th8Q04I8d8GrWhsrYE0VRMs/NdMNfr3N1z57tE0b3QyV5uKfTnI07q13PV49GA
-spNBhYZjYgSkNJy8V5JCrNURHOrGVVlw+niv6DsZ1Xzq8kQ03gx5z3jrkDmNbXAb
-rpThJ24xadIb7mGHVWoOLIGLnLIzUwg03a4rmUMlY5kv2y++imLkNCPPQmKO5325
-JnZOsOCJ7rnvSveZx6JL6iLCrGeUihDIK9knytQPv9B53jNM0R9vK6hUz2TyDylh
-7swg+qVg7uIzvvO9BdM8mNzrlKTjmPDOF8gvvuYtw2MrcluZvIsgLPbHuTOCOdCX
-fa7q7GeIMZ5JFwvvy74do4xriwsAYZqYQe7cJicCmwUjAM+05d//Z0VCb/xKDJeu
-vJZpXEoyFFi3Ejqah/vV1bpOHkaTNN6tRvTFj14TRUNtV3aokzv8iD8YUc7DJR78
-IGshVqOo+d31x+7s33TEPgV3MzAoskp1DWXTBlBXtr1fCOBVHqPn6DSGKa5BN99a
-6DTzN8YBlYWr01mlOEdpNRMFhVnhtCgfVDjBct0eZ6cE3Rq1dTlJvV0M0Wt1DQoU
-3YRoURrxzSIsORb2f0ui8plM0XVCAHn7mCcUZXltX/CpTla/TljhtoSpd5y8hRMt
-g65vyFZYws/e9x3/QBzs
-=kF8K
------END PGP SIGNATURE-----

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.37-CVE-2015-3210.patch

@@ -0,0 +1,91 @@
+https://bugs.exim.org/show_bug.cgi?id=1636
+https://bugs.gentoo.org/551240
+https://bugzilla.redhat.com/1236659
+
+From 68ff1beb43bb3d4d8838f3285c97023d1e50513a Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Fri, 15 May 2015 17:17:03 +0000
+Subject: [PATCH] Fix buffer overflow for named recursive back reference when
+ the name is duplicated.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream commit ported to pcre-8.37:
+
+commit 4b79af6b4cbeb5326ae5e4d83f3e935e00286c19
+Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date:   Fri May 15 17:17:03 2015 +0000
+
+    Fix buffer overflow for named recursive back reference when the name is
+    duplicated.
+
+    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1558 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+This fixes CVE-2015-3210.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ pcre_compile.c       | 16 ++++++++++++++--
+ testdata/testinput2  |  2 ++
+ testdata/testoutput2 |  2 ++
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 0efad26..6f06912 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -7173,14 +7173,26 @@ for (;; ptr++)
+           number. If the name is not found, set the value to 0 for a forward
+           reference. */
+ 
++          recno = 0;
+           ng = cd->named_groups;
+           for (i = 0; i < cd->names_found; i++, ng++)
+             {
+             if (namelen == ng->length &&
+                 STRNCMP_UC_UC(name, ng->name, namelen) == 0)
+-              break;
++              {
++              open_capitem *oc;
++              recno = ng->number;
++              if (is_recurse) break;
++              for (oc = cd->open_caps; oc != NULL; oc = oc->next)         
++                {          
++                if (oc->number == recno)                                     
++                  {               
++                  oc->flag = TRUE;                                      
++                  break;
++                  }                                                         
++                }                          
++              }    
+             }
+-          recno = (i < cd->names_found)? ng->number : 0;
+ 
+           /* Count named back references. */
+ 
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 58fe53b..83bb471 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4152,4 +4152,6 @@ backtracking verbs. --/
+ 
+ /((?2){73}(?2))((?1))/
+ 
++"(?J)(?'d'(?'d'\g{d}))"
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index b718df0..7dff52a 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14423,4 +14423,6 @@ Failed: lookbehind assertion is not fixed length at offset 17
+ 
+ /((?2){73}(?2))((?1))/
+ 
++"(?J)(?'d'(?'d'\g{d}))"
++
+ /-- End of testinput2 --/
+-- 
+2.4.3
+

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.37-CVE-2015-5073.patch

@@ -0,0 +1,72 @@
+https://bugs.exim.org/show_bug.cgi?id=1651
+https://bugs.gentoo.org/553300
+https://bugzilla.redhat.com/1237224
+
+From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Tue, 23 Jun 2015 16:34:53 +0000
+Subject: [PATCH] Fix buffer overflow for forward reference within backward
+ assertion with excess closing parenthesis. Bugzilla 1651.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is upstream commit ported to 8.37:
+
+commit 764692f9aea9eab50fdba6cb537441d8b34c6c37
+Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date:   Tue Jun 23 16:34:53 2015 +0000
+
+    Fix buffer overflow for forward reference within backward assertion with excess
+    closing parenthesis. Bugzilla 1651.
+
+    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+It fixes CVE-2015-5073.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ pcre_compile.c       | 2 +-
+ testdata/testinput2  | 2 ++
+ testdata/testoutput2 | 3 +++
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 6f06912..b66b1f6 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
+ exceptional ones forgo this. We scan the pattern to check that they are fixed
+ length, and set their lengths. */
+ 
+-if (cd->check_lookbehind)
++if (errorcode == 0 && cd->check_lookbehind)
+   {
+   pcre_uchar *cc = (pcre_uchar *)codestart;
+ 
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 83bb471..5cc9ce6 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4154,4 +4154,6 @@ backtracking verbs. --/
+ 
+ "(?J)(?'d'(?'d'\g{d}))"
+ 
++/(?=di(?<=(?1))|(?=(.))))/
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 7dff52a..4decb8d 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17
+ 
+ "(?J)(?'d'(?'d'\g{d}))"
+ 
++/(?=di(?<=(?1))|(?=(.))))/
++Failed: unmatched parentheses at offset 23
++
+ /-- End of testinput2 --/
+-- 
+2.4.3
+

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-7.9-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.9-r1.ebuild,v 1.15 2014/06/24 03:50:06 patrick Exp $
+# $Id$
 
 EAPI=2
 

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.35.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.14 2014/09/04 06:50:07 vapier Exp $
+# $Id$
 
 EAPI="4"
 

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.36.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.36.ebuild,v 1.4 2015/05/01 12:25:26 zlogene Exp $
+# $Id$
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-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 ~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"
+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 ~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="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.37-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.37-r1.ebuild,v 1.1 2015/05/10 08:25:15 polynomial-c Exp $
+# $Id$
 
 EAPI="4"
 

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.37-r2.ebuild

@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+LICENSE="BSD"
+SLOT="3"
+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 ~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="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre-config
+)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2015-3210.patch #551240
+	epatch "${FILESDIR}"/${P}-CVE-2015-5073.patch #553300
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(multilib_native_use_enable bzip2 pcregrep-libbz2) \
+		$(use_enable cxx cpp) \
+		$(use_enable jit) $(use_enable jit pcregrep-jit) \
+		$(use_enable pcre16) \
+		$(use_enable pcre32) \
+		$(multilib_native_use_enable libedit pcretest-libedit) \
+		$(multilib_native_use_enable readline pcretest-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
+		$(multilib_native_use_enable zlib pcregrep-libz) \
+		--enable-pcre8 \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.37.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.37.ebuild,v 1.1 2015/04/30 11:00:06 polynomial-c Exp $
+# $Id$
 
 EAPI="4"
 

sdk_container/src/third_party/portage-stable/dev-libs/libpcre/metadata.xml

@@ -1,37 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>base-system</herd>
+<herd>base-system</herd>
-  <use>
+<use>
-    <flag name='bzip2'>
+	<flag name="bzip2">
-      Add support for pcregrep command to search within
+		Add support for pcregrep command to search within
-      bzip2-compressed files, through <pkg>sys-libs/zlib</pkg>.
+		bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
-    </flag>
+	</flag>
-
+	<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
-    <flag name='pcre16'>
+	<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
-      Build 16 bit PCRE library.
+	<flag name="readline">
-    </flag>
+		Add support for command line editing to pcretest, through
-
+		<pkg>sys-libs/readline</pkg>.
-    <flag name='pcre32'>
+	</flag>
-      Build 32 bit PCRE library.
+	<flag name="recursion-limit">
-    </flag>
+		Limit match recursion to 8192; if disabled, the default limit is
-
+		used, which is the same as the match limit.
-    <flag name='readline'>
+	</flag>
-      Add support for command line editing to pcretest, through
+	<flag name="zlib">
-      <pkg>sys-libs/readline</pkg>.
+		Add support for pcregrep command to search within
-    </flag>
+		gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
-
+	</flag>
-    <flag name='recursion-limit'>
+</use>
-      Limit match recursion to 8192; if disabled, the default limit is
+<upstream>
-      used, which is the same as the match limit.
+	<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
-    </flag>
+	<remote-id type="sourceforge">pcre</remote-id>
-
+</upstream>
-    <flag name='zlib'>
-      Add support for pcregrep command to search within
-      gzip-compressed files, through <pkg>app-arch/gzip</pkg>.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
-  </upstream>
 </pkgmetadata>

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-7.9-r1

@@ -10,4 +10,4 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=3
 SRC_URI=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=2957d789313b23aa5e957c1124f751fb
+_md5_=3614565220d06c3a77f44995b8af1cc3

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.35

@@ -11,4 +11,4 @@ REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.35.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.35.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=37befc117bb0164f77fb3e12e4bb3ee8
+_md5_=cdc807ef2f65fbf70a881b61e4c51dfc

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.36

@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=4
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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 ~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
+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 ~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
 LICENSE=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.36.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.36.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=77e9a164de35ae229ab9f7dd94e6b0c5
+_md5_=739baeef2a43569d4cd69abac5551913

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.37

@@ -11,4 +11,4 @@ REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.37.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=20ea46972c2509bd858396bc97f2137c
+_md5_=931b84a9ede32cf1de9ee6619537aefd

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.37-r1

@@ -11,4 +11,4 @@ REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.37.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b9b270e432f6eb08a0bb42928675aee8
+_md5_=a20fe6e7892245d79ee073ddc8522aba

sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.37-r2

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Perl-compatible regular expression library
+EAPI=5
+HOMEPAGE=http://www.pcre.org/
+IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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 ~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
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
+SLOT=3
+SRC_URI=mirror://sourceforge/pcre/pcre-8.37.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=7e82bb36facfbe93abf44f41b50a537f