Hello community, here is the log from the commit of package xalan-j2 for openSUSE:Factory checked in at 2014-06-27 06:53:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xalan-j2 (Old) and /work/SRC/openSUSE:Factory/.xalan-j2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xalan-j2" Changes: -------- --- /work/SRC/openSUSE:Factory/xalan-j2/xalan-j2.changes 2013-09-03 22:07:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xalan-j2.new/xalan-j2.changes 2014-06-27 06:53:14.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Jun 23 07:58:37 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner. + +------------------------------------------------------------------- +Mon Jun 23 07:55:54 UTC 2014 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- xalan-j2-java14compat.patch xalan-j_2_7_0-src.tar.gz New: ---- xalan-j_2_7_2-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xalan-j2.spec ++++++ --- /var/tmp/diff_new_pack.hgDfqv/_old 2014-06-27 06:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.hgDfqv/_new 2014-06-27 06:53:15.000000000 +0200 @@ -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 +Url: http://xalan.apache.org/index.html +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/ -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 +Requires: jaxp_parser_impl +Requires(post): update-alternatives +Requires(postun): update-alternatives +Provides: jaxp_transform_impl +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +#!BuildIgnore: xerces-j2 xml-commons xml-commons-resolver xml-commons-apis java-cup #!BuildIgnore: xml-commons-jaxp-1.3-apis %description @@ -58,8 +52,6 @@ Language (XPath). It can be used from the command line, in an applet or a servlet, or as a module in other program. - - %package xsltc Summary: Java XSLT compiler Group: Development/Libraries/Java @@ -68,15 +60,11 @@ 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 into lightweight and portable Java byte codes called translets. - - %package manual Summary: Manual for xalan-j2 Group: Development/Libraries/Java @@ -105,24 +93,18 @@ 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 +174,15 @@ [ $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 ++++++ xalan-j2-crosslink.patch ++++++ --- /var/tmp/diff_new_pack.hgDfqv/_old 2014-06-27 06:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.hgDfqv/_new 2014-06-27 06:53:15.000000000 +0200 @@ -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 @@ - <property name="build.serializer.jar" value="${serializer.build.dir}/${serializer.jar.name}"/> - <property name="lib.serializer.jar" value="./lib/${serializer.jar.name}"/> - -+ <property name="api.j2se" value="http://java.sun.com/j2se/1.4/docs/api/"/> -+ - <!-- Class paths used in various targets --> - <path id="docs.class.path"> - <pathelement location="${xmlapis.jar}" /> -@@ -1086,6 +1088,7 @@ - <group title="DOM 2" packages="org.w3c.dom*"/> - <group title="XSLTC Core" - packages="org.apache.xalan.xsltc*"/> -+ <link href="${api.j2se}"/> - </javadoc> - </target> - -@@ -1121,6 +1124,7 @@ - <group title="DOM 2" packages="org.w3c.dom*"/> - <group title="XSLTC Core" - packages="org.apache.xalan.xsltc*"/> -+ <link href="${api.j2se}"/> - </javadoc> - </target> - +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 @@ + <property name="serializer.jar.name" value="serializer.jar"/> + <property name="build.serializer.jar" value="${serializer.build.dir}/${serializer.jar.name}"/> + <property name="lib.serializer.jar" value="./lib/${serializer.jar.name}"/> +- ++ ++ <property name="api.j2se" value="http://java.sun.com/j2se/1.4/docs/api/"/> ++ + <!-- Class paths used in various targets --> + <path id="docs.class.path"> + <pathelement location="${xmlapis.jar}" /> +@@ -1098,6 +1100,7 @@ + <group title="DOM 2" packages="org.w3c.dom*"/> + <group title="XSLTC Core" + packages="org.apache.xalan.xsltc*"/> ++ <link href="${api.j2se}"/> + </javadoc> + </target> + +@@ -1133,6 +1136,7 @@ + <group title="DOM 2" packages="org.w3c.dom*"/> + <group title="XSLTC Core" + packages="org.apache.xalan.xsltc*"/> ++ <link href="${api.j2se}"/> + </javadoc> + </target> + ++++++ xalan-j2-manifest.patch ++++++ --- /var/tmp/diff_new_pack.hgDfqv/_old 2014-06-27 06:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.hgDfqv/_new 2014-06-27 06:53:15.000000000 +0200 @@ -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 +- ++++++ xalan-j2-noxsltcdeps.patch ++++++ --- /var/tmp/diff_new_pack.hgDfqv/_old 2014-06-27 06:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.hgDfqv/_new 2014-06-27 06:53:15.000000000 +0200 @@ -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 @@ - <!-- =================================================================== --> - <!-- Creates one big xalan jar (Xalan interpretive + XSLTC + support jars) --> - <!-- =================================================================== --> -- <target name="jar" depends="xalan-interpretive.compile,xsltc.compile,xsltc.copy-deps-jars" -+ <target name="jar" depends="xalan-interpretive.compile,xsltc.compile" - description="Jar up everything (Xalan, XSLTC and XSLTC dependencies)" > - - <!-- Copy over the manifest, with filtering (for version number) --> +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 @@ + <!-- =================================================================== --> + <!-- Creates the xsltc jar including all support jars --> + <!-- =================================================================== --> +- <target name="xsltc.jar" depends="xsltc.compile,xsltc.copy-deps-jars" ++ <target name="xsltc.jar" depends="xsltc.compile" + description="Jar xsltc,xml,BCEL,JLex,java_cup,runtime and jakarta regexp"> + + <!-- create new META-INF dir w/ transformer factory default --> ++++++ xalan-j_2_7_0-src.tar.gz -> xalan-j_2_7_2-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/xalan-j2/xalan-j_2_7_0-src.tar.gz /work/SRC/openSUSE:Factory/.xalan-j2.new/xalan-j_2_7_2-src.tar.gz differ: char 13, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
