diff --git a/xml-security-2.0.2-remove-Buffer.patch b/xml-security-2.0.2-remove-Buffer.patch deleted file mode 100644 index b7c0314b521fdff6358d631e00351106decc92c5..0000000000000000000000000000000000000000 --- a/xml-security-2.0.2-remove-Buffer.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java 2014-09-22 10:28:56.000000000 +0200 -+++ src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java-gil 2015-01-12 22:13:09.147731487 +0100 -@@ -20,7 +20,7 @@ - - import org.apache.xml.security.stax.ext.XMLSecurityUtils; - import org.eclipse.jetty.http.MimeTypes; --import org.eclipse.jetty.io.Buffer; -+//import org.eclipse.jetty.io.Buffer; - import org.eclipse.jetty.server.Server; - import org.eclipse.jetty.servlet.ServletContextHandler; - import org.eclipse.jetty.servlet.ServletHolder; -@@ -104,7 +104,7 @@ - for (int i = 0; i < paths.size(); i++) { - String s = paths.get(i); - InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(s + "/" + file); -- if (inputStream != null) { -+ /*if (inputStream != null) { - - Buffer mime = mimeTypes.getMimeByExtension(req.getPathInfo()); - if (mime != null) { -@@ -113,7 +113,7 @@ - XMLSecurityUtils.copy(inputStream, resp.getOutputStream()); - inputStream.close(); - return; -- } -+ }*/ - } - resp.sendError(HttpServletResponse.SC_NOT_FOUND); - } diff --git a/xml-security.spec b/xml-security.spec index 3eee4955498058b82aa66882fcd050d6387b9631..8bdeee185ee0a644965715033bae07adbac1ede3 100644 --- a/xml-security.spec +++ b/xml-security.spec @@ -2,15 +2,14 @@ %global _version %(echo %{version} | tr . _ ) Name: xml-security -Version: 2.0.6 +Version: 3.0.1 Release: 1 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/2_0_6/xmlsec-%{version}-source-release.zip -# Unavailable class in jetty8/9 org.eclipse.jetty.io.Buffer -Patch0: xml-security-2.0.2-remove-Buffer.patch +Source0: https://archive.apache.org/dist/santuario/java-library/3_0_1/xmlsec-%{version}-source-release.zip + BuildRequires: maven-local mvn(commons-codec:commons-codec) mvn(junit:junit) BuildRequires: mvn(log4j:log4j:1.2.17) mvn(org.apache:apache:pom:) @@ -43,7 +42,6 @@ Samples for %{name}. %prep %setup -q -n %{oname}-%{version} %pom_xpath_set "pom:properties/pom:jetty.version" 9.0.5.v20130815 -%patch0 -p0 %pom_remove_plugin :maven-pmd-plugin %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :animal-sniffer-maven-plugin @@ -103,5 +101,8 @@ cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} %license LICENSE NOTICE %changelog +* Wed Aug 14 2024 yueyaoqiang - 0:3.0.1-1 +- update to 3.0.1 + * Mon Aug 17 2020 maminjie - 2.0.6-1 - package init diff --git a/xmlsec-2.0.6-source-release.zip b/xmlsec-3.0.1-source-release.zip similarity index 41% rename from xmlsec-2.0.6-source-release.zip rename to xmlsec-3.0.1-source-release.zip index ef1b7c2cb7fd9bb8160447068ac795905a6d2cbe..73f6aa2f1f09612ea46e8f8bdc91f974daf6daf2 100644 Binary files a/xmlsec-2.0.6-source-release.zip and b/xmlsec-3.0.1-source-release.zip differ