Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package snakeyaml for openSUSE:Factory checked in at 2021-05-15 23:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snakeyaml (Old) and /work/SRC/openSUSE:Factory/.snakeyaml.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snakeyaml" Sat May 15 23:16:24 2021 rev:3 rq:893328 version:1.28 Changes: -------- --- /work/SRC/openSUSE:Factory/snakeyaml/snakeyaml.changes 2019-11-11 13:00:55.277724053 +0100 +++ /work/SRC/openSUSE:Factory/.snakeyaml.new.2988/snakeyaml.changes 2021-05-15 23:17:25.360446692 +0200 @@ -1,0 +2,12 @@ +Sat May 15 17:33:53 UTC 2021 - Fridrich Strba <fst...@suse.com> + +- Upgrade to upstream release 1.28 + * Fixes bsc#1186088, CVE-2017-18640 +- Removed patch: + * 0003-fix-broken-test.patch + + not needed since integrated upstream +- Modified patch: + * 0001-replace-bundled-base64coder-with-java.util.Base64.patch + * rediff to changed context + +------------------------------------------------------------------- Old: ---- 0003-fix-broken-test.patch snakeyaml-1.25.tar.bz2 New: ---- snakeyaml-1.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snakeyaml.spec ++++++ --- /var/tmp/diff_new_pack.afODUX/_old 2021-05-15 23:17:25.820444681 +0200 +++ /var/tmp/diff_new_pack.afODUX/_new 2021-05-15 23:17:25.824444661 +0200 @@ -1,7 +1,7 @@ # # spec file for package snakeyaml # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%global vertag 8450addf3473 +%global vertag b28f0b4d87c6 %bcond_with tests Name: snakeyaml -Version: 1.25 +Version: 1.28 Release: 0 Summary: YAML parser and emitter for the Java programming language License: Apache-2.0 @@ -36,9 +36,6 @@ 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 -# Fix a broken test, change backported from upstream: -# https://bitbucket.org/asomov/snakeyaml/commits/345408c -Patch2: 0003-fix-broken-test.patch BuildRequires: ant BuildRequires: apache-commons-codec BuildRequires: base64coder @@ -84,7 +81,6 @@ cp %{SOURCE1} build.xml %patch0 -p1 %patch1 -p1 -%patch2 -p1 %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-changes-plugin @@ -108,9 +104,6 @@ # convert CR+LF to LF sed -i 's/\r//g' LICENSE.txt -%pom_remove_dep org.springframework -rm -r src/test/java/org/yaml/snakeyaml/issues/issue9 - %build mkdir -p lib build-jar-repository -s lib base64coder commons-codec ++++++ 0001-replace-bundled-base64coder-with-java.util.Base64.patch ++++++ --- /var/tmp/diff_new_pack.afODUX/_old 2021-05-15 23:17:25.840444578 +0200 +++ /var/tmp/diff_new_pack.afODUX/_new 2021-05-15 23:17:25.840444578 +0200 @@ -27,13 +27,13 @@ + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <maven.javadoc.failOnError>false</maven.javadoc.failOnError> - <spring.version>3.2.17.RELEASE</spring.version> <maven-bundle-plugin.version>3.5.0</maven-bundle-plugin.version> + <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version><!-- for Github CI --> diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java index bd022cc..217835d 100644 --- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java +++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java -@@ -17,6 +17,7 @@ package org.yaml.snakeyaml.constructor; +@@ -17,6 +17,7 @@ import java.math.BigInteger; import java.util.ArrayList; @@ -41,15 +41,15 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Iterator; -@@ -30,7 +31,6 @@ import java.util.regex.Matcher; - import java.util.regex.Pattern; +@@ -31,7 +32,6 @@ + import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.error.YAMLException; -import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.NodeId; -@@ -313,7 +313,7 @@ public class SafeConstructor extends BaseConstructor { +@@ -348,7 +348,7 @@ // Ignore white spaces for base64 encoded scalar String noWhiteSpaces = constructScalar((ScalarNode) node).toString().replaceAll("\\s", ""); @@ -373,7 +373,7 @@ index 2cc15d9..e5ac480 100644 --- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java +++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java -@@ -19,6 +19,7 @@ import java.io.UnsupportedEncodingException; +@@ -19,6 +19,7 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.Arrays; @@ -381,7 +381,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; -@@ -33,7 +34,6 @@ import java.util.regex.Pattern; +@@ -33,7 +34,6 @@ import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.error.YAMLException; @@ -389,7 +389,7 @@ import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.Tag; import org.yaml.snakeyaml.reader.StreamReader; -@@ -131,7 +131,7 @@ class SafeRepresenter extends BaseRepresenter { +@@ -131,7 +131,7 @@ if (!checkValue.equals(value)) { throw new YAMLException("invalid string value has occurred"); } @@ -398,7 +398,7 @@ } catch (UnsupportedEncodingException e) { throw new YAMLException(e); } -@@ -433,7 +433,7 @@ class SafeRepresenter extends BaseRepresenter { +@@ -433,7 +433,7 @@ protected class RepresentByteArray implements Represent { public Node representData(Object data) { @@ -490,7 +490,7 @@ index e425f25..a0c4f6a 100644 --- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java +++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java -@@ -18,6 +18,7 @@ package org.yaml.snakeyaml.issues.issue99; +@@ -18,6 +18,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -498,7 +498,7 @@ import java.util.Map; import junit.framework.TestCase; -@@ -27,7 +28,6 @@ import org.yaml.snakeyaml.Yaml; +@@ -27,7 +28,6 @@ import org.yaml.snakeyaml.YamlDocument; import org.yaml.snakeyaml.constructor.AbstractConstruct; import org.yaml.snakeyaml.constructor.Constructor; @@ -506,7 +506,7 @@ import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.nodes.ScalarNode; import org.yaml.snakeyaml.nodes.Tag; -@@ -50,7 +50,7 @@ public class YamlBase64Test extends TestCase { +@@ -50,7 +50,7 @@ all = all + lines[i].trim(); } // System.out.println(all); @@ -515,7 +515,7 @@ assertEquals(3737, decoded.length); checkBytes(decoded); } -@@ -122,7 +122,7 @@ public class YamlBase64Test extends TestCase { +@@ -122,7 +122,7 @@ public Object construct(Node node) { String contentWithNewLines = constructScalar((ScalarNode) node).toString(); String noNewLines = contentWithNewLines.replaceAll("\\s", ""); ++++++ snakeyaml-1.25.tar.bz2 -> snakeyaml-1.28.tar.bz2 ++++++ ++++ 10979 lines of diff (skipped) ++++++ snakeyaml-build.xml ++++++ --- /var/tmp/diff_new_pack.afODUX/_old 2021-05-15 23:17:26.256442443 +0200 +++ /var/tmp/diff_new_pack.afODUX/_new 2021-05-15 23:17:26.260442422 +0200 @@ -12,10 +12,10 @@ <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.25"/> + <property name="project.version" value="1.28"/> <property name="bundle.version" value="${project.version}.0"/> - <property name="compiler.source" value="1.6"/> + <property name="compiler.source" value="1.7"/> <property name="compiler.target" value="${compiler.source}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> @@ -186,6 +186,7 @@ packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" + encoding="UTF-8" source="${compiler.source}" verbose="false" version="true" @@ -199,7 +200,7 @@ nohelp="false" nonavbar="false" serialwarn="false" - charset="ISO-8859-1" + charset="UTF-8" linksource="false" breakiterator="false"> <classpath refid="build.classpath"/>
