Merge pull request #459 from mischief/pcre

bump(dev-libs/libpcre): sync with upstream
This commit is contained in:
Nick Owens 2016-07-11 10:46:48 -07:00 committed by GitHub
commit f6aa2328a2
21 changed files with 1437 additions and 1488 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,15 +1,10 @@
AUX libpcre-7.9-pkg-config.patch 1487 SHA256 d247cbd8bf85a4e898e0f7512e27bebaaf121e020fd2b85dc04eb6a3c041cd70 SHA512 eda853380d8612d7309c5fbd09d7de70582c1fdbb12fd31a835db5a3f866b4f085b66681b5481c83b2be4934b927d88c69798c8274e5228cb2532e58f99c886a WHIRLPOOL 5d63a40bda7e6b630e0a7b5e151b4c547eb284eac4ca8f4c644033dacb23ae20e0636a89f93fbd7fd4f5b083b5dcfffb3dc335cbadde5bab52cfab0370a7b959 AUX libpcre-8.38-CVE-2016-1283.patch 1714 SHA256 a4b1a1d4176b7271403ce9a8b9e96404671b7a6d82b2a5e1c4778172c36e6b69 SHA512 353f4573c06a95247ba4b506be0308c6781ee41bdc0f8e2040d974d258d51dee5e19861925e70584eb6319f9da8593000c1c8fc670ae60a8d76c41ee57f2da2b WHIRLPOOL 29935cf10b15cad22699ffbe4dd34314de4185cf49789dfc56537bcc9203b91e5ca2731b1089d6d138a029fb3ad9ccdf167d2e1da9341a23a900c7f9f6dab73f
AUX libpcre-8.37-CVE-2015-3210.patch 2881 SHA256 317f96a803076fcf66a0a1efb78877cbf02b149d9a68f78b010906137ea4e0ac SHA512 ef0c1c45695350b1e31401bcaeb0dc0e03508f8f64c3c44c46f689e2f7f8925191b86499887728e71c791884f809e866562460897c187d4fa505013ddccaf6c4 WHIRLPOOL d2c8aeb8cb59ac40fdba79a1b037817f3425201b5fade9c61503d80d498b6f76ba650ce92653311099c7065a5fea1b1ec5e3331a69fa31cf7a9eadf04dbe4805 AUX libpcre-8.38-ZDI-CAN-3542.patch 8318 SHA256 5dc56e334771467747427f5e4f46af61a193a54a5e367d9d4f0dc1b8888fd4b3 SHA512 6ef0ba6ceca2805894c27e906388f000fae06ef67ed7be1f01809f64f2cc7b7adfd6747e005033aa260f229479fcbb64055ec151d3dee10edd0a400cece97914 WHIRLPOOL cee8fb91e4854e019ebcbabd7d4dc3c87a4a796574dc167890b702d0b36ede2518d1fcdfb104eb6139b463e8d766c4c27b5866ea70c66d3408a9ef80f5100843
AUX libpcre-8.37-CVE-2015-5073.patch 2215 SHA256 11624ba419d97b076b22aa7bf393dc3d06414385ae46d93f7821f65b75d91d1f SHA512 59320f0260f5d002b34c591d918b06e550a48ada6d38ad2b62d15bdc8f0663dc970dbc7f9b622721b0f3212fe99ae101da8e0a06e71ed420a1cdfbf3613105b5 WHIRLPOOL e31bb3769731b94b6c79b105e784d6d2f5a254dc61b5f6c6a956320ee7975297065ff57fcde73490c80fa683ecb59db2da7691089e085a9f7cea3aae306a8378 DIST pcre-8.38.tar.bz2 1562265 SHA256 b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df SHA512 ad3412ceee8f992787a3e7cbe0155ffba67affd4b2dfece6c4501dc8d2012f52dcc1ee1f56759362e04bbbd10ea9370b3e46f238e2f75005cb69f6c8439e52c0 WHIRLPOOL 68533f741a3faa618f4d7341bfa59aaac295ac6af6085772e4c169ad73fae38e98cace2ce2af2899a619bb05dce79859dcd175a158a73729082f7cf52107d1df
DIST pcre-7.9.tar.bz2 861580 SHA256 40a13a9759f1de5b16bc2f0d47b6aa5f0ec010325646922f54b013c040dcd740 SHA512 b4c47a9b196750d4bead9e3904702fc793d282a22af1b34e24081077b4c167ec787cf7dec9a565fa9df4dafb5927b7accdd49568f5c2f8733842cbbec5d4d25c WHIRLPOOL 412cf0a128861cbb991a0424e9f4ba551093b7853465776e17465f9c2b4222002a8b26d7a234b91a49e055a04ae840ad5d6c1613615c98db3d44413a723a6152 DIST pcre-8.39.tar.bz2 1560758 SHA256 b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b SHA512 8b0f14ae5947c4b2d74876a795b04e532fd71c2479a64dbe0ed817e7c7894ea3cae533413de8c17322d305cb7f4e275d72b43e4e828eaca77dc4bcaf04529cf6 WHIRLPOOL 00e8e7fb3dc60cbbd2ee185e269696058b568a0f269749386bad44cb474f723c9ed3dfd2af91ddce0b5047aab459864f07e05940af17d3d51d2f1b068415b1ed
DIST pcre-8.35.tar.bz2 1522220 SHA256 a961c1c78befef263cc130756eeca7b674b4e73a81533293df44e4265236865b SHA512 e94c652b40de60b391e28afbddc67b5a034650f6f62027e52f2d7aef53caf5f0da9f2d4f6872d1558f965dd9d4d696e5e23d2a50f20a4fbc9f0a707fb6f55fae WHIRLPOOL 677dd9673299438c4d76c68947124069b9c2b88ac837e59d00fc4e92113498357041f173ec4ae1cd61e760debad0a2392710f986794796678e596b9a22ba62a2 EBUILD libpcre-8.38-r1.ebuild 2877 SHA256 b613afa5c0226d80a430d547c7f099e3359a8808a68a3d9321bb3cb19f9da629 SHA512 fb3eed9e159ca3b6779d499381f88eba60d12610b560fbc77800bd3c3c6bd08c4154e24be9963a0c5ee38f5cf2ae6325aaef36b5d5273053c18738316aeba939 WHIRLPOOL 9f5c4fc185be2b287f8724e8cc8156797979601e86cebe6fb749a0cc0354461db4b20ce8a81d545d3cab2b0779162f47ae18ca0281189be511fb472ea7664b73
DIST pcre-8.36.tar.bz2 1533818 SHA256 ef833457de0c40e82f573e34528f43a751ff20257ad0e86d272ed5637eb845bb SHA512 acd2bc6911be7b518ad4aca3c3ccbe98bdbeabf0e77d6b04009838c7825b563a001377f8c3a6a8a0583ec32ee9fefe05e3c1a69f272fe5084469a6b6c2148fbf WHIRLPOOL 4c144e3c468a76d8bac3d8a0d4642f7b2e2bd03f84ca915d51a81af7128d7d9c6ed7272bf25e2b9c5eb435037b77ffc41b871bd7257efde0a14a20f5fb4b8432 EBUILD libpcre-8.38.ebuild 2764 SHA256 530981f347fac64af185ee1d0ac30bfab2b63a65555503e3a2a70b2a1696467d SHA512 d1372fd1df017a9371fd08c15bf8fe6acc28e6e5ff9ffcf1605ed1a4fa07204a1d33e9ee46d1eb4b40e98079132fd280582101a5938bdbd26fb535105aa891a8 WHIRLPOOL 61daaf93e4d61b6fe06e1dab51224f33ed815fe96591ac7119ea61c20c3555beb0f8754420889432f8cf83e1c3ed66cbd8a45685d1a17581e000dad964db16ac
DIST pcre-8.37.tar.bz2 1557603 SHA256 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d SHA512 19344c9add2ebbd26c528505d07d3b028d79bc3e6103d51453a449cebd76bc76f5bc7ddd9ef0de41f98c50be74a2d9a65db539ed60f1add1086d99bde8a81466 WHIRLPOOL 43f723a9107fd6d78a88d4682502d79d5b9b0df90a579667a80b9862611a1c7bee25a1d5a1f9facec7c077f89605d7d96e3843d4aa5b94113b49b06a974331e5 EBUILD libpcre-8.39.ebuild 2817 SHA256 184be06d035cd47b30ba9210fb15134fddf8c87020767c25b07491caafa3e4f8 SHA512 73aa42fc4e66a3a6956c8094dbb47a37b4b1bad83d3a7e3df8f3cb33412102fc85c3c77813a92d1878fe0652a09b66ebdbe40aa76b713dbcf6bd6c6641e9467a WHIRLPOOL 2bff4fa314847208aa93cbe9a77c8e2f7b74158cc1f1fe62ab0079145056087e67653a1870aad5e36ec53eb875dac8a2ce7ade8b0b056ec0b1fab037b978f969
EBUILD libpcre-7.9-r1.ebuild 1872 SHA256 8db0511de7f6524150743222c385d892903ce76cef45a25c2325c58c822249b1 SHA512 46a7f47e80c2b14f66a60679fac409ff7759f10bb72a2d152ef8952f36406854a0a7abadbb94b27deba323d2cb8285bb0868d99dc90b42df5e94f04870ad19eb WHIRLPOOL c5949737eabed82022a0d88539d1cf11150d72fa7d4ab901565c2dc4ff9f28f5e14ce0e7b1b6168c137a046ffda00fca8f44944fded001e920cd41e8853b2241 MISC ChangeLog 8367 SHA256 5132cb1f50c9c3c1752f3d6f21113d49c754f07782cc6eae47d99622b452c210 SHA512 52f4278c83f1d8b6f7491f808a4d0fbc02538a4aad487f7df25ba485e78cfe48d834c0a7e3388d0a2e92af463c2f0a74ad279abd1631ce7fbe0e166692e92f5b WHIRLPOOL 5a4d432ce378e56c2e52dd6b3f0b2cb2e39117624128d50e0eb1aa8503127db9ffdbb0be5de53c7e470266559ae25763e3ec61033cac5db53edc414575e7aea4
EBUILD libpcre-8.35.ebuild 2930 SHA256 d726abf44494478c1bdb391eb4620c8aabbf41d4e8cec74710edb6b2d06db6a4 SHA512 b8cd3687d7a2992fab826dd1a640f5b12751d813132efab647b0ba2b422b5f5f03ddaf30eab90199000453b6fffe026e0b56681c2aee438dfdaef109258a4a66 WHIRLPOOL 59f856c8b7ff011d1a999a494d06d7c1f6432d2e37c61da18b74e4c8a36b10dbdcb939a2faa9117cdcf7afff9a7f32d5bbd275a69fbe11be31eb62deffc4ae28 MISC ChangeLog-2015 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
EBUILD libpcre-8.36.ebuild 2934 SHA256 37c6db7e9cbf2e416bb74c131b3e09f4cff87eb4f29c9197acd3dec9306f80e8 SHA512 f7f5a88e7f25d7f4d3e8a6b72e1ea77bd3d822232b37574b177479e75d40f2d1d0769c1e4189a94f6211b3a24c3a0e47d9a577d17e1d9c8d28f52bd22bcc103c WHIRLPOOL 045ce9e9253ab1827718c97e41420fa7cc63b8176fa736b2e0d7a089bb6f4828b45aaf12bb5b0856bb9483ee8c90d219af611863820cf80ee06225e1e6f8668d MISC metadata.xml 1112 SHA256 fa2a7f9e7f1ee1c432907cbc5cc0dd23f9636b5f4c51836dbcdbf24f72975c2a SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b WHIRLPOOL 7b675f34fbd1f58f42d7ad5c4e39e1d80922474624047165b30d85ecdbbffd1246d68b0dad4d7553c0d2fc900249e3425fc04f9b3821f189b30ebb2d2615dbad
EBUILD libpcre-8.37-r1.ebuild 2846 SHA256 c17e08921e6f3e5e5c96028a7f3b9e5a13bd7826855c2016bf1fa5a4f8e4b218 SHA512 1565c8a9356e12880bdeec3e11b918e6e918c2d541489cbf3ce7249cd93dca33858e02f273561d3cb43c74b6973f1c4868188517f45c45f3c2a5978606517408 WHIRLPOOL 1448940b222f02bcf75b4ff511595eed57ad2ea7b12b7a64031f355bd5b5b73c10237f2d4f8fabc536945d5e8b753e83072b233e00e2f5b12028056771d756f4
EBUILD libpcre-8.37-r2.ebuild 2959 SHA256 f1c695d1ad2d89342cf47ef4a7ed88960d650d421341821f53e0617f8d7e5bd5 SHA512 0acb71f4852bf4d914ed626ccf7843a209b8f9ea78e4778bdccc9060f0ee682d124ba722223b786921e91aa0c1c779c499ff49fe1365f1b7d96dd516aa6ca080 WHIRLPOOL 5dfe09b124806a7c8e9811a1006cfacb74c80c3ae35472af6c847c483f5d91f28e53a120fa9d5236c54328973ee64df67e6652cebebbed0eba546f1aaa7ad889
EBUILD libpcre-8.37.ebuild 2943 SHA256 be46dc4743c50242a62e9e64693cddd0d6c892221c633df08dad6e0c7e8e5526 SHA512 66e4c228eef5bf3ee33e430ae3725bcde47a9695c1e80846c38cae2f1790f5eb8ade01e7040d497bd94366d12564188c73807eb07223325c0d5662df278a3f6d WHIRLPOOL 7b46beb57f05a5e9641e94d3ad17a2b1040ef0d3802dfa552dbbe9a627d24baf8b32a3c8af82c38597c583fc4abf25811b6c4c14955c8fd2464ef598a54a7a6c
MISC ChangeLog 35335 SHA256 dfdfc43bcff86898d74db532baf46e6d88c70a3e62e82ceab69c285934f802b5 SHA512 94411b185f75967d240777124272d04b13f3cb3e43de6f751baa9944e07086f9fa2972e4854514fb39f85d69422a07fd1ee1cc7fc587dacf54b777bdf68439ea WHIRLPOOL ec71b8c06e85b5ec0a4040def4447e6aa2589bbaf9bd4b5d7479a2b968357a2b5c4a30e7c2739bd1b4607e074cdc9d15e0f730ed1a69cb936d514056d53578e0
MISC metadata.xml 1023 SHA256 ba00f7b82e98957bb11e252f04248323f385c183e0a89109770b3f0eeb75da04 SHA512 61e620f72d2bfa6784a172d011a81e177bc9eb75c9af2b2908f8718ed45f071146d048a884e37e9bc2b778ad6b2dd4d7d7a9771f505c3f67ce6ee0668a6b4c82 WHIRLPOOL cc27337f8cbcf9bb174b43cb2f835b63a10ec6770ec86298b5dce91d1e0ece36d6c00a09d9695b12ebea1af128d1d180e2e639a67188719b12520cb6ba9328ca

