rpms/batik
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 1.9

Browse Source 
- Fixes CVE-2017-5662
This commit is contained in:
Michael Simacek 2017-04-26 13:25:08 +02:00
parent 7b6ba312d6
commit 9baf33d195
15 changed files with 125 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ batik-1.7-orbit-manifests.tar.gz
/batik-repack-1.8pre.zip
/batik-repack-1.8.zip
/batik-src-1.8.zip
/batik-src-1.9.zip

24
batik-fix-codec-lookup.patch → 0001-Fix-imageio-codec-lookup.patch
View File

@ -1,17 +1,17 @@
From d4151ffc387e52f77f94115fd655224193cec1fd Mon Sep 17 00:00:00 2001
From 6914031a6c71d88f2577deb3377300f3280bcce3 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Fri, 27 Nov 2015 15:35:57 +0100
Subject: [PATCH] Fix imageio codec lookup
---
sources/org/apache/batik/transcoder/image/PNGTranscoder.java | 2 +-
sources/org/apache/batik/transcoder/image/TIFFTranscoder.java | 2 +-
.../src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java | 2 +-
.../src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sources/org/apache/batik/transcoder/image/PNGTranscoder.java b/sources/org/apache/batik/transcoder/image/PNGTranscoder.java
index c03622a..4429843 100644
--- a/sources/org/apache/batik/transcoder/image/PNGTranscoder.java
+++ b/sources/org/apache/batik/transcoder/image/PNGTranscoder.java
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
index 6db21a9..4bb2d0d 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
@@ -111,7 +111,7 @@ public class PNGTranscoder extends ImageTranscoder {
"org.apache.batik.ext.awt.image.codec.png.PNGTranscoderInternalCodecWriteAdapter");
if (adapter == null) {
@ -21,10 +21,10 @@ index c03622a..4429843 100644
}
if (adapter == null) {
throw new TranscoderException(
diff --git a/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java b/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java
index d086e82..fce7d6c 100644
--- a/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java
+++ b/sources/org/apache/batik/transcoder/image/TIFFTranscoder.java
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
index 2cb5288..bb48dfa 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
@@ -104,7 +104,7 @@ public class TIFFTranscoder extends ImageTranscoder {
"org.apache.batik.ext.awt.image.codec.tiff.TIFFTranscoderInternalCodecWriteAdapter");
if (adapter == null) {
@ -35,5 +35,5 @@ index d086e82..fce7d6c 100644
if (adapter == null) {
throw new TranscoderException(
--
2.5.0
2.9.3

10
batik-disable-doclint.patch
View File

@ -1,10 +0,0 @@
--- build.xml~ 2015-05-13 18:35:58.077435053 +0200
+++ build.xml 2015-05-13 18:38:26.464632854 +0200
@@ -2092,6 +2092,7 @@
doctitle="${Project} API Specification ${completeVersion}"
bottom="Copyright &#169; ${year} &lt;a href='http://www.apache.org/'&gt;Apache Software Foundation&lt;/a&gt;. All Rights Reserved.">
<arg value="-notimestamp"/>
+ <arg value="-Xdoclint:none"/>
<sourcepath path="${src}"/>
<classpath refid="libs-classpath"/>
<link href="${dom.javadoc}"/>

14
batik-javadoc-task-failonerror-and-oom.patch
View File

@ -1,14 +0,0 @@
Index: build.xml
===================================================================
--- build.xml (revision 1558779)
+++ build.xml (working copy)
@@ -2093,7 +2093,8 @@
org.w3c.css.*,
org.w3c.dom.*"
excludepackagenames="${javadoc-exclusions}"
- maxmemory="128m"
+ maxmemory="512m"
+ failonerror="yes"
destdir="${docs}/javadoc"
encoding="UTF-8"
docencoding="UTF-8"

151
batik-manifests.patch
View File

@ -1,151 +0,0 @@
diff -ruN batik-1.8.old/sources/batik-browser-ext.mf batik-1.8/sources/batik-browser-ext.mf
--- batik-1.8.old/sources/batik-browser-ext.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-browser-ext.mf 2007-11-23 12:30:47.000000000 -0500
@@ -1,4 +1,2 @@
Manifest-Version: 1.0
-Class-Path: ../batik-squiggle.jar \
- ../lib/batik-extension.jar
Main-Class: org.apache.batik.apps.svgbrowser.Main
diff -ruN batik-1.8.old/sources/batik-browser.mf batik-1.8/sources/batik-browser.mf
--- batik-1.8.old/sources/batik-browser.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-browser.mf 2007-11-23 12:30:03.000000000 -0500
@@ -1,23 +1,2 @@
Manifest-Version: 1.0
Main-Class: org.apache.batik.apps.svgbrowser.Main
-Class-Path: lib/batik-ext.jar \
- lib/batik-dom.jar \
- lib/batik-css.jar \
- lib/batik-svg-dom.jar \
- lib/batik-gvt.jar \
- lib/batik-parser.jar \
- lib/batik-script.jar \
- lib/batik-bridge.jar \
- lib/batik-swing.jar \
- lib/batik-anim.jar \
- lib/batik-transcoder.jar \
- lib/batik-gui-util.jar \
- lib/batik-awt-util.jar \
- lib/batik-codec.jar \
- lib/batik-util.jar \
- lib/batik-xml.jar \
- lib/xerces_2_5_0.jar \
- lib/xalan-2.6.0.jar \
- lib/xml-apis.jar \
- lib/xml-apis-ext.jar \
- lib/js.jar
diff -ruN batik-1.8.old/sources/batik.mf batik-1.8/sources/batik.mf
--- batik-1.8.old/sources/batik.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik.mf 2007-11-23 12:31:02.000000000 -0500
@@ -1,29 +1,2 @@
Manifest-Version: 1.0
Main-Class: org.apache.batik.apps.svgbrowser.Main
-Class-Path: lib/batik-ext.jar \
- lib/batik-dom.jar \
- lib/batik-css.jar \
- lib/batik-svg-dom.jar \
- lib/batik-gvt.jar \
- lib/batik-parser.jar \
- lib/batik-script.jar \
- lib/batik-bridge.jar \
- lib/batik-swing.jar \
- lib/batik-anim.jar \
- lib/batik-transcoder.jar \
- lib/batik-gui-util.jar \
- lib/batik-awt-util.jar \
- lib/batik-codec.jar \
- lib/batik-util.jar \
- lib/batik-root.jar \
- lib/batik-svggen.jar \
- lib/batik-xml.jar \
- batik-squiggle.jar \
- batik-rasterizer.jar \
- batik-pp.jar \
- lib/xerces_2_5_0.jar \
- lib/xalan-2.6.0.jar \
- lib/xml-apis.jar \
- lib/xml-apis-ext.jar \
- lib/pdf-transcoder.jar \
- lib/js.jar
diff -ruN batik-1.8.old/sources/batik-pp.mf batik-1.8/sources/batik-pp.mf
--- batik-1.8.old/sources/batik-pp.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-pp.mf 2007-11-23 12:30:39.000000000 -0500
@@ -1,10 +1,2 @@
Manifest-Version: 1.0
Main-Class: org.apache.batik.apps.svgpp.Main
-Class-Path: lib/batik-ext.jar \
- lib/batik-dom.jar \
- lib/batik-parser.jar \
- lib/batik-transcoder.jar \
- lib/batik-util.jar \
- lib/batik-xml.jar \
- lib/xml-apis.jar \
- lib/xml-apis-ext.jar
diff -ruN batik-1.8.old/sources/batik-rasterizer-ext.mf batik-1.8/sources/batik-rasterizer-ext.mf
--- batik-1.8.old/sources/batik-rasterizer-ext.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-rasterizer-ext.mf 2007-11-23 12:30:54.000000000 -0500
@@ -1,4 +1,2 @@
Manifest-Version: 1.0
-Class-Path: ../batik-rasterizer.jar \
- ../lib/batik-extension.jar
Main-Class: org.apache.batik.apps.rasterizer.Main
diff -ruN batik-1.8.old/sources/batik-rasterizer.mf batik-1.8/sources/batik-rasterizer.mf
--- batik-1.8.old/sources/batik-rasterizer.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-rasterizer.mf 2007-11-23 12:30:20.000000000 -0500
@@ -1,22 +1,2 @@
Manifest-Version: 1.0
Main-Class: org.apache.batik.apps.rasterizer.Main
-Class-Path: lib/batik-ext.jar \
- lib/batik-dom.jar \
- lib/batik-css.jar \
- lib/batik-svg-dom.jar \
- lib/batik-gvt.jar \
- lib/batik-parser.jar \
- lib/batik-script.jar \
- lib/batik-bridge.jar \
- lib/batik-anim.jar \
- lib/batik-transcoder.jar \
- lib/batik-awt-util.jar \
- lib/batik-codec.jar \
- lib/batik-util.jar \
- lib/batik-xml.jar \
- lib/xerces_2_5_0.jar \
- lib/xalan-2.6.0.jar \
- lib/xml-apis.jar \
- lib/xml-apis-ext.jar \
- lib/pdf-transcoder.jar \
- lib/js.jar
diff -ruN batik-1.8.old/sources/batik-slideshow.mf batik-1.8/sources/batik-slideshow.mf
--- batik-1.8.old/sources/batik-slideshow.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-slideshow.mf 2007-11-23 12:30:31.000000000 -0500
@@ -1,23 +1,2 @@
Manifest-Version: 1.0
Main-Class: org.apache.batik.apps.slideshow.Main
-Class-Path: lib/batik-ext.jar \
- lib/batik-dom.jar \
- lib/batik-css.jar \
- lib/batik-svg-dom.jar \
- lib/batik-gvt.jar \
- lib/batik-parser.jar \
- lib/batik-script.jar \
- lib/batik-bridge.jar \
- lib/batik-swing.jar \
- lib/batik-anim.jar \
- lib/batik-transcoder.jar \
- lib/batik-gui-util.jar \
- lib/batik-awt-util.jar \
- lib/batik-codec.jar \
- lib/batik-util.jar \
- lib/batik-xml.jar \
- lib/xerces_2_5_0.jar \
- lib/xalan-2.6.0.jar \
- lib/xml-apis.jar \
- lib/xml-apis-ext.jar \
- lib/js.jar
diff -ruN batik-1.8.old/sources/batik-ttf2svg.mf batik-1.8/sources/batik-ttf2svg.mf
--- batik-1.8.old/sources/batik-ttf2svg.mf 2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-ttf2svg.mf 2007-11-23 12:30:11.000000000 -0500
@@ -1,4 +1,2 @@
Manifest-Version: 1.0
Main-Class: org.apache.batik.apps.ttf2svg.Main
-Class-Path: lib/batik-svggen.jar \
- lib/batik-util.jar

22
batik-repack.sh
View File

@ -1,22 +0,0 @@
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
ver=1.8pre
cd "$tmp"
unzip -qq "$pwd"/batik-src-$ver.zip
rm -rf `find -name *.jar`
zip -9 -o -r -q "$pwd"/batik-repack-$ver.zip batik-$ver
touch -r "$pwd"/batik-src-$ver.zip "$pwd"/batik-repack-$ver.zip
cd - >/dev/null

14
batik-script-remove-js.patch
View File

@ -1,14 +0,0 @@
--- batik-script.pom 2011-05-03 12:57:35.428208738 +0200
+++ batik-script.pom.new 2011-05-03 13:08:54.565452184 +0200
@@ -98,11 +98,6 @@
<version>1.8</version>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
- <artifactId>batik-js</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>

44
batik-security.policy
View File

@ -1,15 +1,45 @@
grant codeBase "file:/usr/share/java/batik-all.jar" { permission java.security.AllPermission; };
grant codeBase "file:/usr/share/java/batik-squiggle.jar" { permission java.security.AllPermission; };
grant codeBase "file:/usr/share/java/batik-rasterizer.jar" { permission java.security.AllPermission; };
grant codeBase "file:/usr/share/java/xml-commons-apis.jar" { permission java.security.AllPermission; };
grant codeBase "file:/usr/share/java/xml-commons-apis-ext.jar" { permission java.security.AllPermission; };
grant codeBase "file:/usr/share/java/xmlgraphics-commons.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-anim.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-awt-util.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-bridge.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-codec.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-constants.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-dom.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-ext.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-extension.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-gui-util.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-gvt.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-i18n.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-parser.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-script.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-squiggle-ext.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-svg-dom.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-svgbrowser.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-svggen.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-svgrasterizer.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-swing.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-test.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-transcoder.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-util.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-xml.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-css.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-rasterizer-ext.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-rasterizer.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-slideshow.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-squiggle.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-svgpp.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/batik-ttf2svg.jar" { permission java.security.AllPermission; };
grant codeBase "file:/usr/share/java/rhino.jar" {
grant codeBase "${app.jar.base}/../xml-commons-apis.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/../xml-commons-apis-ext.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/../xmlgraphics-commons.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/../jai_imageio.jar" { permission java.security.AllPermission; };
grant codeBase "${app.jar.base}/../rhino.jar" {
permission java.lang.RuntimePermission "createClassLoader";
permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
permission java.lang.RuntimePermission "accessDeclaredMembers";
permission java.util.PropertyPermission "org.mozilla.javascript.JavaAdapter", "read";
permission java.util.PropertyPermission "org.mozilla.javascript.JavaAdapterClassName", "read";
permission java.util.PropertyPermission "rhino.stack.style", "read";
permission java.io.FilePermission "<<ALL FILES>>", "read";
};

35
batik.rasterizer.script
View File

@ -1,35 +0,0 @@
#!/bin/sh
#
# Batik SVG Rasterizer script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Source system prefs
if [ -f /etc/rasterizer.conf ] ; then
. /etc/rasterizer.conf
fi
# Source user prefs
if [ -f $HOME/.rasterizerrc ] ; then
. $HOME/.rasterizerrc
fi
# Configuration
MAIN_CLASS=org.apache.batik.apps.rasterizer.Main
BASE_JARS="batik-rasterizer.jar batik-all.jar xml-commons-apis-ext.jar xmlgraphics-commons.jar jai_imageio.jar"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

35
batik.slideshow.script
View File

@ -1,35 +0,0 @@
#!/bin/sh
#
# Batik SVG Slideshow script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Source system prefs
if [ -f /etc/slideshow.conf ] ; then
. /etc/slideshow.conf
fi
# Source user prefs
if [ -f $HOME/.slideshowrc ] ; then
. $HOME/.slideshowrc
fi
# Configuration
MAIN_CLASS=org.apache.batik.apps.slideshow.Main
BASE_JARS="batik batik-slideshow xml-commons-aspis-ext jai_imageio.jar"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

295
batik.spec
View File

@ -1,71 +1,30 @@
%global classpath batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons:jai_imageio
Name: batik
Version: 1.8
Release: 8%{?dist}
Version: 1.9
Release: 1%{?dist}
Summary: Scalable Vector Graphics for Java
License: ASL 2.0 and W3C
URL: http://xml.apache.org/batik/
Source0: http://apache.crihan.fr/dist/xmlgraphics/batik/source/batik-src-%{version}.zip
Source1: %{name}.squiggle.script
Source2: %{name}.svgpp.script
Source3: %{name}.ttf2svg.script
Source4: %{name}.rasterizer.script
Source5: %{name}.slideshow.script
Source6: %{name}-squiggle.desktop
Source7: %{name}-repack.sh
URL: https://xmlgraphics.apache.org/batik/
Source0: http://archive.apache.org/dist/xmlgraphics/batik/source/batik-src-%{version}.zip
Source1: %{name}-security.policy
# These manifests with OSGi metadata are taken from the Eclipse Orbit
# project: http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/
#
# for f in `ls *.jar`; do unzip -d `basename $f .jar | sed s/_.*//` $f; done
# for f in `find -name MANIFEST.MF`; do mv $f $(echo $f | sed "s|./org.apache.||" | sed "s|/META-INF/|-|" | sed "s/\./-/g" | sed "s|MANIFEST-MF|MANIFEST.MF|"); done
# Then manually remove all lines containing MD5sums/crypto hashes.
# tar czf batik-1.6-orbit-manifests.tar.gz *.MF
#
Source8: %{name}-1.7-orbit-manifests.tar.gz
Source9: %{name}-security.policy
Patch0: %{name}-manifests.patch
# remove dependency on bundled rhino from pom
Patch2: %{name}-script-remove-js.patch
# make sure we fail build if javadocs fail (run OOM)
# also make maxmem a bit higher. we seem to need more...
# https://issues.apache.org/jira/browse/BATIK-1065
Patch3: %{name}-javadoc-task-failonerror-and-oom.patch
Patch4: %{name}-disable-doclint.patch
Patch5: %{name}-fix-codec-lookup.patch
Patch1: 0001-Fix-imageio-codec-lookup.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: javapackages-tools >= 1.5
BuildRequires: ant
BuildRequires: subversion
BuildRequires: zip
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.xmlgraphics:xmlgraphics-commons)
BuildRequires: mvn(org.mozilla:rhino)
BuildRequires: mvn(org.python:jython)
BuildRequires: mvn(xalan:xalan)
BuildRequires: mvn(xml-apis:xml-apis)
BuildRequires: mvn(xml-apis:xml-apis-ext)
BuildRequires: rhino >= 1.5
BuildRequires: jpackage-utils >= 1.5
BuildRequires: xerces-j2
BuildRequires: xalan-j2
BuildRequires: xml-commons-apis >= 1.3.04
BuildRequires: xmlgraphics-commons
BuildRequires: java-javadoc >= 1:1.6.0
Requires: java-headless >= 1:1.6.0
Requires: javapackages-tools
#full support for tiff
# full support for tiff
Requires: jai-imageio-core
Requires: rhino >= 1.5
Requires: xalan-j2
Requires: xml-commons-apis >= 1.3.04
Requires: xmlgraphics-commons
Requires: %{name}-css = %{version}-%{release}
%description
Batik is a Java(tm) technology based toolkit for applications that want
@ -81,9 +40,6 @@ CSS component of the Apache Batik SVG manipulation and rendering library.
%package squiggle
Summary: Batik SVG browser
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: xerces-j2 >= 2.3
%description squiggle
The Squiggle SVG Browser lets you view SVG file, zoom, pan and rotate
@ -91,9 +47,6 @@ in the content and select text items in the image and much more.
%package svgpp
Summary: Batik SVG pretty printer
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: xerces-j2 >= 2.3
%description svgpp
The SVG Pretty Printer lets developers "pretty-up" their SVG files and
@ -102,8 +55,6 @@ also be used to modify the DOCTYPE declaration on SVG files.
%package ttf2svg
Summary: Batik SVG font converter
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description ttf2svg
The SVG Font Converter lets developers convert character ranges from
@ -113,9 +64,6 @@ rendered exactly the same on all systems.
%package rasterizer
Summary: Batik SVG rasterizer
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: xerces-j2 >= 2.3
%description rasterizer
The SVG Rasterizer is a utility that can convert SVG files to a raster
@ -126,9 +74,6 @@ to be added easily.
%package slideshow
Summary: Batik SVG slideshow
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: xerces-j2 >= 2.3
%description slideshow
Batik SVG slideshow.
@ -140,7 +85,7 @@ Summary: Javadoc for %{name}
Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
Summary: Samples for %{name}
Requires: %{name} = %{version}-%{release}
%description demo
@ -153,186 +98,94 @@ Demonstrations and samples for %{name}.
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
#%patch0 -p1
rm -f `find -name readOnly.png`
rm -f `find -name properties`
mkdir orbit
pushd orbit
tar xzf %{SOURCE8}
popd
%patch1 -p1
cp -p %{SOURCE9} resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy.ref
cp -p %{SOURCE9} resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy.ref
cp -p %{SOURCE1} batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
cp -p %{SOURCE1} batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
# create poms from templates
for module in anim awt-util bridge codec css dom ext extension gui-util \
gvt parser script svg-dom svggen swing transcoder util xml \
rasterizer slideshow squiggle svgpp ttf2svg; do
sed "s:@version@:%{version}:g" sources/%{name}-$module.pom.template \
> %{name}-$module.pom
# We don't want a dependency
%pom_xpath_inject 'pom:dependency[pom:artifactId="jython"]' '<optional>true</optional>' batik-script
# eclipse expects xmlgraphics to be optional
%pom_xpath_inject 'pom:dependency[pom:artifactId="xmlgraphics-commons"]' '<optional>true</optional>' batik-css
for pom in `find -name pom.xml -not -path batik-all/pom.xml`; do
%pom_add_plugin org.apache.felix:maven-bundle-plugin $pom "
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.batik.$(sed 's:batik-::;s:/pom.xml::' <<< $pom)</Bundle-SymbolicName>
<!-- To prevent breaking eclipse -->
<Bundle-Version>1.7.0</Bundle-Version>
</instructions>
</configuration>
"
done
#%patch2
#%patch3
%patch4
%patch5 -p1
# for eclipse
%pom_xpath_set pom:Bundle-SymbolicName org.apache.batik.util.gui batik-gui-util
rm -fr sources/org/apache/batik/ext/awt/image/codec/tiff
%mvn_package :batik-squiggle squiggle
%mvn_package :batik-squiggle-ext squiggle
%mvn_package :batik-svgpp svgpp
%mvn_package :batik-ttf2svg ttf2svg
%mvn_package :batik-rasterizer rasterizer
%mvn_package :batik-rasterizer-ext rasterizer
%mvn_package :batik-slideshow slideshow
%mvn_package :batik-css css
%mvn_file :batik-all batik-all
%build
export CLASSPATH=$(build-classpath xml-commons-apis xml-commons-apis-ext xmlgraphics-commons js rhino xalan-j2 xalan-j2-serializer xerces-j2)
ant all-jar jars\
-Ddebug=on \
-Dsun-codecs.present=false \
-Dsun-codecs.disabled=true \
svg-pp-jar \
svg-slideshow-jar \
squiggle-jar \
rasterizer-jar \
ttf2svg-jar
ant javadoc
%mvn_build
%install
# inject OSGi manifests
mkdir -p META-INF
cp -p orbit/batik-bridge-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-bridge-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-css-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-css-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-dom-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-dom-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-dom-svg-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-svg-dom-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-ext-awt-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-awt-util-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-extension-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-extension-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-parser-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-parser-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-svggen-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-svggen-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-swing-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-swing-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-transcoder-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-transcoder-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-util-gui-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-gui-util-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-util-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-util-%{version}.jar META-INF/MANIFEST.MF
cp -p orbit/batik-xml-MANIFEST.MF META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{name}-%{version}/lib/batik-xml-%{version}.jar META-INF/MANIFEST.MF
%mvn_install
%jpackage_script org.apache.batik.apps.svgbrowser.Main '' '' %{classpath} squiggle true
%jpackage_script org.apache.batik.apps.svgpp.Main '' '' %{classpath} svgpp true
%jpackage_script org.apache.batik.apps.ttf2svg.Main '' '' %{classpath} ttf2svg true
%jpackage_script org.apache.batik.apps.rasterizer.Main '' '' %{classpath} rasterizer true
%jpackage_script org.apache.batik.apps.slideshow.Main '' '' %{classpath} slideshow true
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
pushd %{name}-%{version}/lib
for jarname in $(find batik-*.jar); do
cp -p ${jarname} $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname//-1.8/}
done
rm -fr $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-all.jar
cp -p %{name}-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-all.jar
popd
pushd %{name}-%{version}
for module in rasterizer slideshow squiggle svgpp ttf2svg; do
cp -p batik-$module-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/batik-$module.jar
done
popd
# poms and depmaps for subpackages are different (no batik subdir)
install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
for module in rasterizer slideshow squiggle svgpp ttf2svg; do
install -pm 644 %{name}-$module.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-$module.pom
%add_maven_depmap JPP-%{name}-$module.pom %{name}-$module.jar -a "%{name}:%{name}-$module" -f $module
done
# css pom files and maven depmaps
for module in css gui-util util; do
install -pm 644 %{name}-$module.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-$module.pom
%add_maven_depmap JPP.%{name}-%{name}-$module.pom %{name}/%{name}-$module.jar -a "%{name}:%{name}-$module" -f css
done
# main pom files and maven depmaps
for module in anim awt-util bridge codec dom ext extension \
gvt parser script svg-dom svggen swing transcoder xml; do
install -pm 644 %{name}-$module.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-$module.pom
%add_maven_depmap JPP.%{name}-%{name}-$module.pom %{name}/%{name}-$module.jar -a "%{name}:%{name}-$module"
done
# scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/squiggle
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/svgpp
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ttf2svg
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/rasterizer
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/slideshow
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr %{name}-%{version}/docs/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
# demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr contrib resources samples test-resources test-sources \
$RPM_BUILD_ROOT%{_datadir}/%{name}
#Fix perms
chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/rasterizertask/build.sh
chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
# Demo
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%files -f .mfiles
%doc LICENSE NOTICE
%doc KEYS MAINTAIN README
%{_javadir}/%{name}-all.jar
%dir %{_javadir}/batik
%license LICENSE NOTICE
%doc CHANGES MAINTAIN README
%files css -f .mfiles-css
%files squiggle -f .mfiles-squiggle
%attr(0755,root,root) %{_bindir}/squiggle
%{_bindir}/squiggle
%files svgpp -f .mfiles-svgpp
%attr(0755,root,root) %{_bindir}/svgpp
%{_bindir}/svgpp
%files ttf2svg -f .mfiles-ttf2svg
%attr(0755,root,root) %{_bindir}/ttf2svg
%{_bindir}/ttf2svg
%files rasterizer -f .mfiles-rasterizer
%attr(0755,root,root) %{_bindir}/rasterizer
%{_bindir}/rasterizer
%files slideshow -f .mfiles-slideshow
%attr(0755,root,root) %{_bindir}/slideshow
%{_bindir}/slideshow
%files javadoc
%doc LICENSE NOTICE
%{_javadocdir}/%{name}
%files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE
%files demo
%{_datadir}/%{name}
%changelog
* Thu Apr 20 2017 Michael Simacek <msimacek@redhat.com> - 1.9-1
- Update to upstream version 1.9
- Fixes CVE-2017-5662
* Wed Apr 19 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-8
- Add missing requires on xmlgraphics-commons
- Resolves: rhbz#1443567

36
batik.squiggle.script
View File

@ -1,36 +0,0 @@
#!/bin/sh
#
# Batik SVG Browser (Squiggle) script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Source system prefs
if [ -f /etc/squiggle.conf ] ; then
. /etc/squiggle.conf
fi
# Source user prefs
if [ -f $HOME/.squigglerc ] ; then
. $HOME/.squigglerc
fi
# Configuration
MAIN_CLASS=org.apache.batik.apps.svgbrowser.Main
BASE_JARS="batik-squiggle.jar batik-all.jar rhino.jar xml-commons-apis.jar
xml-commons-apis-ext.jar xmlgraphics-commons.jar jai_imageio.jar"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

35
batik.svgpp.script
View File

@ -1,35 +0,0 @@
#!/bin/sh
#
# Batik SVG Pretty Printer script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Source system prefs
if [ -f /etc/svgpp.conf ] ; then
. /etc/svgpp.conf
fi
# Source user prefs
if [ -f $HOME/.svgpprc ] ; then
. $HOME/.svgpprc
fi
# Configuration
MAIN_CLASS=org.apache.batik.apps.svgpp.Main
BASE_JARS="batik batik-svgpp jai_imageio.jar"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

35
batik.ttf2svg.script
View File

@ -1,35 +0,0 @@
#!/bin/sh
#
# Batik SVG Font Converter script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Source user prefs
if [ -f /etc/ttf2svg.conf ] ; then
. /etc/ttf2svg.conf
fi
# Allow user-defined prefs
if [ -f $HOME/.ttf2svgrc ] ; then
. $HOME/.ttf2svgrc
fi
# Configuration
MAIN_CLASS=org.apache.batik.apps.ttf2svg.Main
BASE_JARS="batik batik-ttf2svg jai_imageio.jar"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

3
sources
View File

@ -1,2 +1 @@
fdbb12c86065228a7f887adb4964c74e batik-1.7-orbit-manifests.tar.gz
6e65afa4ab4d99796716f89f579a2d64 batik-src-1.8.zip
SHA512 (batik-src-1.9.zip) = 8c1e8764ed96436951241fd8d0b3bcc336fe4c2b7efe0c291e9bf2293cd9ffd03520baabb946f814e9081177e6c97e9379b7e73f776724724745d2adf3a4abab