Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package snakeyaml for openSUSE:Factory
checked in at 2022-10-18 12:45:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snakeyaml (Old)
and /work/SRC/openSUSE:Factory/.snakeyaml.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snakeyaml"
Tue Oct 18 12:45:12 2022 rev:6 rq:1029656 version:1.33
Changes:
--------
--- /work/SRC/openSUSE:Factory/snakeyaml/snakeyaml.changes 2022-09-07
11:06:52.144533480 +0200
+++ /work/SRC/openSUSE:Factory/.snakeyaml.new.2275/snakeyaml.changes
2022-10-18 12:45:37.617809396 +0200
@@ -1,0 +2,33 @@
+Tue Oct 18 07:17:01 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Fix --with tests build
+
+-------------------------------------------------------------------
+Mon Oct 17 17:05:58 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to upstream release 1.33
+ * Fixes
+ + bsc#1204173
+ + bsc#1203154 (CVE-2022-38752)
+ * Changes of 1.33
+ + Remove some deprecated unused methods
+ + Fix #555: Fixed Github actions
+ + Fix #553: LoaderOptions.setCodePointLimit() not honored by
+ loadAll()
+ + Fix #554: Always emit numberish strings with quotes
+ * Changes of 1.32
+ + Fix #543: show the configuration in the test
+ + Fix #531: provide configuration to fail early
+ + Fix #547: Set the limit for incoming data to prevent a CVE
+ report in NIST. By default it is 3MB
+ + Fix #544: Support unescaped unicode characters for
+ double-quoted scalars
+- Modified patches:
+ * 0001-replace-bundled-base64coder-with-java.util.Base64.patch
+ * 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
+ + rebase
+- Added patch:
+ * 0003-Fix-ReaderBomTest.patch
+ + remove two tests that require unicode boms
+
+-------------------------------------------------------------------
@@ -9 +41,0 @@
- + bsc#1203154 (CVE-2022-38752)
Old:
----
snakeyaml-1.31.tar.bz2
New:
----
0003-Fix-ReaderBomTest.patch
snakeyaml-1.33.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snakeyaml.spec ++++++
--- /var/tmp/diff_new_pack.g8zDId/_old 2022-10-18 12:45:38.305810962 +0200
+++ /var/tmp/diff_new_pack.g8zDId/_new 2022-10-18 12:45:38.309810971 +0200
@@ -16,10 +16,10 @@
#
-%global vertag 04401a88fa9b
+%global vertag 7f5106920d77
%bcond_with tests
Name: snakeyaml
-Version: 1.31
+Version: 1.33
Release: 0
Summary: YAML parser and emitter for the Java programming language
License: Apache-2.0
@@ -36,6 +36,7 @@
Patch0: 0001-replace-bundled-base64coder-with-java.util.Base64.patch
# We don't have gdata-java, use commons-codec instead
Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
+Patch2: 0003-Fix-ReaderBomTest.patch
BuildRequires: ant
BuildRequires: apache-commons-codec
BuildRequires: fdupes
@@ -80,6 +81,7 @@
cp %{SOURCE1} build.xml
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%pom_remove_plugin :cobertura-maven-plugin
%pom_remove_plugin :maven-changes-plugin
@@ -93,11 +95,48 @@
# Replacement for bundled gdata-java-client
%pom_add_dep commons-codec:commons-codec
+# Unnecessary test-time only dependency
+%pom_remove_dep joda-time:joda-time
+rm -rf src/test/java/examples/jodatime
+%pom_remove_dep org.projectlombok:lombok
+%pom_remove_dep org.apache.velocity:velocity-engine-core
+
# fails in rpmbuild only due to different locale
rm
src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
# fails after unbundling
rm src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
+# Tests using dependencies we don't have/have removed
+rm src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java
+rm
src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java
+rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java
+rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java
+rm src/test/java/org/yaml/snakeyaml/issues/issue527/Fuzzy47047Test.java
+rm src/test/java/org/yaml/snakeyaml/issues/issue530/Fuzzy47039Test.java
+rm src/test/java/org/yaml/snakeyaml/issues/issue543/Fuzzer50355Test.java
+rm src/test/java/org/yaml/snakeyaml/issues/issue525/FuzzyStackOverflowTest.java
+rm src/test/java/org/yaml/snakeyaml/issues/issue529/Fuzzy47028Test.java
+rm src/test/java/org/yaml/snakeyaml/issues/issue531/Fuzzy47081Test.java
+rm src/test/java/org/yaml/snakeyaml/issues/issue526/Fuzzy47027Test.java
+
+# Problematic test resources for maven-resources-plugin 3.2
+rm src/test/resources/issues/issue99.jpeg
+rm src/test/resources/reader/unicode-16be.txt
+rm src/test/resources/reader/unicode-16le.txt
+rm src/test/resources/pyyaml/spec-05-01-utf16be.data
+rm src/test/resources/pyyaml/spec-05-01-utf16le.data
+rm src/test/resources/pyyaml/spec-05-02-utf16le.data
+rm src/test/resources/pyyaml/odd-utf16.stream-error
+rm src/test/resources/pyyaml/invalid-character.loader-error
+rm src/test/resources/pyyaml/invalid-character.stream-error
+rm src/test/resources/pyyaml/invalid-utf8-byte.loader-error
+rm src/test/resources/pyyaml/invalid-utf8-byte.stream-error
+rm src/test/resources/pyyaml/empty-document-bug.data
+rm src/test/resources/pyyaml/spec-05-02-utf16be.data
+rm -rf src/test/resources/fuzzer/
+# Test using the jpeg data removed above
+rm src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
+
# convert CR+LF to LF
sed -i 's/\r//g' LICENSE.txt
++++++ 0001-replace-bundled-base64coder-with-java.util.Base64.patch ++++++
++++ 888 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/snakeyaml/0001-replace-bundled-base64coder-with-java.util.Base64.patch
++++ and
/work/SRC/openSUSE:Factory/.snakeyaml.new.2275/0001-replace-bundled-base64coder-with-java.util.Base64.patch
++++++ 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch ++++++
++++ 1038 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/snakeyaml/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
++++ and
/work/SRC/openSUSE:Factory/.snakeyaml.new.2275/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
++++++ 0003-Fix-ReaderBomTest.patch ++++++
>From 6690e47dfc0d46b4923a5b2c55279782b95a335a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@bluewin.ch>
Date: Wed, 12 Oct 2022 11:05:10 +0200
Subject: [PATCH 3/3] Fix ReaderBomTest
---
.../yaml/snakeyaml/reader/ReaderBomTest.java | 37 -------------------
1 file changed, 37 deletions(-)
diff --git a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
index c7396c2c..375bb756 100644
--- a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
+++ b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
@@ -77,41 +77,4 @@ public class ReaderBomTest extends TestCase {
input.close();
}
- public void testUnicodeLeBom() throws IOException {
- File file = new File("src/test/resources/reader/unicode-16le.txt");
- assertTrue("Test file not found: " + file.getAbsolutePath(),
file.exists());
- InputStream input = new FileInputStream(file);
- UnicodeReader unicodeReader = new UnicodeReader(input);
- StreamReader reader = new StreamReader(unicodeReader);
- assertEquals('t', reader.peek());
- reader.forward(1);
- assertEquals('e', reader.peek());
- reader.forward(1);
- assertEquals('s', reader.peek());
- reader.forward(1);
- assertEquals('t', reader.peek());
- reader.forward(1);
- assertEquals('\u0000', reader.peek());
- assertEquals(StandardCharsets.UTF_16LE,
Charset.forName(unicodeReader.getEncoding()));
- input.close();
- }
-
- public void testUnicodeBeBom() throws IOException {
- File file = new File("src/test/resources/reader/unicode-16be.txt");
- assertTrue("Test file not found: " + file.getAbsolutePath(),
file.exists());
- InputStream input = new FileInputStream(file);
- UnicodeReader unicodeReader = new UnicodeReader(input);
- StreamReader reader = new StreamReader(unicodeReader);
- assertEquals('t', reader.peek());
- reader.forward(1);
- assertEquals('e', reader.peek());
- reader.forward(1);
- assertEquals('s', reader.peek());
- reader.forward(1);
- assertEquals('t', reader.peek());
- reader.forward(1);
- assertEquals('\u0000', reader.peek());
- assertEquals(StandardCharsets.UTF_16BE,
Charset.forName(unicodeReader.getEncoding()));
- input.close();
- }
}
--
2.37.3
++++++ snakeyaml-1.31.tar.bz2 -> snakeyaml-1.33.tar.bz2 ++++++
++++ 107586 lines of diff (skipped)
++++++ snakeyaml-build.xml ++++++
--- /var/tmp/diff_new_pack.g8zDId/_old 2022-10-18 12:45:39.141812866 +0200
+++ /var/tmp/diff_new_pack.g8zDId/_new 2022-10-18 12:45:39.145812875 +0200
@@ -12,7 +12,7 @@
<property name="project.description" value="YAML 1.1 parser and emitter for
Java"/>
<property name="project.groupId" value="org.yaml"/>
<property name="project.artifactId" value="snakeyaml"/>
- <property name="project.version" value="1.31"/>
+ <property name="project.version" value="1.33"/>
<property name="bundle.version" value="${project.version}.0"/>
<property name="compiler.source" value="1.8"/>
@@ -121,6 +121,8 @@
<mkdir dir="${test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true"
fork="true" dir=".">
<sysproperty key="basedir" value="."/>
+ <env key="EnvironmentKey1" value="EnvironmentValue1"/>
+ <env key="EnvironmentEmpty" value=""/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