View File

@ -1,48 +0,0 @@
diff -NrU5 pcre-7.9.orig/configure.ac pcre-7.9/configure.ac
--- pcre-7.9.orig/configure.ac 2009-04-11 16:09:54.000000000 +0200
+++ pcre-7.9/configure.ac 2009-04-18 22:40:50.000000000 +0200
@@ -598,10 +598,11 @@
# Produce these files, in addition to config.h.
AC_CONFIG_FILES(
Makefile
libpcre.pc
+ libpcreposix.pc
libpcrecpp.pc
pcre-config
pcre.h
pcre_stringpiece.h
pcrecpparg.h
diff -NrU5 pcre-7.9.orig/libpcreposix.pc.in pcre-7.9/libpcreposix.pc.in
--- pcre-7.9.orig/libpcreposix.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ pcre-7.9/libpcreposix.pc.in 2009-04-18 22:38:02.000000000 +0200
@@ -0,0 +1,13 @@
+# Package Information for pkg-config
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libpcreposix
+Description: PCREPosix - Posix compatible regular expressions C library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lpcreposix
+Cflags: -I${includedir}
+Requires.private: libpcre
diff -NrU5 pcre-7.9.orig/Makefile.am pcre-7.9/Makefile.am
--- pcre-7.9.orig/Makefile.am 2009-02-27 17:02:49.000000000 +0100
+++ pcre-7.9/Makefile.am 2009-04-18 22:40:00.000000000 +0200
@@ -325,11 +325,11 @@
$(CC) -shared -o pcre.dll -Wl,"--strip-all" -Wl,"--export-all-symbols" $(DLL_OBJS)
# We have .pc files for pkg-config users.
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpcre.pc
+pkgconfig_DATA = libpcre.pc libpcreposix.pc
if WITH_PCRE_CPP
pkgconfig_DATA += libpcrecpp.pc
endif
dist_man_MANS = \

View File

@ -1,91 +0,0 @@
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

View File

@ -1,72 +0,0 @@
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

View File

@ -0,0 +1,42 @@
From b7537308b7c758f33c347cb0bec62754c43c271f Mon Sep 17 00:00:00 2001
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date: Sat, 27 Feb 2016 17:38:11 +0000
Subject: [PATCH] Yet another duplicate name bugfix by overestimating the
memory needed (i.e. another hack - PCRE2 has this "properly" fixed).
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1636 2f5784b3-3f2a-0410-8824-cb99058d5e15
---
ChangeLog | 7 +++++++
pcre_compile.c | 7 ++++++-
testdata/testinput2 | 2 ++
testdata/testoutput2 | 2 ++
4 files changed, 17 insertions(+), 1 deletion(-)
14. And yet another buffer overflow bug involving duplicate named groups, this
time nested, with a nested back reference. Yet again, I have just allowed
for more memory, because anything more needs all the refactoring that has
been done for PCRE2. An example pattern that provoked this bug is:
/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/ and the bug was
registered as CVE-2016-1283.
diff --git a/pcre_compile.c b/pcre_compile.c
index 5019854..4ffea0c 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -7311,7 +7311,12 @@ for (;; ptr++)
so far in order to get the number. If the name is not found, leave
the value of recno as 0 for a forward reference. */
- else
+ /* This patch (removing "else") fixes a problem when a reference is
+ to multiple identically named nested groups from within the nest.
+ Once again, it is not the "proper" fix, and it results in an
+ over-allocation of memory. */
+
+ /* else */
{
ng = cd->named_groups;
for (i = 0; i < cd->names_found; i++, ng++)
--
2.7.4

View File

@ -0,0 +1,172 @@
From 943a5105b9fe2842851003f692c7077a6cdbeefe Mon Sep 17 00:00:00 2001
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date: Wed, 10 Feb 2016 19:13:17 +0000
Subject: [PATCH] Fix workspace overflow for (*ACCEPT) with deeply nested
parentheses.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1631 2f5784b3-3f2a-0410-8824-cb99058d5e15
---
ChangeLog | 32 ++++++++++++++++++--------------
pcre_compile.c | 23 +++++++++++++++++++----
pcre_internal.h | 4 ++--
pcreposix.c | 5 +++--
testdata/testinput11 | 2 ++
testdata/testoutput11-16 | 3 +++
testdata/testoutput11-32 | 3 +++
testdata/testoutput11-8 | 3 +++
8 files changed, 53 insertions(+), 22 deletions(-)
13. A pattern that included (*ACCEPT) in the middle of a sufficiently deeply
nested set of parentheses of sufficient size caused an overflow of the
compiling workspace (which was diagnosed, but of course is not desirable).
diff --git a/pcre_compile.c b/pcre_compile.c
index b9a239e..5019854 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2014 University of Cambridge
+ Copyright (c) 1997-2016 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -560,6 +560,7 @@ static const char error_texts[] =
/* 85 */
"parentheses are too deeply nested (stack check)\0"
"digits missing in \\x{} or \\o{}\0"
+ "regular expression is too complicated\0"
;
/* Table to identify digits and hex digits. This is used when compiling
@@ -4591,7 +4592,8 @@ for (;; ptr++)
if (code > cd->start_workspace + cd->workspace_size -
WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */
{
- *errorcodeptr = ERR52;
+ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)?
+ ERR52 : ERR87;
goto FAILED;
}
@@ -6626,8 +6628,21 @@ for (;; ptr++)
cd->had_accept = TRUE;
for (oc = cd->open_caps; oc != NULL; oc = oc->next)
{
- *code++ = OP_CLOSE;
- PUT2INC(code, 0, oc->number);
+ if (lengthptr != NULL)
+ {
+#ifdef COMPILE_PCRE8
+ *lengthptr += 1 + IMM2_SIZE;
+#elif defined COMPILE_PCRE16
+ *lengthptr += 2 + IMM2_SIZE;
+#elif defined COMPILE_PCRE32
+ *lengthptr += 4 + IMM2_SIZE;
+#endif
+ }
+ else
+ {
+ *code++ = OP_CLOSE;
+ PUT2INC(code, 0, oc->number);
+ }
}
setverb = *code++ =
(cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
diff --git a/pcre_internal.h b/pcre_internal.h
index f7a5ee7..dbfe80e 100644
--- a/pcre_internal.h
+++ b/pcre_internal.h
@@ -7,7 +7,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2014 University of Cambridge
+ Copyright (c) 1997-2016 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -2289,7 +2289,7 @@ enum { ERR0, ERR1, ERR2, ERR3, ERR4, ERR5, ERR6, ERR7, ERR8, ERR9,
ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79,
- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT };
+ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT };
/* JIT compiling modes. The function list is indexed by them. */
diff --git a/pcreposix.c b/pcreposix.c
index dcc13ef..55b6ddc 100644
--- a/pcreposix.c
+++ b/pcreposix.c
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2014 University of Cambridge
+ Copyright (c) 1997-2016 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -173,7 +173,8 @@ static const int eint[] = {
REG_BADPAT, /* group name must start with a non-digit */
/* 85 */
REG_BADPAT, /* parentheses too deeply nested (stack check) */
- REG_BADPAT /* missing digits in \x{} or \o{} */
+ REG_BADPAT, /* missing digits in \x{} or \o{} */
+ REG_BADPAT /* pattern too complicated */
};
/* Table of texts corresponding to POSIX error codes */
diff --git a/testdata/testinput11 b/testdata/testinput11
index ac9d228..6f0989a 100644
--- a/testdata/testinput11
+++ b/testdata/testinput11
@@ -138,4 +138,6 @@ is required for these tests. --/
/.((?2)(?R)\1)()/B
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+
/-- End of testinput11 --/
diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16
index 280692e..3c485da 100644
--- a/testdata/testoutput11-16
+++ b/testdata/testoutput11-16
@@ -765,4 +765,7 @@ Memory allocation (code space): 14
25 End
------------------------------------------------------------------
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+Failed: regular expression is too complicated at offset 490
+
/-- End of testinput11 --/
diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32
index cdbda74..e19518d 100644
--- a/testdata/testoutput11-32
+++ b/testdata/testoutput11-32
@@ -765,4 +765,7 @@ Memory allocation (code space): 28
25 End
------------------------------------------------------------------
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+Failed: missing ) at offset 509
+
/-- End of testinput11 --/
diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8
index cb37896..5a4fbb2 100644
--- a/testdata/testoutput11-8
+++ b/testdata/testoutput11-8
@@ -765,4 +765,7 @@ Memory allocation (code space): 10
38 End
------------------------------------------------------------------
+/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
+Failed: missing ) at offset 509
+
/-- End of testinput11 --/
--
2.7.4

