[pkg-java] r18770 - trunk/batik/debian/patches

Mathieu Malaterre malat at moszumanska.debian.org
Sun Jul 12 12:53:33 UTC 2015


Author: malat
Date: 2015-07-12 12:53:33 +0000 (Sun, 12 Jul 2015)
New Revision: 18770

Removed:
   trunk/batik/debian/patches/cve_2015_0250.patch
Modified:
   trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch
   trunk/batik/debian/patches/remove-js.patch
   trunk/batik/debian/patches/series
   trunk/batik/debian/patches/source-1.5.patch
Log:
refresh patches

Modified: trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch
===================================================================
--- trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch	2015-07-12 12:31:37 UTC (rev 18769)
+++ trunk/batik/debian/patches/06_fix_paths_in_policy_files.patch	2015-07-12 12:53:33 UTC (rev 18770)
@@ -7,12 +7,12 @@
  .../apache/batik/apps/svgbrowser/resources/svgbrowser.policy   | 10 +++++-----
  2 files changed, 9 insertions(+), 9 deletions(-)
 
-diff --git a/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy b/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
-index 9652745..a66f39d 100644
---- a/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
-+++ b/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
-@@ -18,7 +18,7 @@
- // $Id: rasterizer.policy 476799 2006-11-19 11:33:41Z cam $
+Index: batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
+===================================================================
+--- batik-1.8.orig/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
++++ batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
+@@ -18,27 +18,27 @@
+ // $Id: rasterizer.policy 1664314 2015-03-05 11:45:15Z lbernardo $
  // -----------------------------------------------------------------------------
  
 -grant codeBase "${app.dev.base}/classes/" {
@@ -20,7 +20,8 @@
    permission java.security.AllPermission;
  };
  
