- Version bump to 2.7.2 release:
* various small fixes * Fix security bnc#870082 CVE-2014-0107 - Fix few rpmlint warnings - Deleted xalan-j2-java14compat.patch patch as we don't bother with 1.4 java anymore - Rebased patches on new code: * xalan-j2-crosslink.patch * xalan-j2-manifest.patch * xalan-j2-noxsltcdeps.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=13
This commit is contained in:
parent
7d5e48a996
commit
5dd240ee11
@ -1,27 +1,30 @@
|
|||||||
--- build.xml.orig 2007-02-12 13:43:06.000000000 +0100
|
diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml
|
||||||
+++ build.xml 2007-02-12 13:46:08.000000000 +0100
|
--- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200
|
||||||
@@ -201,6 +201,8 @@
|
+++ xalan-j_2_7_2/build.xml 2014-06-23 09:22:59.124418473 +0200
|
||||||
<property name="build.serializer.jar" value="${serializer.build.dir}/${serializer.jar.name}"/>
|
@@ -204,7 +204,9 @@
|
||||||
<property name="lib.serializer.jar" value="./lib/${serializer.jar.name}"/>
|
<property name="serializer.jar.name" value="serializer.jar"/>
|
||||||
|
<property name="build.serializer.jar" value="${serializer.build.dir}/${serializer.jar.name}"/>
|
||||||
+ <property name="api.j2se" value="http://java.sun.com/j2se/1.4/docs/api/"/>
|
<property name="lib.serializer.jar" value="./lib/${serializer.jar.name}"/>
|
||||||
+
|
-
|
||||||
<!-- Class paths used in various targets -->
|
+
|
||||||
<path id="docs.class.path">
|
+ <property name="api.j2se" value="http://java.sun.com/j2se/1.4/docs/api/"/>
|
||||||
<pathelement location="${xmlapis.jar}" />
|
+
|
||||||
@@ -1086,6 +1088,7 @@
|
<!-- Class paths used in various targets -->
|
||||||
<group title="DOM 2" packages="org.w3c.dom*"/>
|
<path id="docs.class.path">
|
||||||
<group title="XSLTC Core"
|
<pathelement location="${xmlapis.jar}" />
|
||||||
packages="org.apache.xalan.xsltc*"/>
|
@@ -1098,6 +1100,7 @@
|
||||||
+ <link href="${api.j2se}"/>
|
<group title="DOM 2" packages="org.w3c.dom*"/>
|
||||||
</javadoc>
|
<group title="XSLTC Core"
|
||||||
</target>
|
packages="org.apache.xalan.xsltc*"/>
|
||||||
|
+ <link href="${api.j2se}"/>
|
||||||
@@ -1121,6 +1124,7 @@
|
</javadoc>
|
||||||
<group title="DOM 2" packages="org.w3c.dom*"/>
|
</target>
|
||||||
<group title="XSLTC Core"
|
|
||||||
packages="org.apache.xalan.xsltc*"/>
|
@@ -1133,6 +1136,7 @@
|
||||||
+ <link href="${api.j2se}"/>
|
<group title="DOM 2" packages="org.w3c.dom*"/>
|
||||||
</javadoc>
|
<group title="XSLTC Core"
|
||||||
</target>
|
packages="org.apache.xalan.xsltc*"/>
|
||||||
|
+ <link href="${api.j2se}"/>
|
||||||
|
</javadoc>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
@ -1,244 +0,0 @@
|
|||||||
diff -Naur ../xalan-j_2_7_0.orig/build.xml ./build.xml
|
|
||||||
--- ../xalan-j_2_7_0.orig/build.xml 2005-08-06 23:05:30.000000000 +0200
|
|
||||||
+++ ./build.xml 2006-09-21 16:23:42.000000000 +0200
|
|
||||||
@@ -416,7 +416,8 @@
|
|
||||||
<echo message="Compiling DTM implementation and utilities" />
|
|
||||||
<javac srcdir="${src.dir}"
|
|
||||||
destdir="${build.classes}"
|
|
||||||
- debug="${build.debug}" >
|
|
||||||
+ debug="${build.debug}"
|
|
||||||
+ target="1.4" >
|
|
||||||
<include name="${apachexml.reldir}/**/*.java" />
|
|
||||||
<!-- exclude the serializer -->
|
|
||||||
<exclude name="${serializer.reldir}/**/*.java" />
|
|
||||||
@@ -443,7 +444,8 @@
|
|
||||||
<echo message="Compiling Xalan interpretive classes" />
|
|
||||||
<javac srcdir="${src.dir}"
|
|
||||||
destdir="${build.classes}"
|
|
||||||
- debug="${build.debug}" >
|
|
||||||
+ debug="${build.debug}"
|
|
||||||
+ target="1.4" >
|
|
||||||
<include name="${xpath.reldir}/**/*.java" />
|
|
||||||
<include name="${domxpath.reldir}/**/*.java" />
|
|
||||||
<include name="${xalan.reldir}/**/*.java" />
|
|
||||||
@@ -489,7 +491,8 @@
|
|
||||||
<javac srcdir="${src.dir}"
|
|
||||||
destdir="${build.classes}"
|
|
||||||
includes="${xsltc.reldir}/util/**/*.java"
|
|
||||||
- debug="${build.debug}">
|
|
||||||
+ debug="${build.debug}"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="xsltc.class.path" />
|
|
||||||
<bootclasspath refid="xslt.boot.class.path" />
|
|
||||||
</javac>
|
|
||||||
@@ -552,7 +555,8 @@
|
|
||||||
destdir="${build.classes}"
|
|
||||||
includes="${xsltc.reldir}/**/*.java"
|
|
||||||
excludes="${serializer.reldir}/**/*.java"
|
|
||||||
- debug="${build.debug}">
|
|
||||||
+ debug="${build.debug}"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="xsltc.class.path" />
|
|
||||||
<bootclasspath refid="xslt.boot.class.path" />
|
|
||||||
</javac>
|
|
||||||
@@ -565,7 +569,8 @@
|
|
||||||
<javac srcdir="${src.dir}"
|
|
||||||
destdir="${build.classes}"
|
|
||||||
includes="${xsltc.reldir}/**/*.java"
|
|
||||||
- debug="${build.debug}">
|
|
||||||
+ debug="${build.debug}"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="xsltc.class.path" />
|
|
||||||
<bootclasspath refid="xslt.boot.class.path" />
|
|
||||||
</javac>
|
|
||||||
@@ -770,77 +775,92 @@
|
|
||||||
<!-- Since the samples are packageless, they must be compiled separately. -->
|
|
||||||
<javac srcdir="${samples.dir}/SimpleTransform"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/UseStylesheetPI"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/UseStylesheetParam"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/SAX2SAX"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/DOM2DOM"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/Pipe"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/UseXMLFilters"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/Trace"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/ApplyXPath"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/ApplyXPathDOM"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/trax"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/extensions"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/Validate"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/TransformThread"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<javac srcdir="${samples.dir}/XPathAPI"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<jar jarfile="${build.samples.jar}" basedir="${build.samples}"
|
|
||||||
@@ -880,7 +900,8 @@
|
|
||||||
<javac srcdir="${samples.dir}/servlet"
|
|
||||||
destdir="${build.servlet}/WEB-INF/classes"
|
|
||||||
debug="${build.debug}"
|
|
||||||
- bootclasspathref="xslt.boot.class.path" >
|
|
||||||
+ bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" >
|
|
||||||
<classpath refid="samples.class.path" />
|
|
||||||
</javac>
|
|
||||||
<copy todir="${build.servlet}/WEB-INF/classes/servlet">
|
|
||||||
@@ -918,10 +939,12 @@
|
|
||||||
<javac srcdir="${samples.dir}/translets"
|
|
||||||
classpath="${java.class.path}:${build.xalan.jar}"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" />
|
|
||||||
<javac srcdir="${samples.dir}/CompiledJAXP"
|
|
||||||
destdir="${build.samples}" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<!-- =================================================================== -->
|
|
||||||
@@ -931,7 +954,8 @@
|
|
||||||
<mkdir dir="${build.samples}/CompiledApplet"/>
|
|
||||||
<javac srcdir="${samples.dir}/CompiledApplet"
|
|
||||||
destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" />
|
|
||||||
<jar jarfile="${build.xsltc.applet.jar}"
|
|
||||||
basedir="${build.samples}/CompiledApplet"
|
|
||||||
includes="*.class"/>
|
|
||||||
@@ -944,7 +968,8 @@
|
|
||||||
<mkdir dir="${build.samples}/CompiledBrazil"/>
|
|
||||||
<javac srcdir="${samples.dir}/CompiledBrazil"
|
|
||||||
destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" />
|
|
||||||
<jar jarfile="${build.xsltc.brazil.jar}"
|
|
||||||
basedir="${build.samples}/CompiledBrazil"
|
|
||||||
includes="*.class"/>
|
|
||||||
@@ -959,7 +984,8 @@
|
|
||||||
<mkdir dir="${build.samples}/CompiledEJB"/>
|
|
||||||
<javac srcdir="${samples.dir}/CompiledEJB"
|
|
||||||
destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" />
|
|
||||||
<jar jarfile="${build.xsltc.ejb.jar}"
|
|
||||||
basedir="${build.samples}/CompiledEJB"
|
|
||||||
includes="*.class"/>
|
|
||||||
@@ -972,7 +998,8 @@
|
|
||||||
<mkdir dir="${build.samples}/CompiledServlet"/>
|
|
||||||
<javac srcdir="${samples.dir}/CompiledServlet"
|
|
||||||
destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
|
|
||||||
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
|
|
||||||
+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
||||||
+ target="1.4" />
|
|
||||||
<jar jarfile="${build.xsltc.servlet.jar}"
|
|
||||||
basedir="${build.samples}/CompiledServlet"
|
|
||||||
includes="*.class"/>
|
|
||||||
@@ -993,6 +1020,7 @@
|
|
||||||
classname="${doc.generator}"
|
|
||||||
classpathref="docs.class.path" >
|
|
||||||
<arg line="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/>
|
|
||||||
+
|
|
||||||
</java>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
@@ -1690,7 +1718,8 @@
|
|
||||||
<echo message="Compiling the Serializer" />
|
|
||||||
<javac srcdir="${serializer.src.dir}"
|
|
||||||
destdir="${serializer.build.classes}"
|
|
||||||
- debug="${serializer.build.debug}" >
|
|
||||||
+ debug="${serializer.build.debug}"
|
|
||||||
+ target="1.4" >
|
|
||||||
<include name="${serializer.reldir}/**/*.java" />
|
|
||||||
<classpath refid="compile.class.path" />
|
|
||||||
<bootclasspath refid="xslt.boot.class.path" />
|
|
@ -1,108 +1,111 @@
|
|||||||
--- src/MANIFEST.MF.sav 2007-02-12 13:39:18.000000000 +0100
|
diff -urN xalan-j_2_7_2.old/src/MANIFEST.MF xalan-j_2_7_2/src/MANIFEST.MF
|
||||||
+++ src/MANIFEST.MF 2007-02-12 13:40:07.000000000 +0100
|
--- xalan-j_2_7_2.old/src/MANIFEST.MF 2014-06-23 09:21:30.815410307 +0200
|
||||||
@@ -1,8 +1,6 @@
|
+++ xalan-j_2_7_2/src/MANIFEST.MF 2014-06-23 09:42:52.044528782 +0200
|
||||||
Manifest-Version: 1.0
|
|
||||||
Created-By: @java.version@ (@java.vendor@)
|
|
||||||
Main-Class: org.apache.xalan.xslt.Process
|
|
||||||
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
|
|
||||||
-
|
|
||||||
|
|
||||||
Name: org/apache/xalan/
|
|
||||||
Comment: Main Xalan engine implementing TrAX/JAXP
|
|
||||||
@@ -38,33 +36,3 @@
|
|
||||||
Implementation-Vendor: Apache Software Foundation
|
|
||||||
Implementation-URL: http://xml.apache.org/xalan-j/
|
|
||||||
|
|
||||||
-Name: java_cup/runtime/
|
|
||||||
-Comment: Runtime component of JCup
|
|
||||||
-Specification-Title: Runtime component of JCup
|
|
||||||
-Specification-Vendor: Princeton University
|
|
||||||
-Specification-Version: 0.10k
|
|
||||||
-Implementation-Title: runtime
|
|
||||||
-Implementation-Version: @impl.version@
|
|
||||||
-Implementation-Vendor: Princeton University
|
|
||||||
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/
|
|
||||||
-
|
|
||||||
-Name: org/apache/bcel/
|
|
||||||
-Comment: Byte Code Engineering Library
|
|
||||||
-Specification-Title: Byte Code Engineering Library
|
|
||||||
-Specification-Vendor: Markus Dahm
|
|
||||||
-Specification-Version: 5.0 rc1
|
|
||||||
-Implementation-Title: org.apache.bcel
|
|
||||||
-Implementation-Version: @impl.version@
|
|
||||||
-Implementation-Vendor: Apache Software Foundation
|
|
||||||
-Implementation-URL: http://jakarta.apache.org/bcel
|
|
||||||
-
|
|
||||||
-Name: org/apache/regexp/
|
|
||||||
-Comment: Java Regular Expression package
|
|
||||||
-Specification-Title: Java Regular Expression package
|
|
||||||
-Specification-Vendor: Apache Software Foundation
|
|
||||||
-Specification-Version: 1.2
|
|
||||||
-Implementation-Title: org.apache.regexp
|
|
||||||
-Implementation-Version: @impl.version@
|
|
||||||
-Implementation-Vendor: Apache Software Foundation
|
|
||||||
-Implementation-URL: http://jakarta.apache.org/regexp
|
|
||||||
-
|
|
||||||
--- src/MANIFEST.SERIALIZER.sav 2007-02-12 13:39:24.000000000 +0100
|
|
||||||
+++ src/MANIFEST.SERIALIZER 2007-02-12 13:40:15.000000000 +0100
|
|
||||||
@@ -1,7 +1,6 @@
|
@@ -1,7 +1,6 @@
|
||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Created-By: @java.version@ (@java.vendor@)
|
Created-By: @java.version@ (@java.vendor@)
|
||||||
Main-Class: org.apache.xml.serializer.Version
|
Main-Class: org.apache.xalan.xslt.Process
|
||||||
-Class-Path: xml-apis.jar
|
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
|
||||||
|
|
||||||
Name: org/apache/xml/serializer/
|
|
||||||
Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events.
|
Name: org/apache/xalan/
|
||||||
--- src/manifest.xalan-interpretive.sav 2007-02-12 13:39:31.000000000 +0100
|
@@ -38,33 +37,3 @@
|
||||||
+++ src/manifest.xalan-interpretive 2007-02-12 13:40:24.000000000 +0100
|
Implementation-Vendor: Apache Software Foundation
|
||||||
|
Implementation-URL: http://xml.apache.org/xalan-j/
|
||||||
|
|
||||||
|
-Name: java_cup/runtime/
|
||||||
|
-Comment: Runtime component of JCup
|
||||||
|
-Specification-Title: Runtime component of JCup
|
||||||
|
-Specification-Vendor: Princeton University
|
||||||
|
-Specification-Version: 0.10k
|
||||||
|
-Implementation-Title: runtime
|
||||||
|
-Implementation-Version: @impl.version@
|
||||||
|
-Implementation-Vendor: Princeton University
|
||||||
|
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/
|
||||||
|
-
|
||||||
|
-Name: org/apache/bcel/
|
||||||
|
-Comment: Byte Code Engineering Library
|
||||||
|
-Specification-Title: Byte Code Engineering Library
|
||||||
|
-Specification-Vendor: Markus Dahm
|
||||||
|
-Specification-Version: 5.0 rc1
|
||||||
|
-Implementation-Title: org.apache.bcel
|
||||||
|
-Implementation-Version: @impl.version@
|
||||||
|
-Implementation-Vendor: Apache Software Foundation
|
||||||
|
-Implementation-URL: http://jakarta.apache.org/bcel
|
||||||
|
-
|
||||||
|
-Name: org/apache/regexp/
|
||||||
|
-Comment: Java Regular Expression package
|
||||||
|
-Specification-Title: Java Regular Expression package
|
||||||
|
-Specification-Vendor: Apache Software Foundation
|
||||||
|
-Specification-Version: 1.2
|
||||||
|
-Implementation-Title: org.apache.regexp
|
||||||
|
-Implementation-Version: @impl.version@
|
||||||
|
-Implementation-Vendor: Apache Software Foundation
|
||||||
|
-Implementation-URL: http://jakarta.apache.org/regexp
|
||||||
|
-
|
||||||
|
diff -urN xalan-j_2_7_2.old/src/MANIFEST.SERIALIZER xalan-j_2_7_2/src/MANIFEST.SERIALIZER
|
||||||
|
--- xalan-j_2_7_2.old/src/MANIFEST.SERIALIZER 2014-06-23 09:21:30.815410307 +0200
|
||||||
|
+++ xalan-j_2_7_2/src/MANIFEST.SERIALIZER 2014-06-23 09:43:13.107530730 +0200
|
||||||
@@ -1,7 +1,6 @@
|
@@ -1,7 +1,6 @@
|
||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Created-By: @java.version@ (@java.vendor@)
|
Created-By: @java.version@ (@java.vendor@)
|
||||||
Main-Class: org.apache.xalan.xslt.Process
|
Main-Class: org.apache.xml.serializer.Version
|
||||||
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
|
-Class-Path: xml-apis.jar
|
||||||
|
|
||||||
Name: org/apache/xalan/
|
Name: org/apache/xml/serializer/
|
||||||
Comment: Main Xalan engine implementing TrAX/JAXP
|
Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events.
|
||||||
--- src/manifest.xsltc.sav 2007-02-12 13:39:37.000000000 +0100
|
diff -urN xalan-j_2_7_2.old/src/manifest.xalan-interpretive xalan-j_2_7_2/src/manifest.xalan-interpretive
|
||||||
+++ src/manifest.xsltc 2007-02-12 13:40:43.000000000 +0100
|
--- xalan-j_2_7_2.old/src/manifest.xalan-interpretive 2014-06-23 09:21:30.838410309 +0200
|
||||||
|
+++ xalan-j_2_7_2/src/manifest.xalan-interpretive 2014-06-23 09:43:28.403532145 +0200
|
||||||
|
@@ -1,7 +1,6 @@
|
||||||
|
Manifest-Version: 1.0
|
||||||
|
Created-By: @java.version@ (@java.vendor@)
|
||||||
|
Main-Class: org.apache.xalan.xslt.Process
|
||||||
|
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
|
||||||
|
|
||||||
|
Name: org/apache/xalan/
|
||||||
|
Comment: Main Xalan engine implementing TrAX/JAXP
|
||||||
|
diff -urN xalan-j_2_7_2.old/src/manifest.xsltc xalan-j_2_7_2/src/manifest.xsltc
|
||||||
|
--- xalan-j_2_7_2.old/src/manifest.xsltc 2014-06-23 09:21:30.816410307 +0200
|
||||||
|
+++ xalan-j_2_7_2/src/manifest.xsltc 2014-06-23 09:43:46.395533808 +0200
|
||||||
@@ -1,6 +1,5 @@
|
@@ -1,6 +1,5 @@
|
||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Created-By: @java.version@ (@java.vendor@)
|
Created-By: @java.version@ (@java.vendor@)
|
||||||
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
|
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
|
||||||
|
|
||||||
Name: org/apache/xalan/xsltc/
|
Name: org/apache/xalan/xsltc/
|
||||||
Comment: Main XSLTC engine implementing TrAX/JAXP
|
Comment: Main XSLTC engine implementing TrAX/JAXP
|
||||||
@@ -19,33 +18,3 @@
|
@@ -19,33 +18,3 @@
|
||||||
Implementation-Vendor: Apache Software Foundation
|
Implementation-Vendor: Apache Software Foundation
|
||||||
Implementation-URL: http://xml.apache.org/xalan-j/dist/
|
Implementation-URL: http://xml.apache.org/xalan-j/dist/
|
||||||
|
|
||||||
-Name: java_cup/runtime/
|
-Name: java_cup/runtime/
|
||||||
-Comment: Runtime component of JCup
|
-Comment: Runtime component of JCup
|
||||||
-Specification-Title: Runtime component of JCup
|
-Specification-Title: Runtime component of JCup
|
||||||
-Specification-Vendor: Princeton University
|
-Specification-Vendor: Princeton University
|
||||||
-Specification-Version: 0.10k
|
-Specification-Version: 0.10k
|
||||||
-Implementation-Title: runtime
|
-Implementation-Title: runtime
|
||||||
-Implementation-Version: @impl.version@
|
-Implementation-Version: @impl.version@
|
||||||
-Implementation-Vendor: Princeton University
|
-Implementation-Vendor: Princeton University
|
||||||
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/
|
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/
|
||||||
-
|
-
|
||||||
-Name: org/apache/bcel/
|
-Name: org/apache/bcel/
|
||||||
-Comment: Byte Code Engineering Library
|
-Comment: Byte Code Engineering Library
|
||||||
-Specification-Title: Byte Code Engineering Library
|
-Specification-Title: Byte Code Engineering Library
|
||||||
-Specification-Vendor: Markus Dahm
|
-Specification-Vendor: Markus Dahm
|
||||||
-Specification-Version: 5.0 rc1
|
-Specification-Version: 5.0 rc1
|
||||||
-Implementation-Title: org.apache.bcel
|
-Implementation-Title: org.apache.bcel
|
||||||
-Implementation-Version: @impl.version@
|
-Implementation-Version: @impl.version@
|
||||||
-Implementation-Vendor: Apache Software Foundation
|
-Implementation-Vendor: Apache Software Foundation
|
||||||
-Implementation-URL: http://jakarta.apache.org/bcel
|
-Implementation-URL: http://jakarta.apache.org/bcel
|
||||||
-
|
-
|
||||||
-Name: org/apache/regexp/
|
-Name: org/apache/regexp/
|
||||||
-Comment: Java Regular Expression package
|
-Comment: Java Regular Expression package
|
||||||
-Specification-Title: Java Regular Expression package
|
-Specification-Title: Java Regular Expression package
|
||||||
-Specification-Vendor: Apache Software Foundation
|
-Specification-Vendor: Apache Software Foundation
|
||||||
-Specification-Version: 1.2
|
-Specification-Version: 1.2
|
||||||
-Implementation-Title: org.apache.regexp
|
-Implementation-Title: org.apache.regexp
|
||||||
-Implementation-Version: @impl.version@
|
-Implementation-Version: @impl.version@
|
||||||
-Implementation-Vendor: Apache Software Foundation
|
-Implementation-Vendor: Apache Software Foundation
|
||||||
-Implementation-URL: http://jakarta.apache.org/regexp
|
-Implementation-URL: http://jakarta.apache.org/regexp
|
||||||
-
|
-
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
--- build.xml.orig 2004-02-27 20:45:31.000000000 +0100
|
diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml
|
||||||
+++ build.xml 2004-03-21 15:46:37.000000000 +0100
|
--- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200
|
||||||
@@ -560,7 +560,7 @@
|
+++ xalan-j_2_7_2/build.xml 2014-06-23 09:25:00.547429701 +0200
|
||||||
<!-- =================================================================== -->
|
@@ -616,7 +616,7 @@
|
||||||
<!-- Creates one big xalan jar (Xalan interpretive + XSLTC + support jars) -->
|
<!-- =================================================================== -->
|
||||||
<!-- =================================================================== -->
|
<!-- Creates the xsltc jar including all support jars -->
|
||||||
- <target name="jar" depends="xalan-interpretive.compile,xsltc.compile,xsltc.copy-deps-jars"
|
<!-- =================================================================== -->
|
||||||
+ <target name="jar" depends="xalan-interpretive.compile,xsltc.compile"
|
- <target name="xsltc.jar" depends="xsltc.compile,xsltc.copy-deps-jars"
|
||||||
description="Jar up everything (Xalan, XSLTC and XSLTC dependencies)" >
|
+ <target name="xsltc.jar" depends="xsltc.compile"
|
||||||
|
description="Jar xsltc,xml,BCEL,JLex,java_cup,runtime and jakarta regexp">
|
||||||
<!-- Copy over the manifest, with filtering (for version number) -->
|
|
||||||
|
<!-- create new META-INF dir w/ transformer factory default -->
|
||||||
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 23 07:55:54 UTC 2014 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Version bump to 2.7.2 release:
|
||||||
|
* various small fixes
|
||||||
|
* Fix security bnc#870082 CVE-2014-0107
|
||||||
|
- Fix few rpmlint warnings
|
||||||
|
- Deleted xalan-j2-java14compat.patch patch as we don't bother
|
||||||
|
with 1.4 java anymore
|
||||||
|
- Rebased patches on new code:
|
||||||
|
* xalan-j2-crosslink.patch
|
||||||
|
* xalan-j2-manifest.patch
|
||||||
|
* xalan-j2-noxsltcdeps.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 28 07:47:48 UTC 2013 - mvyskocil@suse.com
|
Wed Aug 28 07:47:48 UTC 2013 - mvyskocil@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xalan-j2
|
# spec file for package xalan-j2
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -14,41 +14,35 @@
|
|||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
# icecream 0
|
|
||||||
|
|
||||||
|
|
||||||
%define cvs_version 2_7_0
|
%define cvs_version 2_7_2
|
||||||
|
|
||||||
Name: xalan-j2
|
Name: xalan-j2
|
||||||
Version: 2.7.0
|
Version: 2.7.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Java XSLT processor
|
Summary: Java XSLT processor
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Source0: http://www.apache.org/dist/xml/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz
|
Source0: http://www.apache.org/dist/xalan/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz
|
||||||
Patch0: %{name}-noxsltcdeps.patch
|
Patch0: %{name}-noxsltcdeps.patch
|
||||||
Patch1: %{name}-manifest.patch
|
Patch1: %{name}-manifest.patch
|
||||||
Patch2: %{name}-crosslink.patch
|
Patch2: %{name}-crosslink.patch
|
||||||
Patch3: %{name}-java14compat.patch
|
Url: http://xalan.apache.org/index.html
|
||||||
Url: http://xml.apache.org/xalan-j/
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Provides: jaxp_transform_impl
|
Provides: jaxp_transform_impl
|
||||||
|
|
||||||
Requires: jaxp_parser_impl
|
Requires: jaxp_parser_impl
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
Requires(postun):update-alternatives
|
Requires(postun):update-alternatives
|
||||||
|
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: bcel
|
BuildRequires: bcel
|
||||||
|
BuildRequires: dos2unix
|
||||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||||
|
BuildRequires: java-cup-bootstrap
|
||||||
BuildRequires: jlex
|
BuildRequires: jlex
|
||||||
BuildRequires: servletapi5
|
BuildRequires: servletapi5
|
||||||
BuildRequires: xml-commons-apis-bootstrap
|
BuildRequires: xml-commons-apis-bootstrap
|
||||||
#BuildRequires: xerces-j2-bootstrap
|
#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis java-cup
|
||||||
#!BuildIgnore: xerces-j2-boostrap
|
|
||||||
BuildRequires: java-cup-bootstrap
|
|
||||||
#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis java-cup java_cup
|
|
||||||
#!BuildIgnore: xml-commons-jaxp-1.3-apis
|
#!BuildIgnore: xml-commons-jaxp-1.3-apis
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -68,8 +62,6 @@ Requires: java_cup
|
|||||||
Requires: jaxp_parser_impl
|
Requires: jaxp_parser_impl
|
||||||
Requires: jlex
|
Requires: jlex
|
||||||
Requires: regexp
|
Requires: regexp
|
||||||
#Requires: /usr/sbin/update-alternatives
|
|
||||||
#Provides: jaxp_transform_impl
|
|
||||||
|
|
||||||
%description xsltc
|
%description xsltc
|
||||||
The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets
|
The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets
|
||||||
@ -109,20 +101,16 @@ This package contains demonstration and sample files for Xalan.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n xalan-j_%{cvs_version}
|
%setup -q -n xalan-j_%{cvs_version}
|
||||||
%patch0 -p0
|
%patch0 -p1
|
||||||
%patch1 -p0
|
%patch1 -p1
|
||||||
%patch2 -p0
|
%patch2 -p1
|
||||||
%patch3
|
|
||||||
# Remove all binary libs, except ones needed to build docs and N/A elsewhere.
|
# Remove all binary libs, except ones needed to build docs and N/A elsewhere.
|
||||||
for j in $(find . -name "*.jar"); do
|
for j in $(find . -name "*.jar"); do
|
||||||
mv $j $j.no
|
mv $j $j.no
|
||||||
done
|
done
|
||||||
mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
|
mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
|
||||||
mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar
|
mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar
|
||||||
#find . -name "*.jar" \
|
dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sources/xsltc/README.xslt
|
||||||
# ! -name xalan2jdoc.jar \
|
|
||||||
# ! -name stylebook-1.0-b3_xalan-2.jar \
|
|
||||||
# -exec rm -f {} \;
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
|
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
|
||||||
@ -192,23 +180,15 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
|
|||||||
[ $1 = 0 ] || exit 0
|
[ $1 = 0 ] || exit 0
|
||||||
update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
|
update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
|
||||||
} >/dev/null 2>&1 || :
|
} >/dev/null 2>&1 || :
|
||||||
#%post xsltc
|
|
||||||
#update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
|
|
||||||
# jaxp_transform_impl %{_javadir}/xsltc.jar 10
|
|
||||||
#%preun xsltc
|
|
||||||
#{
|
|
||||||
# [ $1 = 0 ] || exit 0
|
|
||||||
# update-alternatives --remove jaxp_transform_impl %{_javadir}/xsltc.jar
|
|
||||||
#} >/dev/null 2>&1 || :
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
%doc KEYS licenses/xalan.LICENSE.txt licenses/xalan.NOTICE.txt licenses/serializer.LICENSE.txt licenses/serializer.NOTICE.txt
|
%doc KEYS LICENSE.txt NOTICE.txt
|
||||||
%{_javadir}/%{name}-%{version}.jar
|
%{_javadir}/%{name}-%{version}.jar
|
||||||
%{_javadir}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/%{name}-serializer-%{version}.jar
|
%{_javadir}/%{name}-serializer-%{version}.jar
|
||||||
%{_javadir}/%{name}-serializer.jar
|
%{_javadir}/%{name}-serializer.jar
|
||||||
%{_sysconfdir}/ant.d/
|
%config %{_sysconfdir}/ant.d/serializer
|
||||||
%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
|
%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
|
||||||
%ghost %{_javadir}/jaxp_transform_impl.jar
|
%ghost %{_javadir}/jaxp_transform_impl.jar
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:210843fb672b0c44138797d9d11b61c2f538b89400ce8be1f230cd666f70bb02
|
|
||||||
size 6264659
|
|
3
xalan-j_2_7_2-src.tar.gz
Normal file
3
xalan-j_2_7_2-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98
|
||||||
|
size 8416261
|
Loading…
Reference in New Issue
Block a user