View File

@ -1,62 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=2
inherit libtool eutils toolchain-funcs autotools multilib
DESCRIPTION="Perl-compatible regular expression library"
HOMEPAGE="http://www.pcre.org/"
if [[ ${PV} == ${PV/_rc} ]]
then
MY_P="pcre-${PV}"
SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
else
MY_P="pcre-${PV/_rc/-RC}"
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 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
IUSE="bzip2 +cxx doc unicode zlib static-libs"
RDEPEND="bzip2? ( app-arch/bzip2 )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
S=${WORKDIR}/${MY_P}
src_prepare() {
sed -i -e "s:libdir=@libdir@:libdir=/$(get_libdir):" libpcre.pc.in || die "Fixing libpcre pkgconfig files failed"
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die "Fixing libpcrecpp pkgconfig files failed"
echo "Requires: libpcre = @PACKAGE_VERSION@" >> libpcrecpp.pc.in
epatch "${FILESDIR}"/libpcre-7.9-pkg-config.patch
eautoreconf
elibtoolize
}
src_configure() {
econf --with-match-limit-recursion=8192 \
$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
$(use_enable cxx cpp) \
$(use_enable zlib pcregrep-libz) \
$(use_enable bzip2 pcregrep-libbz2) \
$(use_enable static-libs static) \
--enable-shared \
--htmldir=/usr/share/doc/${PF}/html \
--docdir=/usr/share/doc/${PF} \
|| die "econf failed"
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
gen_usr_ldscript -a pcre
dodoc doc/*.txt AUTHORS
use doc && dohtml doc/html/*
find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
}

View File

@ -1,94 +0,0 @@
# 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
}

View File

@ -1,96 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
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 )"
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() {
local pc
for pc in *.pc.in ; do
echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
done
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
}

View File

@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="4" EAPI="5"
inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
@ -27,10 +27,9 @@ REQUIRED_USE="readline? ( !libedit )
RDEPEND="bzip2? ( app-arch/bzip2 ) RDEPEND="bzip2? ( app-arch/bzip2 )
zlib? ( sys-libs/zlib ) zlib? ( sys-libs/zlib )
libedit? ( dev-libs/libedit ) libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline )" readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
virtual/pkgconfig virtual/pkgconfig"
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
RDEPEND="${RDEPEND} RDEPEND="${RDEPEND}
abi_x86_32? ( abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !<=app-emulation/emul-linux-x86-baselibs-20131008-r2
@ -44,10 +43,8 @@ MULTILIB_CHOST_TOOLS=(
) )
src_prepare() { src_prepare() {
local pc epatch "${FILESDIR}"/${P}-ZDI-CAN-3542.patch #575546
for pc in *.pc.in ; do epatch "${FILESDIR}"/${P}-CVE-2016-1283.patch #570694
echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
done
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize elibtoolize
} }
@ -80,7 +77,7 @@ multilib_src_install() {
DESTDIR="${D}" \ DESTDIR="${D}" \
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
install install
multilib_is_native_abi && gen_usr_ldscript -a pcre gen_usr_ldscript -a pcre
} }
multilib_src_install_all() { multilib_src_install_all() {

View File

@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation # Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="4" EAPI="5"
inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
@ -27,10 +27,9 @@ REQUIRED_USE="readline? ( !libedit )
RDEPEND="bzip2? ( app-arch/bzip2 ) RDEPEND="bzip2? ( app-arch/bzip2 )
zlib? ( sys-libs/zlib ) zlib? ( sys-libs/zlib )
libedit? ( dev-libs/libedit ) libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline )" readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
virtual/pkgconfig virtual/pkgconfig"
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
RDEPEND="${RDEPEND} RDEPEND="${RDEPEND}
abi_x86_32? ( abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !<=app-emulation/emul-linux-x86-baselibs-20131008-r2
@ -44,10 +43,6 @@ MULTILIB_CHOST_TOOLS=(
) )
src_prepare() { src_prepare() {
local pc
for pc in *.pc.in ; do
echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
done
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize elibtoolize
} }
@ -80,7 +75,7 @@ multilib_src_install() {
DESTDIR="${D}" \ DESTDIR="${D}" \
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
install install
multilib_is_native_abi && gen_usr_ldscript -a pcre gen_usr_ldscript -a pcre
} }
multilib_src_install_all() { multilib_src_install_all() {

View File

@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="4" EAPI="5"
inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
@ -27,10 +27,9 @@ REQUIRED_USE="readline? ( !libedit )
RDEPEND="bzip2? ( app-arch/bzip2 ) RDEPEND="bzip2? ( app-arch/bzip2 )
zlib? ( sys-libs/zlib ) zlib? ( sys-libs/zlib )
libedit? ( dev-libs/libedit ) libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline )" readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
virtual/pkgconfig virtual/pkgconfig"
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
RDEPEND="${RDEPEND} RDEPEND="${RDEPEND}
abi_x86_32? ( abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !<=app-emulation/emul-linux-x86-baselibs-20131008-r2
@ -43,7 +42,11 @@ MULTILIB_CHOST_TOOLS=(
/usr/bin/pcre-config /usr/bin/pcre-config
) )
#PATCHES=(
#)
src_prepare() { src_prepare() {
#epatch "${PATCHES[@]}"
sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
elibtoolize elibtoolize
} }
@ -76,7 +79,7 @@ multilib_src_install() {
DESTDIR="${D}" \ DESTDIR="${D}" \
$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
install install
multilib_is_native_abi && gen_usr_ldscript -a pcre gen_usr_ldscript -a pcre
} }
multilib_src_install_all() { multilib_src_install_all() {

View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata> <pkgmetadata>
<herd>base-system</herd> <maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
<use> <use>
<flag name="bzip2"> <flag name="bzip2">
Add support for pcregrep command to search within Add support for pcregrep command to search within

View File

@ -1,13 +0,0 @@
DEFINED_PHASES=configure install prepare
DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Perl-compatible regular expression library
EAPI=2
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +cxx doc unicode zlib static-libs
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
LICENSE=BSD
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 07e71b3b5690738ef7e8bc097077e00c eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=3614565220d06c3a77f44995b8af1cc3

View File

@ -1,14 +0,0 @@
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 ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
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
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.37.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=931b84a9ede32cf1de9ee6619537aefd

View File

@ -1,14 +0,0 @@
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 ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
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
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.37.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=a20fe6e7892245d79ee073ddc8522aba

View File

@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst preinst prepare test 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 ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig
DESCRIPTION=Perl-compatible regular expression library DESCRIPTION=Perl-compatible regular expression library
EAPI=4 EAPI=5
HOMEPAGE=http://www.pcre.org/ 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 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 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(-)] ) 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 ) REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3 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 SRC_URI=mirror://sourceforge/pcre/pcre-8.38.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 _eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=cdc807ef2f65fbf70a881b61e4c51dfc _md5_=d990004a40d36c82a3ac18322491ab6d

View File

@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst preinst prepare test 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 ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig
DESCRIPTION=Perl-compatible regular expression library DESCRIPTION=Perl-compatible regular expression library
EAPI=4 EAPI=5
HOMEPAGE=http://www.pcre.org/ 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 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 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(-)] ) 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 ) REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3 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 SRC_URI=mirror://sourceforge/pcre/pcre-8.38.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 _eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=739baeef2a43569d4cd69abac5551913 _md5_=7175720c6415650aed75abe863d0aeed

View File

@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst preinst prepare test 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 ) DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig
DESCRIPTION=Perl-compatible regular expression library DESCRIPTION=Perl-compatible regular expression library
EAPI=5 EAPI=5
HOMEPAGE=http://www.pcre.org/ HOMEPAGE=http://www.pcre.org/
@ -9,6 +9,6 @@ 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(-)] ) 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 ) REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3 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 SRC_URI=mirror://sourceforge/pcre/pcre-8.39.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.39.tar.bz2
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 _eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=7e82bb36facfbe93abf44f41b50a537f _md5_=8b917f2995ad1bda39b880bc326c1ff6