diff --git a/xalan-j2-crosslink.patch b/xalan-j2-crosslink.patch
index 18bfac7..53f2407 100644
--- a/xalan-j2-crosslink.patch
+++ b/xalan-j2-crosslink.patch
@@ -1,27 +1,30 @@
---- build.xml.orig 2007-02-12 13:43:06.000000000 +0100
-+++ build.xml 2007-02-12 13:46:08.000000000 +0100
-@@ -201,6 +201,8 @@
-
-
-
-+
-+
-
-
-
-@@ -1086,6 +1088,7 @@
-
-
-+
-
-
-
-@@ -1121,6 +1124,7 @@
-
-
-+
-
-
-
+diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml
+--- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200
++++ xalan-j_2_7_2/build.xml 2014-06-23 09:22:59.124418473 +0200
+@@ -204,7 +204,9 @@
+
+
+
+-
++
++
++
+
+
+
+@@ -1098,6 +1100,7 @@
+
+
++
+
+
+
+@@ -1133,6 +1136,7 @@
+
+
++
+
+
+
diff --git a/xalan-j2-java14compat.patch b/xalan-j2-java14compat.patch
deleted file mode 100644
index f5a9774..0000000
--- a/xalan-j2-java14compat.patch
+++ /dev/null
@@ -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 @@
-
-
-+ debug="${build.debug}"
-+ target="1.4" >
-
-
-
-@@ -443,7 +444,8 @@
-
-
-+ debug="${build.debug}"
-+ target="1.4" >
-
-
-
-@@ -489,7 +491,8 @@
-
-+ debug="${build.debug}"
-+ target="1.4" >
-
-
-
-@@ -552,7 +555,8 @@
- destdir="${build.classes}"
- includes="${xsltc.reldir}/**/*.java"
- excludes="${serializer.reldir}/**/*.java"
-- debug="${build.debug}">
-+ debug="${build.debug}"
-+ target="1.4" >
-
-
-
-@@ -565,7 +569,8 @@
-
-+ debug="${build.debug}"
-+ target="1.4" >
-
-
-
-@@ -770,77 +775,92 @@
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-+ bootclasspathref="xslt.boot.class.path"
-+ target="1.4" >
-
-
-
-@@ -918,10 +939,12 @@
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" />
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" />
-
-
-
-@@ -931,7 +954,8 @@
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" />
-
-@@ -944,7 +968,8 @@
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" />
-
-@@ -959,7 +984,8 @@
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" />
-
-@@ -972,7 +998,8 @@
-
-
-+ debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-+ target="1.4" />
-
-@@ -993,6 +1020,7 @@
- classname="${doc.generator}"
- classpathref="docs.class.path" >
-
-+
-
-
-
-@@ -1690,7 +1718,8 @@
-
-
-+ debug="${serializer.build.debug}"
-+ target="1.4" >
-
-
-
diff --git a/xalan-j2-manifest.patch b/xalan-j2-manifest.patch
index ede70a7..5a2a25f 100644
--- a/xalan-j2-manifest.patch
+++ b/xalan-j2-manifest.patch
@@ -1,108 +1,111 @@
---- src/MANIFEST.MF.sav 2007-02-12 13:39:18.000000000 +0100
-+++ src/MANIFEST.MF 2007-02-12 13:40:07.000000000 +0100
-@@ -1,8 +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
-@@ -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
+diff -urN xalan-j_2_7_2.old/src/MANIFEST.MF xalan-j_2_7_2/src/MANIFEST.MF
+--- xalan-j_2_7_2.old/src/MANIFEST.MF 2014-06-23 09:21:30.815410307 +0200
++++ xalan-j_2_7_2/src/MANIFEST.MF 2014-06-23 09:42:52.044528782 +0200
@@ -1,7 +1,6 @@
- Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
- Main-Class: org.apache.xml.serializer.Version
--Class-Path: xml-apis.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.
---- src/manifest.xalan-interpretive.sav 2007-02-12 13:39:31.000000000 +0100
-+++ src/manifest.xalan-interpretive 2007-02-12 13:40:24.000000000 +0100
+ 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/
+@@ -38,33 +37,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
+-
+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 @@
- 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
---- src/manifest.xsltc.sav 2007-02-12 13:39:37.000000000 +0100
-+++ src/manifest.xsltc 2007-02-12 13:40:43.000000000 +0100
+ Manifest-Version: 1.0
+ Created-By: @java.version@ (@java.vendor@)
+ Main-Class: org.apache.xml.serializer.Version
+-Class-Path: xml-apis.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.
+diff -urN xalan-j_2_7_2.old/src/manifest.xalan-interpretive xalan-j_2_7_2/src/manifest.xalan-interpretive
+--- 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 @@
- Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
--Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
-
- Name: org/apache/xalan/xsltc/
- Comment: Main XSLTC engine implementing TrAX/JAXP
+ Manifest-Version: 1.0
+ Created-By: @java.version@ (@java.vendor@)
+-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+
+ Name: org/apache/xalan/xsltc/
+ Comment: Main XSLTC engine implementing TrAX/JAXP
@@ -19,33 +18,3 @@
- Implementation-Vendor: Apache Software Foundation
- Implementation-URL: http://xml.apache.org/xalan-j/dist/
-
--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
--
+ Implementation-Vendor: Apache Software Foundation
+ Implementation-URL: http://xml.apache.org/xalan-j/dist/
+
+-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 --git a/xalan-j2-noxsltcdeps.patch b/xalan-j2-noxsltcdeps.patch
index b836e67..b2cc2dc 100644
--- a/xalan-j2-noxsltcdeps.patch
+++ b/xalan-j2-noxsltcdeps.patch
@@ -1,11 +1,12 @@
---- build.xml.orig 2004-02-27 20:45:31.000000000 +0100
-+++ build.xml 2004-03-21 15:46:37.000000000 +0100
-@@ -560,7 +560,7 @@
-
-
-
--
-
-
+diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml
+--- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200
++++ xalan-j_2_7_2/build.xml 2014-06-23 09:25:00.547429701 +0200
+@@ -616,7 +616,7 @@
+
+
+
+-
+
+
diff --git a/xalan-j2.changes b/xalan-j2.changes
index 92f7b62..15c0e98 100644
--- a/xalan-j2.changes
+++ b/xalan-j2.changes
@@ -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
diff --git a/xalan-j2.spec b/xalan-j2.spec
index cbbbadb..a44165e 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -14,41 +14,35 @@
# 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
-Version: 2.7.0
+Version: 2.7.2
Release: 0
Summary: Java XSLT processor
License: Apache-2.0
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
Patch1: %{name}-manifest.patch
Patch2: %{name}-crosslink.patch
-Patch3: %{name}-java14compat.patch
-Url: http://xml.apache.org/xalan-j/
+Url: http://xalan.apache.org/index.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Provides: jaxp_transform_impl
-
Requires: jaxp_parser_impl
Requires(post): update-alternatives
Requires(postun):update-alternatives
-
BuildRequires: ant
BuildRequires: bcel
+BuildRequires: dos2unix
BuildRequires: java-1_5_0-gcj-compat-devel
+BuildRequires: java-cup-bootstrap
BuildRequires: jlex
BuildRequires: servletapi5
BuildRequires: xml-commons-apis-bootstrap
-#BuildRequires: xerces-j2-bootstrap
-#!BuildIgnore: xerces-j2-boostrap
-BuildRequires: java-cup-bootstrap
-#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis java-cup java_cup
+#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis java-cup
#!BuildIgnore: xml-commons-jaxp-1.3-apis
%description
@@ -68,8 +62,6 @@ Requires: java_cup
Requires: jaxp_parser_impl
Requires: jlex
Requires: regexp
-#Requires: /usr/sbin/update-alternatives
-#Provides: jaxp_transform_impl
%description xsltc
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
%setup -q -n xalan-j_%{cvs_version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
# Remove all binary libs, except ones needed to build docs and N/A elsewhere.
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar
-#find . -name "*.jar" \
-# ! -name xalan2jdoc.jar \
-# ! -name stylebook-1.0-b3_xalan-2.jar \
-# -exec rm -f {} \;
+dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sources/xsltc/README.xslt
%build
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
update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
} >/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
%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}.jar
%{_javadir}/%{name}-serializer-%{version}.jar
%{_javadir}/%{name}-serializer.jar
-%{_sysconfdir}/ant.d/
+%config %{_sysconfdir}/ant.d/serializer
%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
%ghost %{_javadir}/jaxp_transform_impl.jar
diff --git a/xalan-j_2_7_0-src.tar.gz b/xalan-j_2_7_0-src.tar.gz
deleted file mode 100644
index 79fd549..0000000
--- a/xalan-j_2_7_0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:210843fb672b0c44138797d9d11b61c2f538b89400ce8be1f230cd666f70bb02
-size 6264659
diff --git a/xalan-j_2_7_2-src.tar.gz b/xalan-j_2_7_2-src.tar.gz
new file mode 100644
index 0000000..de60e92
--- /dev/null
+++ b/xalan-j_2_7_2-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c184ad2984973cc19783c7f9339c28a210cca724b25b0d706f1e310627adb98
+size 8416261