Hello community,
here is the log from the commit of package xmlgraphics-batik for
openSUSE:Factory checked in at 2020-06-17 14:46:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-batik (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-batik"
Wed Jun 17 14:46:31 2020 rev:22 rq:815293 version:1.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-batik/xmlgraphics-batik.changes
2020-04-05 20:52:52.693144331 +0200
+++
/work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.3606/xmlgraphics-batik.changes
2020-06-17 14:47:04.948315969 +0200
@@ -1,0 +2,8 @@
+Tue Jun 16 13:00:51 UTC 2020 - Fridrich Strba <[email protected]>
+
+- Upgrade to version 1.13
+ * Fixes bsc#1172961, CVE-2019-17566
+ * BATIK-1276: Allow blocking of external resources
+ * BATIK-1275: Refactor shared resources.
+
+-------------------------------------------------------------------
Old:
----
batik-src-1.12.tar.gz
New:
----
batik-src-1.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-batik.spec ++++++
--- /var/tmp/diff_new_pack.vuXT0O/_old 2020-06-17 14:47:07.120323364 +0200
+++ /var/tmp/diff_new_pack.vuXT0O/_new 2020-06-17 14:47:07.120323364 +0200
@@ -19,7 +19,7 @@
%global classpath
xmlgraphics-batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons
Name: xmlgraphics-batik
-Version: 1.12
+Version: 1.13
Release: 0
Summary: Scalable Vector Graphics for Java
License: Apache-2.0
@@ -222,7 +222,7 @@
cp -p batik-all/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-all.pom
%add_maven_depmap %{name}-all.pom %{name}-all.jar
-for i in anim awt-util bridge codec constants dom ext extension gvt i18n
parser script svg-dom svgbrowser svggen svgrasterizer swing transcoder util
gui-util xml;
+for i in anim awt-util bridge codec constants dom ext extension gvt i18n
parser script shared-resources svg-dom svgbrowser svggen svgrasterizer swing
transcoder util gui-util xml;
do
cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
++++++ batik-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/batik-shared-resources/build.xml
new/batik-shared-resources/build.xml
--- old/batik-shared-resources/build.xml 1970-01-01 01:00:00.000000000
+0100
+++ new/batik-shared-resources/build.xml 2020-06-16 15:51:37.835856918
+0200
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="batik-shared-resources" default="package" basedir=".">
+
+ <!-- ======================================================================
-->
+ <!-- Build environment properties
-->
+ <!-- ======================================================================
-->
+
+ <include file="../common.xml"/>
+ <property file="build.properties"/>
+
+ <property name="project.artifactId" value="${ant.project.name}"/>
+
+ <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
+ <property name="build.dir" value="target"/>
+ <property name="build.outputDir" value="${build.dir}/classes"/>
+ <property name="build.srcDir" value="src/main/java"/>
+ <property name="build.resourceDir" value="src/main/resources"/>
+ <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
+ <property name="build.testDir" value="src/test/java"/>
+ <property name="build.testResourceDir" value="src/test/resources"/>
+ <property name="test.reports" value="${build.dir}/test-reports"/>
+ <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+ <!-- ======================================================================
-->
+ <!-- Defining classpaths
-->
+ <!-- ======================================================================
-->
+
+ <path id="build.classpath"/>
+ <path id="build.test.classpath"/>
+
+ <!-- ======================================================================
-->
+ <!-- Cleaning up target
-->
+ <!-- ======================================================================
-->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${build.outputDir}"/>
+ <mkdir dir="${build.outputDir}/META-INF"/>
+ <copy todir="${build.outputDir}/META-INF">
+ <fileset dir="${build.resourceDir}">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Test-compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile-tests"
+ depends="compile"
+ description="Compile the test code"
+ unless="test.skip">
+ <mkdir dir="${build.testOutputDir}"/>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Run all tests
-->
+ <!-- ======================================================================
-->
+
+ <target name="test"
+ depends="compile-tests, junit-missing"
+ unless="junit.skipped"
+ description="Run the test cases"/>
+
+ <target name="test-junit-present">
+ <available classname="junit.framework.Test" property="junit.present"
classpathref="build.test.classpath"/>
+ </target>
+
+ <target name="test-junit-status"
+ depends="test-junit-present">
+ <condition property="junit.missing">
+ <and>
+ <isfalse value="${junit.present}"/>
+ <isfalse value="${test.skip}"/>
+ </and>
+ </condition>
+ <condition property="junit.skipped">
+ <or>
+ <isfalse value="${junit.present}"/>
+ <istrue value="${test.skip}"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="junit-missing"
+ depends="test-junit-status"
+ if="junit.missing">
+ <echo>=================================== WARNING
===================================</echo>
+ <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib
directory. Tests not executed.</echo>
+
<echo>===============================================================================</echo>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Javadoc target
-->
+ <!-- ======================================================================
-->
+
+ <target name="javadoc" description="Generates the Javadoc of the
application"/>
+
+ <!-- ======================================================================
-->
+ <!-- Package target
-->
+ <!-- ======================================================================
-->
+
+ <target name="package" depends="compile,test" description="Package the
application">
+ <jar jarfile="${build.dir}/${build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${build.outputDir}"
+ excludes="**/package.html">
+ <manifest>
+ <attribute name="Bundle-Description" value="Batik shared
resources"/>
+ <attribute name="Bundle-DocURL"
value="${project.organization.url}"/>
+ <attribute name="Bundle-License" value="${project.license}"/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name"
value="${project.groupId}:${project.artifactId}"/>
+ <attribute name="Bundle-SymbolicName"
value="org.apache.batik.shared-resources"/>
+ <attribute name="Bundle-Vendor"
value="${project.organization.name}"/>
+ <attribute name="Bundle-Version" value="${bundle.version}"/>
+ <attribute name="JavaPackages-ArtifactId"
value="${project.artifactId}"/>
+ <attribute name="JavaPackages-GroupId"
value="${project.groupId}"/>
+ <attribute name="JavaPackages-Version"
value="${project.version}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- A dummy target for the package named after the type it creates
-->
+ <!-- ======================================================================
-->
+
+ <target name="jar" depends="package" description="Builds the jar for the
application"/>
+
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/build-batik.xml new/build-batik.xml
--- old/build-batik.xml 2020-04-03 11:08:59.604169565 +0200
+++ new/build-batik.xml 2020-06-16 15:41:45.919843677 +0200
@@ -7,6 +7,7 @@
<!-- ======================================================================
-->
<target name="clean" description="Clean the output directory">
+ <ant antfile="build.xml" dir="batik-shared-resources" target="clean"/>
<ant antfile="build.xml" dir="batik-constants" target="clean"/>
<ant antfile="build.xml" dir="batik-i18n" target="clean"/>
<ant antfile="build.xml" dir="batik-util" target="clean"/>
@@ -44,6 +45,7 @@
<!-- ======================================================================
-->
<target name="compile" description="Compile the code">
+ <ant antfile="build.xml" dir="batik-shared.resources" target="compile"/>
<ant antfile="build.xml" dir="batik-constants" target="compile"/>
<ant antfile="build.xml" dir="batik-i18n" target="compile"/>
<ant antfile="build.xml" dir="batik-util" target="compile"/>
@@ -81,6 +83,7 @@
<!-- ======================================================================
-->
<target name="compile-tests" description="Compile the test code">
+ <ant antfile="build.xml" dir="batik-shared-resources"
target="compile-tests"/>
<ant antfile="build.xml" dir="batik-constants" target="compile-tests"/>
<ant antfile="build.xml" dir="batik-i18n" target="compile-tests"/>
<ant antfile="build.xml" dir="batik-util" target="compile-tests"/>
@@ -118,6 +121,7 @@
<!-- ======================================================================
-->
<target name="test" description="Run the test cases">
+ <ant antfile="build.xml" dir="batik-shared-resources" target="test"/>
<ant antfile="build.xml" dir="batik-constants" target="test"/>
<ant antfile="build.xml" dir="batik-i18n" target="test"/>
<ant antfile="build.xml" dir="batik-util" target="test"/>
@@ -155,6 +159,7 @@
<!-- ======================================================================
-->
<target name="javadoc" description="Generates the Javadoc of the
application">
+ <ant antfile="build.xml" dir="batik-shared-resources" target="javadoc"/>
<ant antfile="build.xml" dir="batik-constants" target="javadoc"/>
<ant antfile="build.xml" dir="batik-i18n" target="javadoc"/>
<ant antfile="build.xml" dir="batik-util" target="javadoc"/>
@@ -192,6 +197,7 @@
<!-- ======================================================================
-->
<target name="package" description="Package the application">
+ <ant antfile="build.xml" dir="batik-shared-resources" target="package"/>
<ant antfile="build.xml" dir="batik-constants" target="package"/>
<ant antfile="build.xml" dir="batik-i18n" target="package"/>
<ant antfile="build.xml" dir="batik-util" target="package"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2020-04-03 09:23:27.560459777 +0200
+++ new/common.xml 2020-06-16 14:47:45.815771195 +0200
@@ -3,7 +3,7 @@
<project name="common" basedir=".">
<property file="build.properties"/>
- <property name="project.version" value="1.12"/>
+ <property name="project.version" value="1.13"/>
<property name="project.groupId" value="org.apache.xmlgraphics"/>
<property name="project.organization.name" value="Apache Software
Foundation"/>
<property name="project.organization.url" value="http://www.apache.org/"/>
++++++ batik-src-1.12.tar.gz -> batik-src-1.13.tar.gz ++++++
/work/SRC/openSUSE:Factory/xmlgraphics-batik/batik-src-1.12.tar.gz
/work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.3606/batik-src-1.13.tar.gz
differ: char 21, line 1
