openkylin
/
batik
mirror of https://gitee.com/openkylin/batik.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

format patches

This commit is contained in:
liwenjun 2024-06-12 17:12:19 +08:00
parent dd60026626
commit a61d4b4eda
2 changed files with 75 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
debian/patches/06_fix_paths_in_policy_files.patch vendored
View File

@ -1,8 +1,67 @@
Description: fixing paths in policy files
Author: Vincent Fourmond <fourmond@debian.org>
From: Vincent Fourmond <fourmond@debian.org>
Date: Wed, 12 Jun 2024 17:12:18 +0800
Subject: fixing paths in policy files
Forwarded: not-needed
Last-Update: 2013-10-14
---
.../batik/apps/svgbrowser/resources/svgbrowser.policy | 14 +++++++-------
.../batik/apps/rasterizer/resources/rasterizer.policy | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy b/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
index efcef10..20e7d2c 100644
--- a/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
+++ b/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
@@ -18,19 +18,19 @@
// $Id$
// -----------------------------------------------------------------------------
-grant codeBase "${app.jar.base}/xml-apis-ext-${xmlapis.version}.jar" {
+grant codeBase "file:/usr/share/java/xml-apis-ext.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xml-apis-${xmlapis.version}.jar" {
+grant codeBase "file:/usr/share/java/xml-apis.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xalan-${xalan.version}.jar" {
+grant codeBase "file:/usr/share/java/xalan2.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xercesImpl-2.9.1.jar" {
+grant codeBase "file:/usr/share/java/xercesImpl.jar" {
permission java.security.AllPermission;
};
@@ -98,11 +98,11 @@ grant codeBase "${app.jar.base}/batik-xml-${version}.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/fop-transcoder-allinone-${xmlgraphics.commons.version}.jar" {
+grant codeBase "file:/usr/share/java/fop-transcoder-allinone.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xmlgraphics-commons-${xmlgraphics.commons.version}.jar" {
+grant codeBase "file:/usr/share/java/xmlgraphics-commons.jar" {
permission java.security.AllPermission;
};
@@ -126,7 +126,7 @@ grant codeBase "${app.jar.base}/batik-svgbrowser-${version}.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/js.jar" {
+grant codeBase "file:/usr/share/java/js.jar" {
permission java.lang.RuntimePermission "createClassLoader";
permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
permission java.lang.RuntimePermission "accessDeclaredMembers";
diff --git a/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy b/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
index 9d0fbb8..62a4d4d 100644
--- a/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
+++ b/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
@@ -18,27 +18,27 @@
@ -39,52 +98,3 @@ Last-Update: 2013-10-14
permission java.lang.RuntimePermission "createClassLoader";
permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
permission java.lang.RuntimePermission "accessDeclaredMembers";
--- a/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
+++ b/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
@@ -18,19 +18,19 @@
// $Id$
// -----------------------------------------------------------------------------
-grant codeBase "${app.jar.base}/xml-apis-ext-${xmlapis.version}.jar" {
+grant codeBase "file:/usr/share/java/xml-apis-ext.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xml-apis-${xmlapis.version}.jar" {
+grant codeBase "file:/usr/share/java/xml-apis.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xalan-${xalan.version}.jar" {
+grant codeBase "file:/usr/share/java/xalan2.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xercesImpl-2.9.1.jar" {
+grant codeBase "file:/usr/share/java/xercesImpl.jar" {
permission java.security.AllPermission;
};
@@ -98,11 +98,11 @@
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/fop-transcoder-allinone-${xmlgraphics.commons.version}.jar" {
+grant codeBase "file:/usr/share/java/fop-transcoder-allinone.jar" {
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/xmlgraphics-commons-${xmlgraphics.commons.version}.jar" {
+grant codeBase "file:/usr/share/java/xmlgraphics-commons.jar" {
permission java.security.AllPermission;
};
@@ -126,7 +126,7 @@
permission java.security.AllPermission;
};
-grant codeBase "${app.jar.base}/js.jar" {
+grant codeBase "file:/usr/share/java/js.jar" {
permission java.lang.RuntimePermission "createClassLoader";
permission java.net.SocketPermission "*", "listen, connect, resolve, accept";
permission java.lang.RuntimePermission "accessDeclaredMembers";

19
debian/patches/no-Jython-support.patch vendored
View File

@ -1,15 +1,22 @@
Description: Jython is optional at runtime but required at build time
Disable it because we don't want to support it.
Author: Markus Koschany <apo@debian.org>
From: Markus Koschany <apo@debian.org>
Date: Wed, 12 Jun 2024 17:12:18 +0800
Subject: Jython is optional at runtime but required at build time
Bug-Debian: https://bugs.debian.org/884536
Forwarded: not-needed
Last-Update: 2018-05-25
Disable it because we don't want to support it.
Last-Update: 2018-05-25
---
.../batik/script/jpython/JPythonInterpreter.java | 105 ---------------------
.../script/jpython/JPythonInterpreterFactory.java | 4 +-
2 files changed, 2 insertions(+), 107 deletions(-)
delete mode 100644 batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java
diff --git a/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java b/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java
deleted file mode 100644
index 24d92af..0000000
--- a/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java
+++ /dev/null
@@ -1,105 +0,0 @@
@ -118,9 +125,11 @@ Last-Update: 2018-05-25
- return null;
- }
-}
diff --git a/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java b/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java
index b5ef681..7587ed9 100644
--- a/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java
+++ b/batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java
@@ -56,7 +56,7 @@
@@ -56,7 +56,7 @@ public class JPythonInterpreterFactory implements InterpreterFactory {
* @param svg12 whether the document is an SVG 1.2 document
*/
public Interpreter createInterpreter(URL documentURL, boolean svg12) {
@ -129,7 +138,7 @@ Last-Update: 2018-05-25
}
/**
@@ -69,6 +69,6 @@
@@ -69,6 +69,6 @@ public class JPythonInterpreterFactory implements InterpreterFactory {
*/
public Interpreter createInterpreter(URL documentURL, boolean svg12,
ImportInfo imports) {