Compare commits

..

No commits in common. "rawhide" and "f30" have entirely different histories.

6 changed files with 324 additions and 1 deletions

12
.gitignore vendored Normal file
View file

@ -0,0 +1,12 @@
/xml-security-src-1_4_5.zip
/xml-security-build_xml.patch
/xml-security-disable-test-fail.patch
/xml-security-notest.patch
/xmlsec-1.4.5.pom
/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
/xml-security-src-1_5_8.zip
/xmlsec-2.0.4-source-release.zip
/xmlsec-2.0.6-source-release.zip

117
changelog-pre2.txt Normal file
View file

@ -0,0 +1,117 @@
* Sat Feb 14 2015 gil cattaneo <puntogil@libero.it> 0:1.5.8-1
- update to 1.5.8
- introduce license macro
* Tue Oct 28 2014 gil cattaneo <puntogil@libero.it> 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 <rel-eng@lists.fedoraproject.org> - 0:1.5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sun Oct 27 2013 gil cattaneo <puntogil@libero.it> 0:1.5.5-1
- update to 1.5.5
* Sun Aug 18 2013 gil cattaneo <puntogil@libero.it> 0:1.5.3-7
- built with XMvn
- fix BR list
- adapt to current guideline
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Apr 05 2013 Tomas Radej <tradej@redhat.com> - 0:1.5.3-5
- Removed failing tests due to new JUnit
* Fri Feb 22 2013 Andy Grimm <agrimm@gmail.com> 0:1.5.3-4
- Add maven-shared to BuildRequires (RHBZ#914587)
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 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 <mgoldman@redhat.com> - 0:1.5.3-1
- Upstream release 1.5.3
- Change build system to Maven
- Cleanups
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Sep 20 2011 Andy Grimm <agrimm@gmail.com> 0:1.4.5-2
- Fixes for package review
* Wed Sep 07 2011 Andy Grimm <agrimm@gmail.com> 0:1.4.5-1
- Follow Fedora guidelines
* Sat Jan 09 2010 Will Tatam <will.tatam@red61.com> 1.4.2-5
- Auto rebuild for JPackage 6 in centos5 mock
* Mon Aug 17 2009 David Walluck <dwalluck@redhat.com> 0:1.4.2-4
- remove unneeded bouncycastle
* Sat Aug 15 2009 Ralph Apel <r.apel@r-apel.de> 0:1.4.2-3
- Add pom and depmap frag
* Tue May 26 2009 David Walluck <dwalluck@redhat.com> 0:1.4.2-2
- fix log4j location in patch
* Tue May 26 2009 David Walluck <dwalluck@redhat.com> 0:1.4.2-1
- 1.4.2
* Mon Jan 12 2009 David Walluck <dwalluck@redhat.com> 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 <dwalluck@redhat.com> 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 <dwalluck@redhat.com> 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 <vivekl@redhat.com> 0:1.3.0-1jpp.ep1.2
- Fix repolib location
* Tue Mar 13 2007 Fernando nasser <fnasser@redhat.com> 0:1.3.0-1jpp.ep1.1
- Remove duplicate macros
* Tue Feb 20 2007 Vivek Lakshmanan <vivekl@redhat.com> 0:1.3.0-1jpp.el4ep1.2
- Install jar with name as used upstream
- Add -brew suffix
* Sun Feb 18 2007 Vivek Lakshmanan <vivekl@redhat.com> 0:1.3.0-1jpp.el4ep1.1
- Add repolib support
- Add missing BR on ant-junit
* Tue Aug 01 2006 Fernando nasser <fnasser@redhat.com> 0:1.3.0-1jpp_1rh
- Merge with upstream
* Tue Jan 17 2006 Deepak Bhole <dbhole@redhat.com> 0:1.3.0-1jpp
- Upgrade to version 1.3.0.
- Removed com.sun dependencies.
- Removed bouncycastle dependency.
* Thu Oct 20 2005 Fernando nasser <fnasser@redhat.com> 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 <r.apel at r-apel.de> 0:1.2.97-1jpp
- Upgrade to build/run with JAXP-1.3
* Mon Apr 04 2005 Ralph Apel <r.apel at r-apel.de> 0:1.2.1-1jpp
- First JPackage release

View file

@ -1 +0,0 @@
Orphaned for 6+ weeks

1
sources Normal file
View file

@ -0,0 +1 @@
b22da531a320679fe9e4484e936f9668 xmlsec-2.0.6-source-release.zip

View file

@ -0,0 +1,29 @@
--- 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);
}

165
xml-security.spec Normal file
View file

@ -0,0 +1,165 @@
%global oname xmlsec
%global _version %(echo %{version} | tr . _ )
Name: xml-security
Version: 2.0.6
Release: 7%{?dist}
Epoch: 0
Summary: Implementation of W3C security standards for XML
License: ASL 2.0
URL: http://santuario.apache.org/
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: 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)
BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
BuildRequires: mvn(org.eclipse.jetty:jetty-servlets)
BuildRequires: mvn(org.jvnet.jaxb2.maven2:maven-jaxb22-plugin)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-log4j12)
BuildRequires: mvn(xalan:xalan)
BuildRequires: mvn(xerces:xercesImpl)
BuildRequires: mvn(xml-apis:xml-apis)
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
W3C standards :
- XML-Signature Syntax and Processing; and
- XML Encryption Syntax and Processing.
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
This package contains javadoc for %{name}.
%package demo
Summary: Samples for %{name}
%description demo
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
# 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
%pom_xpath_remove "pom:profiles/pom:profile[pom:id = 'eclipse.moxy']"
# javax.xml.crypto.MarshalException: ECKeyValue not supported
rm -r src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java
# UnrecoverableKey
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/dom/signature/ECDSASignatureTest.java
# Fails for various reason
rm -r src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java \
src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java \
src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java \
src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java \
src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java \
src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java \
src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java \
src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java \
src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java \
src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java \
src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java \
src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java \
src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.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
%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}
%files -f .mfiles
%license LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE
%files demo
%{_datadir}/%{name}
%license LICENSE NOTICE
%changelog
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Apr 08 2016 gil cattaneo <puntogil@libero.it> - 0:2.0.6-2
- rebuilt
* Fri Mar 25 2016 gil cattaneo <puntogil@libero.it> 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 <releng@fedoraproject.org> - 0:2.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Apr 22 2015 gil cattaneo <puntogil@libero.it> 0:2.0.4-1
- Update to 2.0.4