-@@ -26,16 +26,16 @@ grant codeBase "${app.dev.base}/lib/xml-apis-dom3.jar" {
+-grant codeBase "${app.dev.base}/lib/xml-apis-dom3.jar" {
++grant codeBase "file:/usr/share/java/xml-apis.jar" {
    permission java.security.AllPermission;
  };
  
@@ -29,45 +30,18 @@
    permission java.security.AllPermission;
  };
  
--grant codeBase "${app.dev.base}/lib/pdf-transcoder.jar" {
-+grant codeBase "file:/usr/share/java/fop-transcoder.jar" {
-   permission java.security.AllPermission;
- };
+-grant codeBase "${app.dev.base}/lib/fop-transcoder-allinone-svn-trunk.jar" {
+-  permission java.security.AllPermission;
+-};
++//grant codeBase "${app.dev.base}/lib/fop-transcoder-allinone-svn-trunk.jar" {
++//  permission java.security.AllPermission;
++//};
  
- 
--grant codeBase "${app.dev.base}/lib/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/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy b/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
-index 6f58c0d..7760b08 100644
---- a/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
-+++ b/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
-@@ -18,23 +18,23 @@
- // $Id: svgbrowser.policy 499629 2007-01-25 00:32:16Z cam $
- // -----------------------------------------------------------------------------
- 
--grant codeBase "${app.dev.base}/classes/" {
-+grant codeBase "file:/usr/share/java/batik-all.jar" {
+-grant codeBase "${app.dev.base}/lib/xmlgraphics-commons-svn-trunk.jar" {
++grant codeBase "file:/usr/share/java/xmlgraphics-commons.jar" {
    permission java.security.AllPermission;
  };
  
--grant codeBase "${app.dev.base}/lib/xml-apis.jar" {
-+grant codeBase "file:/usr/share/java/xml-apis.jar" {
-   permission java.security.AllPermission;
- };
- 
--grant codeBase "${app.dev.base}/lib/xml-apis-ext.jar" {
-+grant codeBase "file:/usr/share/java/xml-apis-ext.jar" {
-   permission java.security.AllPermission;
- };
- 
--grant codeBase "${app.dev.base}/lib/xerces_2_5_0.jar" {
-+grant codeBase "file:/usr/share/java/xercesImpl.jar" {
-   permission java.security.AllPermission;
- };
- 
 -grant codeBase "${app.dev.base}/lib/js.jar" {
 +grant codeBase "file:/usr/share/java/js.jar" {
    permission java.lang.RuntimePermission "createClassLoader";

Deleted: trunk/batik/debian/patches/cve_2015_0250.patch
===================================================================
--- trunk/batik/debian/patches/cve_2015_0250.patch	2015-07-12 12:31:37 UTC (rev 18769)
+++ trunk/batik/debian/patches/cve_2015_0250.patch	2015-07-12 12:53:33 UTC (rev 18770)
@@ -1,60 +0,0 @@
-Description: Fix information disclosure by disabling external XML entity processing.
- The upstream patch was modified slightly to apply cleanly against
- the source package in Debian.
-Forwarded: not-needed
-Origin: https://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/SAXDocumentFactory.java?r1=662304&r2=1664335&view=patch
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780897
-
---- a/sources/org/apache/batik/dom/util/SAXDocumentFactory.java
-+++ b/sources/org/apache/batik/dom/util/SAXDocumentFactory.java
-@@ -30,25 +30,26 @@
- import javax.xml.parsers.SAXParser;
- import javax.xml.parsers.SAXParserFactory;
- 
--import org.apache.batik.util.HaltingThread;
--import org.apache.batik.util.XMLConstants;
--
-+import org.w3c.dom.DOMImplementation;
-+import org.w3c.dom.Document;
-+import org.w3c.dom.DocumentType;
-+import org.w3c.dom.Element;
-+import org.w3c.dom.Node;
- import org.xml.sax.Attributes;
- import org.xml.sax.ErrorHandler;
- import org.xml.sax.InputSource;
- import org.xml.sax.Locator;
- import org.xml.sax.SAXException;
- import org.xml.sax.SAXNotRecognizedException;
-+import org.xml.sax.SAXNotSupportedException;
- import org.xml.sax.SAXParseException;
- import org.xml.sax.XMLReader;
- import org.xml.sax.ext.LexicalHandler;
- import org.xml.sax.helpers.DefaultHandler;
- import org.xml.sax.helpers.XMLReaderFactory;
- 
--import org.w3c.dom.DOMImplementation;
--import org.w3c.dom.Document;
--import org.w3c.dom.Element;
--import org.w3c.dom.Node;
-+import org.apache.batik.util.HaltingThread;
-+import org.apache.batik.util.XMLConstants;
- 
- /**
-  * This class contains methods for creating Document instances
-@@ -391,6 +392,16 @@
-     static SAXParserFactory saxFactory;
-     static {
-         saxFactory = SAXParserFactory.newInstance();
-+        try {
-+            saxFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-+            saxFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-+        } catch (SAXNotRecognizedException e) {
-+            e.printStackTrace();
-+        } catch (SAXNotSupportedException e) {
-+            e.printStackTrace();
-+        } catch (ParserConfigurationException e) {
-+            e.printStackTrace();
-+        }
-     }
- 
-     /**

Modified: trunk/batik/debian/patches/remove-js.patch
===================================================================
--- trunk/batik/debian/patches/remove-js.patch	2015-07-12 12:31:37 UTC (rev 18769)
+++ trunk/batik/debian/patches/remove-js.patch	2015-07-12 12:53:33 UTC (rev 18770)
@@ -7,20 +7,20 @@
  build.xml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/build.xml b/build.xml
-index f274e64..96e7bde 100644
---- a/build.xml
-+++ b/build.xml
-@@ -808,9 +808,9 @@ JAVA=/usr/bin/java
-     <copy file="${src}/batik-xml.pom.template" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.pom" filtering="true"/>
-     <copy file="${build}/lib/batik-xml.jar" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.jar"/>
+Index: batik-1.8/build.xml
+===================================================================
+--- batik-1.8.orig/build.xml
++++ batik-1.8/build.xml
+@@ -720,9 +720,9 @@ JAVA=/usr/bin/java
+     <copy file="${src}/${project}-xml.pom.template" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.pom" filtering="true"/>
+     <copy file="${build}/lib/${project}-xml-${completeVersion}.jar" tofile="${maven}/${project}-xml/${completeVersion}/${project}-xml-${completeVersion}.jar"/>
  
--    <mkdir dir="${maven}/batik-js/${completeVersion}"/>
--    <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/>
--    <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/>
-+    <!-- <mkdir dir="${maven}/batik-js/${completeVersion}"/> -->
-+    <!-- <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/> -->
-+    <!-- <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/> -->
+-    <mkdir dir="${maven}/${project}-js/${completeVersion}"/>
+-    <copy file="${src}/${project}-js.pom.template" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.pom" filtering="true"/>
+-    <copy file="${build}/lib/js.jar" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.jar"/>
++    <!--mkdir dir="${maven}/${project}-js/${completeVersion}"/-->
++    <!--copy file="${src}/${project}-js.pom.template" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.pom" filtering="true"/-->
++    <!--copy file="${build}/lib/js.jar" tofile="${maven}/${project}-js/${completeVersion}/${project}-js-${completeVersion}.jar"/-->
  
      <!-- Generate checksums of all artifacts and POMs -->
      <checksum algorithm="MD5" fileext=".md5">

Modified: trunk/batik/debian/patches/series
===================================================================
--- trunk/batik/debian/patches/series	2015-07-12 12:31:37 UTC (rev 18769)
+++ trunk/batik/debian/patches/series	2015-07-12 12:53:33 UTC (rev 18770)
@@ -1,4 +1,3 @@
 06_fix_paths_in_policy_files.patch
 source-1.5.patch
 remove-js.patch
-cve_2015_0250.patch

Modified: trunk/batik/debian/patches/source-1.5.patch
===================================================================
--- trunk/batik/debian/patches/source-1.5.patch	2015-07-12 12:31:37 UTC (rev 18769)
+++ trunk/batik/debian/patches/source-1.5.patch	2015-07-12 12:53:33 UTC (rev 18770)
@@ -6,11 +6,11 @@
  build.xml | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/build.xml b/build.xml
-index c26e1ee..f274e64 100644
---- a/build.xml
-+++ b/build.xml
-@@ -835,7 +835,7 @@ JAVA=/usr/bin/java
+Index: batik-1.8/build.xml
+===================================================================
+--- batik-1.8.orig/build.xml
++++ batik-1.8/build.xml
+@@ -747,7 +747,7 @@ JAVA=/usr/bin/java
      <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
  
      <javac srcdir="${testsrc}" destdir="${dest}"  deprecation="${deprecation}" 
@@ -19,7 +19,7 @@
        <classpath>
          <pathelement location="${dest}"/>
          <path refid="libs-classpath"/>
-@@ -858,7 +858,7 @@ JAVA=/usr/bin/java
+@@ -770,7 +770,7 @@ JAVA=/usr/bin/java
  
      <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
  
@@ -28,7 +28,7 @@
             debug="${debug}" optimize="${optimize}" encoding="UTF-8">
        <classpath>
          <pathelement location="${dest}"/>
-@@ -868,7 +868,7 @@ JAVA=/usr/bin/java
+@@ -780,7 +780,7 @@ JAVA=/usr/bin/java
        </classpath>
      </javac>
  
@@ -37,12 +37,12 @@
             debug="${debug}" optimize="${optimize}" encoding="UTF-8">
        <classpath>
          <pathelement location="${dest}"/>
-@@ -1004,7 +1004,7 @@ JAVA=/usr/bin/java
-   </target>
+@@ -917,7 +917,7 @@ JAVA=/usr/bin/java
  
    <target name="compile" depends="init, compile-prepare" unless="compile.done">
--    <javac destdir="${dest}" deprecation="${deprecation}" 
-+    <javac destdir="${dest}" deprecation="${deprecation}"  target="1.5"  source="1.5"
-            debug="${debug}" optimize="${optimize}" encoding="UTF-8">
+     <javac destdir="${dest}" deprecation="${deprecation}" 
+-           debug="${debug}" optimize="${optimize}" encoding="UTF-8"
++           debug="${debug}" optimize="${optimize}" encoding="UTF-8" target="1.5"  source="1.5"
+            includeAntRuntime="true">
        <src path="${src}"/>
-       <src path="${src-jdk}"/>
+       <classpath refid="libs-classpath"/>




More information about the pkg-java-commits mailing list