diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
| commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
| tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-libs/re2 | |
| parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) | |
gentoo resync : 30.05.2020
Diffstat (limited to 'dev-libs/re2')
| -rw-r--r-- | dev-libs/re2/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch | 27 | ||||
| -rw-r--r-- | dev-libs/re2/re2-0.2020.05.01.ebuild | 5 |
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest index d6f01ecc87d1..51c956c52df4 100644 --- a/dev-libs/re2/Manifest +++ b/dev-libs/re2/Manifest @@ -1,7 +1,8 @@ +AUX 0.2020.05.01-test-memory-budget.patch 1104 BLAKE2B 0f661f83d0adbe9c0932f01f6751ed64a00e4669e6c4a865a52484b85fff352b000cfcf798147fbe9c950f8792381b93f40c7913fde824b0bde8596ccfd2ed8b SHA512 28cb8aba6e9d74e8e63e93e4d76f85f0580ca87d70e45f15f8fa7f4fd06523c0c41b7fb50523c69c4f0fdd3691cbffb0683787cac902c1f39350c0f62ec48da2 DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77 DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed7c6813b4530059659e794a7a7a3ad17d6ee35b5456302d627a0524fc78151b60ed9c546c1baab699231554a0dd SHA512 b3f2ec675fbc2ab18fc4de7b8c077f110010fd4a7502eea3d802d3706681b523db551edd80c2ff188457169471899084a6b21937154ab2288ee9ac123a2b7014 DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac EBUILD re2-0.2019.12.01.ebuild 1352 BLAKE2B 4e8b259399c02b16f7cb0ba21aba52e43c629362846f2dba1cd47cb18006938cd1b1e6943c29b64cc19581f4b0607f2478700939eb0caa0573471b3fe8db1180 SHA512 93e6743627fe5aeb06b6dbfeae132237ffd32a40c1eb1532f21dc500206f49e1620aa7a3cbd887b4e70c4023535639ada9a638d2f6c68656725dacfbeca8d932 EBUILD re2-0.2020.04.01.ebuild 1339 BLAKE2B 5809792c1217f49d50811a794686b0bb74faa93933dfad7a19067595434457e1fed2809414011b8d7039ec1768318a6c43a7f70e9eb1d1c23208f1874f9d0164 SHA512 98ab674b62c8b9a8389d39d9fde1d97de275a5b64b868b33ac0b49023d7351a9b5ca39280fb1b2a318aa01cbbc4aaa8db17f4d760223d7c471bb3b8f36ab9c14 -EBUILD re2-0.2020.05.01.ebuild 1339 BLAKE2B a9b55f36f3b198519e97d943f4401de1ae3f6db40d298cd03c40b357c518d270c101189ab390d8ef17b56d1299fcc531cfd304d2a5eedde26510745676c7492d SHA512 7f3e82732ba7cbcfd3f99a36ca3d3b998b437e9cc1d0961d81fcdc69e36b0c3e7049dd00d689734ce63ee8e504e6aa72d28505565c41f8350b2b74aa947d89d3 +EBUILD re2-0.2020.05.01.ebuild 1411 BLAKE2B 6d6a4909f6ce27caf58923aaa7902bfa523aba47a7a47fbcac89cbe63442cc8767f422ea9dbdd31cc9a0d117a714e2bf55cad249327758c9467caf7e2ccef197 SHA512 f7cab9684154ddf8430864de4236524f3ed117d91759df3e141fe12277241f91655012dfc394e001f209213918b57b26472f88aa30ac29b778f042e5529c924a MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8 diff --git a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch new file mode 100644 index 000000000000..3e62934153c1 --- /dev/null +++ b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch @@ -0,0 +1,27 @@ +From bde1ea09550a61b4a092cdf0e3ba8dca4200947a Mon Sep 17 00:00:00 2001 +From: Paul Wankadia <junyer@google.com> +Date: Sun, 10 May 2020 07:12:35 -0700 +Subject: [PATCH] Lower the memory budget in TestCompile.InsufficientMemory. + +Fixes #256. + +Change-Id: I975c5f6f7a12dc86fedc0f3ab35f16295c18a7e8 +Reviewed-on: https://code-review.googlesource.com/c/re2/+/56150 +Reviewed-by: Paul Wankadia <junyer@google.com> +--- + re2/testing/compile_test.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/re2/testing/compile_test.cc b/re2/testing/compile_test.cc +index 4598aa64..2096e2f0 100644 +--- a/re2/testing/compile_test.cc ++++ b/re2/testing/compile_test.cc +@@ -236,7 +236,7 @@ TEST(TestCompile, InsufficientMemory) { + "^(?P<name1>[^\\s]+)\\s+(?P<name2>[^\\s]+)\\s+(?P<name3>.+)$", + Regexp::LikePerl, NULL); + EXPECT_TRUE(re != NULL); +- Prog* prog = re->CompileToProg(920); ++ Prog* prog = re->CompileToProg(850); + // If the memory budget has been exhausted, compilation should fail + // and return NULL instead of trying to do anything with NoMatch(). + EXPECT_TRUE(prog == NULL); diff --git a/dev-libs/re2/re2-0.2020.05.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild index c0c9da9e15fc..b4218b133025 100644 --- a/dev-libs/re2/re2-0.2020.05.01.ebuild +++ b/dev-libs/re2/re2-0.2020.05.01.ebuild @@ -18,7 +18,7 @@ LICENSE="BSD" # https://abi-laboratory.pro/tracker/timeline/re2/ SONAME="7" SLOT="0/${SONAME}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="icu" RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )" @@ -31,6 +31,9 @@ DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt ) HTML_DOCS=( doc/syntax.html ) src_prepare() { + local PATCHES=( + "${FILESDIR}"/0.2020.05.01-test-memory-budget.patch + ) default grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch" if use icu; then |