ALP-pool/xmlgraphics-batik
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync from SUSE:ALP:Source:Standard:1.0 xmlgraphics-batik revision 8be133fab5c464f0137b6eb81cd20f51

Browse Source
This commit is contained in:
Adrian Schröter 2024-03-05 18:16:08 +01:00
parent b9e87d33ce
commit 4dc5aff08d
6 changed files with 67 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
batik-build.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

BIN
batik-src-1.15.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
batik-src-1.17.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

47
xmlgraphics-batik-nosourcetarget.patch
View File

@ -1,47 +0,0 @@
--- batik-1.15/build.xml 2023-10-25 17:01:52.414466777 +0200
+++ batik-1.15/build.xml 2023-10-25 17:03:22.921750305 +0200
@@ -94,8 +94,6 @@
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
<property name="deprecation" value="on"/>
- <property name="javac.source" value="1.7"/>
- <property name="javac.target" value="1.7"/>
<property name="src" value="sources"/>
<property name="src-internal-codec" value="sources-internal-codec"/>
<property name="resources" value="resources"/>
@@ -712,7 +710,7 @@
<echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
- <javac source="${javac.source}" target="${javac.target}" destdir="${dest}" deprecation="${deprecation}"
+ <javac destdir="${dest}" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<src path="${testsrc}"/>
<src path="batik-test/src/main/java"/>
@@ -743,7 +741,7 @@
<echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
- <javac source="${javac.source}" target="${javac.target}" srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes" deprecation="${deprecation}"
+ <javac srcdir="${samples}/tests/resources/java/sources" destdir="${samples}/tests/resources/java/classes" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<classpath>
<pathelement location="${dest}"/>
@@ -753,7 +751,7 @@
</classpath>
</javac>
- <javac source="${javac.source}" target="${javac.target}" srcdir="${testresources}" destdir="${testresources}/classes" deprecation="${deprecation}"
+ <javac srcdir="${testresources}" destdir="${testresources}/classes" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<classpath>
<pathelement location="${dest}"/>
@@ -999,7 +997,7 @@
</target>
<target name="compile" depends="init, compile-prepare, compile-copy-resources" unless="compile.done">
- <javac source="${javac.source}" target="${javac.target}" destdir="${dest}" deprecation="${deprecation}"
+ <javac destdir="${dest}" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8"
includeAntRuntime="true">
<src path="batik-anim/src/main/java"/>

