From 2f31edc2cb40ba401719968f0778de3062e2f97a Mon Sep 17 00:00:00 2001 From: gil Date: Mar 26 2016 17:50:14 +0000 Subject: Update to 2.0.6 --- diff --git a/.gitignore b/.gitignore index c8c8df8..30a4cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /xml-security-src-1_5_7.zip /xml-security-src-1_5_8.zip /xmlsec-2.0.4-source-release.zip +/xmlsec-2.0.6-source-release.zip diff --git a/changelog-pre2.txt b/changelog-pre2.txt new file mode 100644 index 0000000..56ea660 --- /dev/null +++ b/changelog-pre2.txt @@ -0,0 +1,117 @@ +* Sat Feb 14 2015 gil cattaneo 0:1.5.8-1 +- update to 1.5.8 +- introduce license macro + +* Tue Oct 28 2014 gil cattaneo 0:1.5.7-1 +- update to 1.5.7 (rhbz#1045257,1157992. security fix for CVE-2013-4517) + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Oct 27 2013 gil cattaneo 0:1.5.5-1 +- update to 1.5.5 + +* Sun Aug 18 2013 gil cattaneo 0:1.5.3-7 +- built with XMvn +- fix BR list +- adapt to current guideline + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.5.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 05 2013 Tomas Radej - 0:1.5.3-5 +- Removed failing tests due to new JUnit + +* Fri Feb 22 2013 Andy Grimm 0:1.5.3-4 +- Add maven-shared to BuildRequires (RHBZ#914587) + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0:1.5.3-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Oct 18 2012 Marek Goldmann - 0:1.5.3-1 +- Upstream release 1.5.3 +- Change build system to Maven +- Cleanups + +* Sun Jul 22 2012 Fedora Release Engineering - 0:1.4.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 20 2011 Andy Grimm 0:1.4.5-2 +- Fixes for package review + +* Wed Sep 07 2011 Andy Grimm 0:1.4.5-1 +- Follow Fedora guidelines + +* Sat Jan 09 2010 Will Tatam 1.4.2-5 +- Auto rebuild for JPackage 6 in centos5 mock + +* Mon Aug 17 2009 David Walluck 0:1.4.2-4 +- remove unneeded bouncycastle + +* Sat Aug 15 2009 Ralph Apel 0:1.4.2-3 +- Add pom and depmap frag + +* Tue May 26 2009 David Walluck 0:1.4.2-2 +- fix log4j location in patch + +* Tue May 26 2009 David Walluck 0:1.4.2-1 +- 1.4.2 + +* Mon Jan 12 2009 David Walluck 0:1.3.0-3 +- add compiled samples jar to demo subpackage +- specify xml-commons-jaxp-1.3-apis explicitly +- rename repolib directory for AS5 +- fix repolib permissions +- fix repolib file ownership + +* Wed May 28 2008 David Walluck 0:1.3.0-2.jpp5 +- don't remove buildroot in %%prep +- don't use absolute path for %%doc +- fix License + +* Mon Apr 21 2008 David Walluck 0:1.3.0-1jpp.ep1.3 +- unpatched version requires ant-nodeps +- fix tests +- remove javadoc scriptlets +- remove %%{buildroot} in %%install +- rename BuildRoot + +* Tue Mar 13 2007 Vivek Lakshmanan 0:1.3.0-1jpp.ep1.2 +- Fix repolib location + +* Tue Mar 13 2007 Fernando nasser 0:1.3.0-1jpp.ep1.1 +- Remove duplicate macros + +* Tue Feb 20 2007 Vivek Lakshmanan 0:1.3.0-1jpp.el4ep1.2 +- Install jar with name as used upstream +- Add -brew suffix + +* Sun Feb 18 2007 Vivek Lakshmanan 0:1.3.0-1jpp.el4ep1.1 +- Add repolib support +- Add missing BR on ant-junit + +* Tue Aug 01 2006 Fernando nasser 0:1.3.0-1jpp_1rh +- Merge with upstream + +* Tue Jan 17 2006 Deepak Bhole 0:1.3.0-1jpp +- Upgrade to version 1.3.0. +- Removed com.sun dependencies. +- Removed bouncycastle dependency. + +* Thu Oct 20 2005 Fernando nasser 0:1.2.1-1jpp_1rh +- First Red Hat build +- Remove bouncycastle +- Lower Xalan-j2 requires to 2.6.0 + +* Mon Oct 10 2005 Ralph Apel 0:1.2.97-1jpp +- Upgrade to build/run with JAXP-1.3 + +* Mon Apr 04 2005 Ralph Apel 0:1.2.1-1jpp +- First JPackage release \ No newline at end of file diff --git a/sources b/sources index 278f995..bb7f95d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1ea2315ae47af648fc5bc2d59ad50f3 xmlsec-2.0.4-source-release.zip +b22da531a320679fe9e4484e936f9668 xmlsec-2.0.6-source-release.zip diff --git a/xml-security.spec b/xml-security.spec index b4aa874..8b5b4df 100644 --- a/xml-security.spec +++ b/xml-security.spec @@ -1,56 +1,23 @@ -# Copyright (c) 2000-2009, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - %global oname xmlsec %global _version %(echo %{version} | tr . _ ) Name: xml-security -Version: 2.0.4 -Release: 3%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Epoch: 0 Summary: Implementation of W3C security standards for XML License: ASL 2.0 URL: http://santuario.apache.org/ -Source0: http://archive.apache.org/dist/santuario/java-library/%{_version}/%{oname}-%{version}-source-release.zip +Source0: http://www.apache.org/dist/santuario/java-library/%{_version}/%{oname}-%{version}-source-release.zip # Unavailable class in jetty8/9 org.eclipse.jetty.io.Buffer Patch0: xml-security-2.0.2-remove-Buffer.patch BuildRequires: maven-local -BuildRequires: maven-shared -BuildRequires: maven-release-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j:1.2.17) BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) BuildRequires: mvn(org.eclipse.jetty:jetty-server) @@ -67,8 +34,8 @@ BuildRequires: mvn(xmlunit:xmlunit) BuildArch: noarch %description -The XML Security project is aimed at providing implementation -of security standards for XML. Currently the focus is on the +The XML Security project is aimed at providing implementation +of security standards for XML. Currently the focus is on the W3C standards : - XML-Signature Syntax and Processing; and - XML Encryption Syntax and Processing. @@ -77,7 +44,7 @@ W3C standards : Summary: Javadoc for %{name} %description javadoc -Javadoc for %{name}. +This package contains javadoc for %{name}. %package demo Summary: Samples for %{name} @@ -92,6 +59,9 @@ Samples for %{name}. %pom_remove_plugin :maven-pmd-plugin %pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin +# Use org.codehaus.mojo:extra-enforcer-rules:jar:1.0-beta-3 +%pom_remove_plugin :maven-enforcer-plugin %pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions" %pom_xpath_set "pom:plugin[pom:groupId = 'org.jvnet.jaxb2.maven2' ]/pom:artifactId" maven-jaxb22-plugin @@ -131,9 +101,15 @@ rm -r src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java \ src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java \ src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java +# NoSuchAlgorithmException: unsupported algorithm +rm -r src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java +# KeyException: ECKeyValue not supported +rm -r src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java + %mvn_file :%{oname} %{name} %{oname} %build + # On ARM builder test suite fails @ random # java.lang.NoClassDefFoundError: Could not initialize class org.apache.xml.security.stax.ext.XMLSec %mvn_build -f @@ -141,6 +117,7 @@ rm -r src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java \ %install %mvn_install +chmod 644 samples/org/apache/xml/security/samples/encryption/*.java install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} @@ -151,10 +128,15 @@ cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} %license LICENSE NOTICE %files demo -%license LICENSE NOTICE %{_datadir}/%{name} +%license LICENSE NOTICE %changelog +* Fri Mar 25 2016 gil cattaneo 0:2.0.6-1 +- Update to 2.0.6 +- Drop old jpackage header +- Move old changelog to separate file. + * Fri Feb 05 2016 Fedora Release Engineering - 0:2.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -163,121 +145,3 @@ cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} * Wed Apr 22 2015 gil cattaneo 0:2.0.4-1 - Update to 2.0.4 - -* Sat Feb 14 2015 gil cattaneo 0:1.5.8-1 -- update to 1.5.8 -- introduce license macro - -* Tue Oct 28 2014 gil cattaneo 0:1.5.7-1 -- update to 1.5.7 (rhbz#1045257,1157992. security fix for CVE-2013-4517) - -* Sun Jun 08 2014 Fedora Release Engineering - 0:1.5.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Oct 27 2013 gil cattaneo 0:1.5.5-1 -- update to 1.5.5 - -* Sun Aug 18 2013 gil cattaneo 0:1.5.3-7 -- built with XMvn -- fix BR list -- adapt to current guideline - -* Sun Aug 04 2013 Fedora Release Engineering - 0:1.5.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Apr 05 2013 Tomas Radej - 0:1.5.3-5 -- Removed failing tests due to new JUnit - -* Fri Feb 22 2013 Andy Grimm 0:1.5.3-4 -- Add maven-shared to BuildRequires (RHBZ#914587) - -* Fri Feb 15 2013 Fedora Release Engineering - 0:1.5.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 0:1.5.3-2 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Oct 18 2012 Marek Goldmann - 0:1.5.3-1 -- Upstream release 1.5.3 -- Change build system to Maven -- Cleanups - -* Sun Jul 22 2012 Fedora Release Engineering - 0:1.4.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Sep 20 2011 Andy Grimm 0:1.4.5-2 -- Fixes for package review - -* Wed Sep 07 2011 Andy Grimm 0:1.4.5-1 -- Follow Fedora guidelines - -* Sat Jan 09 2010 Will Tatam 1.4.2-5 -- Auto rebuild for JPackage 6 in centos5 mock - -* Mon Aug 17 2009 David Walluck 0:1.4.2-4 -- remove unneeded bouncycastle - -* Sat Aug 15 2009 Ralph Apel 0:1.4.2-3 -- Add pom and depmap frag - -* Tue May 26 2009 David Walluck 0:1.4.2-2 -- fix log4j location in patch - -* Tue May 26 2009 David Walluck 0:1.4.2-1 -- 1.4.2 - -* Mon Jan 12 2009 David Walluck 0:1.3.0-3 -- add compiled samples jar to demo subpackage -- specify xml-commons-jaxp-1.3-apis explicitly -- rename repolib directory for AS5 -- fix repolib permissions -- fix repolib file ownership - -* Wed May 28 2008 David Walluck 0:1.3.0-2.jpp5 -- don't remove buildroot in %%prep -- don't use absolute path for %%doc -- fix License - -* Mon Apr 21 2008 David Walluck 0:1.3.0-1jpp.ep1.3 -- unpatched version requires ant-nodeps -- fix tests -- remove javadoc scriptlets -- remove %%{buildroot} in %%install -- rename BuildRoot - -* Tue Mar 13 2007 Vivek Lakshmanan 0:1.3.0-1jpp.ep1.2 -- Fix repolib location - -* Tue Mar 13 2007 Fernando nasser 0:1.3.0-1jpp.ep1.1 -- Remove duplicate macros - -* Tue Feb 20 2007 Vivek Lakshmanan 0:1.3.0-1jpp.el4ep1.2 -- Install jar with name as used upstream -- Add -brew suffix - -* Sun Feb 18 2007 Vivek Lakshmanan 0:1.3.0-1jpp.el4ep1.1 -- Add repolib support -- Add missing BR on ant-junit - -* Tue Aug 01 2006 Fernando nasser 0:1.3.0-1jpp_1rh -- Merge with upstream - -* Tue Jan 17 2006 Deepak Bhole 0:1.3.0-1jpp -- Upgrade to version 1.3.0. -- Removed com.sun dependencies. -- Removed bouncycastle dependency. - -* Thu Oct 20 2005 Fernando nasser 0:1.2.1-1jpp_1rh -- First Red Hat build -- Remove bouncycastle -- Lower Xalan-j2 requires to 2.6.0 - -* Mon Oct 10 2005 Ralph Apel 0:1.2.97-1jpp -- Upgrade to build/run with JAXP-1.3 - -* Mon Apr 04 2005 Ralph Apel 0:1.2.1-1jpp -- First JPackage release