[xml-security/f20] update to 1.5.7 (rhbz#1045257, 1157992. security fix for CVE-2013-4517)

[gil]

commit da406a652c6b957031dcf40a463b9b04784a2fe6
Author: gil <puntogil at libero.it>
Date:   Tue Oct 28 12:40:33 2014 +0100

    update to 1.5.7 (rhbz#1045257,1157992. security fix for CVE-2013-4517)

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...patch => xml-security-1.5.7-removed-tests.patch |   15 ++++---
 xml-security.spec                                  |   41 +++++++++++++-------
 4 files changed, 37 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d3dd8e..4e33dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /xml-security-component-info.xml
 /xml-security-src-1_5_3.zip
 /xml-security-src-1_5_5.zip
+/xml-security-src-1_5_7.zip
diff --git a/sources b/sources
index 461bdc2..1576d10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70dffa3931029f155fc7be69aaec5cb7  xml-security-src-1_5_5.zip
+00d503a0d8d9cc52de6031951328e688  xml-security-src-1_5_7.zip
diff --git a/xml-security-removed-tests.patch b/xml-security-1.5.7-removed-tests.patch
similarity index 76%
rename from xml-security-removed-tests.patch
rename to xml-security-1.5.7-removed-tests.patch
index 41b415c..e3de148 100644
--- a/xml-security-removed-tests.patch
+++ b/xml-security-1.5.7-removed-tests.patch
@@ -1,13 +1,13 @@
-diff --git a/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java b/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java
-index 2499a28..84ff7ab 100644
---- a/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java
-+++ b/src/test/java/org/apache/xml/security/test/utils/OldApiTest.java
-@@ -149,30 +149,4 @@ public class OldApiTest extends org.junit.Assert {
+--- src/test/java/org/apache/xml/security/test/utils/OldApiTest.java	2014-06-27 14:59:38.000000000 +0200
++++ src/test/java/org/apache/xml/security/test/utils/OldApiTest.java-gil	2014-10-28 10:09:12.870654280 +0100
+@@ -148,33 +148,5 @@
+         resolver.resolve(uri, "test");
          resolver1.resolve(uri1, "test1");
      }
-     
+-    
 -    @org.junit.Test
 -    public void testOldKeyResolverSpi() throws Exception {
+-        OldKeyResolverSpi.number = 0;
 -        KeyResolver.register(OldKeyResolverSpi.class.getName(), true);
 -        Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();				
 -        Element el = ((Element)doc.createElement("test"));
@@ -22,6 +22,7 @@ index 2499a28..84ff7ab 100644
 -
 -    @org.junit.Test
 -    public void testOldKeyResolverSpiInKeyInfo() throws Exception {
+-        OldKeyResolverSpi.number = 0;
 -        Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
 -        Element el = (Element)doc.createElementNS("http://www.w3.org/2000/09/xmldsig#","KeyInfo");
 -        el.appendChild((Element)doc.createElementNS("http://www.w3.org/2000/09/xmldsig#","KeyInfo"));
@@ -29,7 +30,7 @@ index 2499a28..84ff7ab 100644
 -        PublicKey pk = new PublicKeyMock();
 -        ki.registerInternalKeyResolver(new OldKeyResolverNoPublicConsSpi(pk));
 -        assertNotNull(ki.getPublicKey());
--
+ 
 -    }
 -    
  }
diff --git a/xml-security.spec b/xml-security.spec
index e1b6742..de57103 100644
--- a/xml-security.spec
+++ b/xml-security.spec
@@ -29,30 +29,30 @@
 #
 
 %global oname xmlsec
+%global _version %(echo %{version} | tr . _ )
 
 Name:           xml-security
-Version:        1.5.5
+Version:        1.5.7
 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/1_5_5/xml-security-src-1_5_5.zip
+Source0:        http://archive.apache.org/dist/santuario/java-library/%{_version}/%{name}-src-%{_version}.zip
 # Certain tests fail with new JUnit
-Patch0:         %{name}-removed-tests.patch
+Patch0:         %{name}-1.5.7-removed-tests.patch
 
-BuildRequires:  java-devel
 BuildRequires:  maven-local
 BuildRequires:  maven-shared
 BuildRequires:  maven-release-plugin
-BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:  junit
-BuildRequires:  apache-commons-logging
-BuildRequires:  log4j
-BuildRequires:  xalan-j2
-BuildRequires:  xerces-j2
-BuildRequires:  xml-commons-apis
-BuildRequires:  bouncycastle
+BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  mvn(commons-logging:commons-logging)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(log4j:log4j)
+BuildRequires:  mvn(org.bouncycastle:bcprov-jdk16)
+BuildRequires:  mvn(xalan:xalan)
+BuildRequires:  mvn(xerces:xercesImpl)
+BuildRequires:  mvn(xml-apis:xml-apis)
 
 BuildArch:      noarch
 
@@ -76,11 +76,21 @@ Summary:        Samples for %{name}
 Samples for %{name}.
 
 %prep
-%setup -q -n xml-security-1_5_5
-%patch0 -p1
+%setup -q -n %{name}-%{_version}
+%patch0 -p0
 
 sed -i "s|bcprov-jdk15on|bcprov-jdk16|" pom.xml
 
+# javax.xml.crypto.MarshalException: ECKeyValue not supported
+rm -r src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java
+# IllegalArgumentException: Incorrect length for compressed encoding
+rm -r src/test/java/org/apache/xml/security/test/signature/ECDSASignatureTest.java
+
+rm -r src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java \
+ src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java \
+ src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java \
+ src/test/java/org/apache/xml/security/test/encryption/XMLEncryption11Test.java
+
 %build
 
 %mvn_file :%{oname} %{name} %{oname} 
@@ -103,6 +113,9 @@ cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Tue Oct 28 2014 gil cattaneo <puntogil at libero.it> 0:1.5.7-1
+- update to 1.5.7 (rhbz#1045257,1157992. security fix for CVE-2013-4517)
+
 * Sun Oct 27 2013 gil cattaneo <puntogil at libero.it> 0:1.5.5-1
 - update to 1.5.5