Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package guava for openSUSE:Factory checked in at 2021-05-11 23:04:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guava (Old) and /work/SRC/openSUSE:Factory/.guava.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guava" Tue May 11 23:04:14 2021 rev:5 rq:892204 version:30.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/guava/guava.changes 2019-12-10 22:41:18.181834050 +0100 +++ /work/SRC/openSUSE:Factory/.guava.new.2988/guava.changes 2021-05-11 23:04:20.948906020 +0200 @@ -1,0 +2,14 @@ +Mon May 10 14:59:41 UTC 2021 - Fridrich Strba <[email protected]> + +- Upgrade to guava 30.1.1 + * fixes bsc#1179926, CVE-2020-8908: temp directory creation + vulnerability in Guava versions prior to 30.0 +- Removed patch: + * guava-25.0-java8compat.patch + + the compatibility is handled in the upstream code +- Added patch: + * donotmock.patch + + patch @DoNotMock annotation occurrences in order to put them + in a format that our regex is able to identify and kill + +------------------------------------------------------------------- Old: ---- guava-25.0-java8compat.patch v25.0.tar.gz New: ---- donotmock.patch v30.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guava.spec ++++++ --- /var/tmp/diff_new_pack.A0ic1g/_old 2021-05-11 23:04:21.676902699 +0200 +++ /var/tmp/diff_new_pack.A0ic1g/_new 2021-05-11 23:04:21.680902681 +0200 @@ -1,7 +1,7 @@ # # spec file for package guava # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -17,7 +17,7 @@ Name: guava -Version: 25.0 +Version: 30.1.1 Release: 0 Summary: Google Core Libraries for Java License: Apache-2.0 AND CC0-1.0 @@ -25,7 +25,7 @@ URL: https://github.com/google/guava Source0: https://github.com/google/guava/archive/v%{version}.tar.gz Source1: %{name}-build.tar.xz -Patch0: %{name}-%{version}-java8compat.patch +Patch0: donotmock.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -74,11 +74,13 @@ %pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true</_nouses>" guava/pom.xml -%pom_remove_dep -r :animal-sniffer-annotations %pom_remove_dep -r :error_prone_annotations %pom_remove_dep -r :j2objc-annotations %pom_remove_dep -r org.checkerframework: +%pom_remove_dep -r :listenablefuture +%pom_remove_dep -r :failureaccess + annotations=$( find -name '*.java' \ | xargs grep -F -h \ @@ -107,7 +109,7 @@ %build mkdir -p lib build-jar-repository -s lib junit jsr-305 -%ant -Dtest.skip=true package javadoc +%{ant} -Dtest.skip=true package javadoc %install # jars @@ -118,7 +120,10 @@ # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom -%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -f %{name} +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +# We integrated this artifact in our main package +install -pm 0644 futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom +%add_maven_depmap %{name}/failureaccess.pom %{name}/%{name}.jar install -pm 0644 %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-testlib.pom %add_maven_depmap %{name}/%{name}-testlib.pom %{name}/%{name}-testlib.jar -f %{name}-testlib @@ -128,7 +133,7 @@ cp -r %{name}-testlib/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{name}-testlib %fdupes -s %{buildroot}%{_javadocdir} -%files -f .mfiles-guava +%files -f .mfiles %doc CONTRIBUTORS README* %license COPYING ++++++ donotmock.patch ++++++ --- guava-30.1/guava/src/com/google/common/graph/Traverser.java 2021-05-10 16:45:16.248098756 +0200 +++ guava-30.1/guava/src/com/google/common/graph/Traverser.java 2021-05-10 16:53:38.627252038 +0200 @@ -60,9 +60,7 @@ * @since 23.1 */ @Beta -@DoNotMock( - "Call forGraph or forTree, passing a lambda or a Graph with the desired edges (built with" - + " GraphBuilder)") +@DoNotMock("Call forGraph or forTree, passing a lambda or a Graph with the desired edges (built with GraphBuilder)") public abstract class Traverser<N> { private final SuccessorsFunction<N> successorFunction; --- guava-30.1/guava/src/com/google/common/util/concurrent/ClosingFuture.java 2021-05-10 16:45:16.256098806 +0200 +++ guava-30.1/guava/src/com/google/common/util/concurrent/ClosingFuture.java 2021-05-10 16:55:44.184040192 +0200 @@ -32,6 +32,7 @@ import static com.google.common.util.concurrent.Futures.immediateFuture; import static com.google.common.util.concurrent.Futures.nonCancellationPropagating; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; +import com.google.errorprone.annotations.DoNotMock; import static java.util.logging.Level.FINER; import static java.util.logging.Level.SEVERE; import static java.util.logging.Level.WARNING; @@ -1202,8 +1203,7 @@ * }</pre> */ // TODO(cpovirk): Use simple name instead of fully qualified after we stop building with JDK 8. - @com.google.errorprone.annotations.DoNotMock( - "Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.") + @DoNotMock("Use ClosingFuture.whenAllSucceed() or .whenAllComplete() instead.") public static class Combiner { private final CloseableList closeables = new CloseableList(); --- guava-30.1/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java 2021-05-10 16:45:16.256098806 +0200 +++ guava-30.1/guava/src/com/google/common/util/concurrent/ListeningExecutorService.java 2021-05-10 16:53:54.207349829 +0200 @@ -32,9 +32,7 @@ * @author Chris Povirk * @since 10.0 */ -@DoNotMock( - "Use TestingExecutors.sameThreadScheduledExecutor, or wrap a real Executor from " - + "java.util.concurrent.Executors with MoreExecutors.listeningDecorator") +@DoNotMock("Use TestingExecutors.sameThreadScheduledExecutor, or wrap a real Executor from java.util.concurrent.Executors with MoreExecutors.listeningDecorator") @GwtIncompatible public interface ListeningExecutorService extends ExecutorService { /** ++++++ guava-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2019-11-22 05:01:33.466849513 +0100 +++ new/common.xml 2021-05-10 17:05:58.631896847 +0200 @@ -3,7 +3,7 @@ <project name="common"> <property name="project.groupId" value="com.google.guava"/> - <property name="project.version" value="25.0-jre"/> + <property name="project.version" value="30.1.1-jre"/> <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guava/build.xml new/guava/build.xml --- old/guava/build.xml 2019-11-22 05:47:56.958861828 +0100 +++ new/guava/build.xml 2021-05-10 20:21:25.778710719 +0200 @@ -15,6 +15,7 @@ <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src"/> + <property name="build.srcDir.failureaccess" value="../futures/failureaccess/src"/> <property name="build.resourceDir" value="src"/> <property name="build.testOutputDir" value="${build.dir}/test-classes"/> <property name="build.testDir" value="test"/> @@ -51,6 +52,9 @@ <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> + <copy todir="${build.srcDir}"> + <fileset dir="${build.srcDir.failureaccess}"/> + </copy> <javac destdir="${build.outputDir}" nowarn="false" debug="true" @@ -177,6 +181,9 @@ <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> + <copy todir="${build.srcDir}"> + <fileset dir="${build.srcDir.failureaccess}"/> + </copy> <javadoc sourcepath="${build.srcDir}" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/guava-testlib/build.xml new/guava-testlib/build.xml --- old/guava-testlib/build.xml 2019-11-22 05:38:57.275763028 +0100 +++ new/guava-testlib/build.xml 2021-05-10 17:41:35.613376965 +0200 @@ -27,12 +27,14 @@ <!-- ====================================================================== --> <path id="build.classpath"> + <pathelement location="../futures/failureaccess/target/classes"/> <pathelement location="../guava/target/classes"/> <fileset dir="../lib"> <include name="**/*"/> </fileset> </path> <path id="build.test.classpath"> + <pathelement location="../futures/failureaccess/target/classes"/> <pathelement location="../guava/target/classes"/> <fileset dir="../lib"> <include name="**/*"/> ++++++ v25.0.tar.gz -> v30.1.1.tar.gz ++++++ ++++ 177304 lines of diff (skipped)
