| 1 |
commit: dab318c383567c82677d3edeb6efd34f07d60cc2 |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Fri Mar 25 14:25:39 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 12:20:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab318c3 |
| 7 |
|
| 8 |
dev-java/snakeyaml: Add snakeyaml-1.30-fix-test-check.patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/835988 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/24745 |
| 14 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/snakeyaml-1.30-fix-test-check.patch | 18 ++++++++++++++++++ |
| 17 |
dev-java/snakeyaml/snakeyaml-1.30.ebuild | 7 +++++++ |
| 18 |
2 files changed, 25 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..f2742f658fa2 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-java/snakeyaml/files/snakeyaml-1.30-fix-test-check.patch |
| 25 |
@@ -0,0 +1,18 @@ |
| 26 |
+--- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java |
| 27 |
++++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java |
| 28 |
+@@ -69,7 +69,7 @@ public class BillionLaughsAttackTest { |
| 29 |
+ map.toString(); |
| 30 |
+ fail("Expected overflow"); |
| 31 |
+ } catch (Throwable e) { |
| 32 |
+- assertTrue(e.getMessage().contains("heap")); |
| 33 |
++ assertTrue("Catched exception " + e + " is not an instance of OutOfMemoryError", e instanceof OutOfMemoryError); |
| 34 |
+ } |
| 35 |
+ } |
| 36 |
+ |
| 37 |
+@@ -94,4 +94,4 @@ public class BillionLaughsAttackTest { |
| 38 |
+ assertNotNull(map); |
| 39 |
+ } |
| 40 |
+ |
| 41 |
+-} |
| 42 |
+\ No newline at end of file |
| 43 |
++} |
| 44 |
|
| 45 |
diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild |
| 46 |
index 97e755428cc8..6ae8d5e2d63e 100644 |
| 47 |
--- a/dev-java/snakeyaml/snakeyaml-1.30.ebuild |
| 48 |
+++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild |
| 49 |
@@ -38,6 +38,8 @@ RDEPEND=" |
| 50 |
>=virtual/jre-1.8:* |
| 51 |
" |
| 52 |
|
| 53 |
+# https://bitbucket.org/snakeyaml/snakeyaml/pull-requests/7 |
| 54 |
+PATCHES=( "${FILESDIR}/snakeyaml-1.30-fix-test-check.patch" ) |
| 55 |
DOCS=( README.md ) |
| 56 |
|
| 57 |
S="${WORKDIR}/snakeyaml-snakeyaml-49227c24d741/" |
| 58 |
@@ -48,6 +50,11 @@ JAVA_TEST_GENTOO_CLASSPATH="joda-time,junit-4,velocity" |
| 59 |
JAVA_TEST_SRC_DIR="src/test/java" |
| 60 |
JAVA_TEST_RESOURCE_DIRS="src/test/resources" |
| 61 |
|
| 62 |
+src_prepare() { |
| 63 |
+ default |
| 64 |
+ java-utils-2_src_prepare |
| 65 |
+} |
| 66 |
+ |
| 67 |
src_test() { |
| 68 |
export EnvironmentKey1="EnvironmentValue1" |
| 69 |
export EnvironmentEmpty="" |
Archives