36
xmlgraphics-batik.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri Mar 1 19:02:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 1.17
* BATIK-1346: Allow configuration of rhino whitelist
* BATIK-1347: Switch to empty whitelist for rhino (CVE-2022-44730)
* BATIK-1349: Block loading external resource by default
(CVE-2022-44729)
- Upgrade to version 1.16
* Java 8 or later is minimum runtime required
* BATIK-1338: Block loading jar inside svg (CVE-2022-41704,
bsc#1204704)
* BATIK-1345: Restrict what java classes can be run thru rhino
(CVE-2022-42890, bsc#1204709)
- Removed patch:
* xmlgraphics-batik-nosourcetarget.patch
+ not needed since Java 8 compatibility is now the default
-------------------------------------------------------------------
Thu Feb 29 07:18:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Allow building with this spec-file on systems that don't have the
mvn_install_pom macros defined and release version requirement
of javapackages-local
- Require the xmlgraphics-commons, xml-commons-apis a rhino by their
names, since they are on the classpath by their location in the
scripts. Require them in the subpackages that contain the scripts.
- Require javapackages-tools in subpackages that contain scripts
created by jpackage_script macro. The scripts need functions from
javapackages-tools
-------------------------------------------------------------------
Wed Feb 21 10:55:53 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Wed Oct 25 15:07:46 UTC 2023 - Fridrich Strba <fstrba@suse.com>

42
xmlgraphics-batik.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xmlgraphics-batik
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2000-2008, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -17,10 +17,11 @@
#
%{!?mvn_install_pom:%global mvn_install_pom install -pm 0644}
%define _buildshell /bin/bash
%global classpath xmlgraphics-batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons
Name: xmlgraphics-batik
Version: 1.15
Version: 1.17
Release: 0
Summary: Scalable Vector Graphics for Java
License: Apache-2.0
@ -31,18 +32,14 @@ Source1: batik-build.tar.xz
Source7: %{name}.security.policy
Patch0: %{name}-nolinksinjavadoc.patch
Patch1: 0001-Fix-imageio-codec-lookup.patch
Patch2: %{name}-nosourcetarget.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
BuildRequires: javapackages-local
BuildRequires: rhino >= 1.6
BuildRequires: xml-commons-apis >= 1.3.03
BuildRequires: xmlgraphics-commons
Requires: %{name}-css = %{version}-%{release}
Requires: mvn(org.apache.xmlgraphics:xmlgraphics-commons)
Requires: mvn(xml-apis:xml-apis)
Requires: mvn(xml-apis:xml-apis-ext)
Obsoletes: batik < %{version}-%{release}
Provides: batik = %{version}-%{release}
BuildArch: noarch
@ -66,6 +63,10 @@ CSS component of the Apache Batik SVG manipulation and rendering library.
Summary: Batik SVG browser
Group: Productivity/Graphics/Vector Editors
Requires: %{name} = %{version}-%{release}
Requires: javapackages-tools
Requires: rhino
Requires: xml-commons-apis
Requires: xmlgraphics-commons
Obsoletes: batik-squiggle < %{version}-%{release}
Provides: batik-squiggle = %{version}-%{release}
@ -77,6 +78,10 @@ in the content and select text items in the image and much more.
Summary: Batik SVG pretty printer
Group: Productivity/Graphics/Vector Editors
Requires: %{name} = %{version}-%{release}
Requires: javapackages-tools
Requires: rhino
Requires: xml-commons-apis
Requires: xmlgraphics-commons
Obsoletes: batik-svgpp < %{version}-%{release}
Provides: batik-svgpp = %{version}-%{release}
@ -89,6 +94,10 @@ also be used to modify the DOCTYPE declaration on SVG files.
Summary: Batik SVG font converter
Group: Productivity/Graphics/Vector Editors
Requires: %{name} = %{version}-%{release}
Requires: javapackages-tools
Requires: rhino
Requires: xml-commons-apis
Requires: xmlgraphics-commons
Obsoletes: batik-ttf2svg < %{version}-%{release}
Provides: batik-ttf2svg = %{version}-%{release}
@ -102,6 +111,10 @@ rendered exactly the same on all systems.
Summary: Batik SVG rasterizer
Group: Productivity/Graphics/Vector Editors
Requires: %{name} = %{version}-%{release}
Requires: javapackages-tools
Requires: rhino
Requires: xml-commons-apis
Requires: xmlgraphics-commons
Obsoletes: batik-rasterizer < %{version}-%{release}
Provides: batik-rasterizer = %{version}-%{release}
@ -116,6 +129,10 @@ to be added easily.
Summary: Batik SVG slideshow
Group: Productivity/Graphics/Vector Editors
Requires: %{name} = %{version}-%{release}
Requires: javapackages-tools
Requires: rhino
Requires: xml-commons-apis
Requires: xmlgraphics-commons
Obsoletes: batik-slideshow < %{version}-%{release}
Provides: batik-slideshow = %{version}-%{release}
@ -147,21 +164,15 @@ Demonstrations and samples for %{name}.
find -name '*.class' -delete
find -name '*.jar' -delete
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch -P 0 -p1
%patch -P 1 -p1
cp -p %{SOURCE7} batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
cp -p %{SOURCE7} batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
# It's an uberjar, it shouldn't have requires
%pom_xpath_inject pom:dependency '<optional>true</optional>' batik-all
# eclipse expects xmlgraphics to be optional
%pom_xpath_inject 'pom:dependency[pom:artifactId="xmlgraphics-commons"]' '<optional>true</optional>' batik-css
%pom_remove_dep :batik-i18n batik-util
for pom in `find -mindepth 2 -name pom.xml -not -path ./batik-all/pom.xml`; do
%pom_add_plugin org.apache.felix:maven-bundle-plugin $pom "
<extensions>true</extensions>
@ -191,7 +202,6 @@ export OPT_JAR_LIST=:
-f build-batik.xml -Dtest.skip=true \
package
%{ant} \
-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
all-jar jars javadoc
%install