[voms-api-java/epel7] Update to version 3.0.5
Mattias Ellert
ellert at fedoraproject.org
Wed Dec 17 09:38:39 UTC 2014
commit 6106dca2ee197a5b2126adab0691a0d345f5c163
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Dec 17 10:37:14 2014 +0100
Update to version 3.0.5
- Rebase patches (and fix some deprecation warnings)
sources | 2 +-
voms-api-java-bc147.patch | 493 +++++++++++++++++++++---------------------
voms-api-java-no-local.patch | 42 ++--
voms-api-java.spec | 11 +-
4 files changed, 277 insertions(+), 271 deletions(-)
---
diff --git a/sources b/sources
index 4a41eef..a337770 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74d86f25fa4beacc822467ec28ddb210 v3.0.4.tar.gz
+3753669f345146bfc7060612fa4d5a3d v3.0.5.tar.gz
diff --git a/voms-api-java-bc147.patch b/voms-api-java-bc147.patch
index 93af308..22a4e22 100644
--- a/voms-api-java-bc147.patch
+++ b/voms-api-java-bc147.patch
@@ -1,29 +1,6 @@
-diff -ur voms-api-java-3.0.4.orig/pom.xml voms-api-java-3.0.4/pom.xml
---- voms-api-java-3.0.4.orig/pom.xml 2014-10-14 14:19:12.000000000 +0200
-+++ voms-api-java-3.0.4/pom.xml 2014-11-17 17:52:47.126546807 +0100
-@@ -43,7 +43,7 @@
- <junit.version>4.11</junit.version>
- <hamcrest.version>1.3</hamcrest.version>
- <canl.version>1.3.2</canl.version>
-- <bcmail.version>1.46</bcmail.version>
-+ <bcpkix.version>1.47</bcpkix.version>
- <mockito.version>1.9.5</mockito.version>
- <jcip.version>1.0</jcip.version>
-
-@@ -235,8 +235,8 @@
-
- <dependency>
- <groupId>org.bouncycastle</groupId>
-- <artifactId>bcmail-jdk16</artifactId>
-- <version>${bcmail.version}</version>
-+ <artifactId>bcpkix-jdk15on</artifactId>
-+ <version>${bcpkix.version}</version>
- </dependency>
-
- <dependency>
-diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java
---- voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-10-14 14:19:12.000000000 +0200
-+++ voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-11-17 17:50:20.346253852 +0100
+diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java
+--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-12-09 10:55:31.000000000 +0100
++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/ac/impl/DefaultVOMSValidationStrategy.java 2014-12-17 09:19:10.674934059 +0100
@@ -39,7 +39,7 @@
import javax.security.auth.x500.X500Principal;
@@ -33,27 +10,31 @@ diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/ac/impl/Def
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
import org.bouncycastle.operator.ContentVerifierProvider;
-@@ -215,7 +215,7 @@
-
- private boolean checkNoRevAvailExtension(VOMSAttribute attributes, List<VOMSValidationErrorMessage> validationErrors){
-
-- X509Extension noRevAvail = attributes.getVOMSAC().getExtension(X509Extension.noRevAvail);
-+ Extension noRevAvail = attributes.getVOMSAC().getExtension(Extension.noRevAvail);
- if (noRevAvail != null && noRevAvail.isCritical()){
- validationErrors.add(newErrorMessage(other, "NoRevAvail AC extension cannot be critical!"));
- return false;
-@@ -225,7 +225,7 @@
-
- private boolean checkAuthorityKeyIdentifierExtension(VOMSAttribute attributes, List<VOMSValidationErrorMessage> validationErrors){
-
-- X509Extension authKeyId = attributes.getVOMSAC().getExtension(X509Extension.authorityKeyIdentifier);
-+ Extension authKeyId = attributes.getVOMSAC().getExtension(Extension.authorityKeyIdentifier);
- if (authKeyId != null && authKeyId.isCritical()){
- validationErrors.add(newErrorMessage(other, "AuthorityKeyIdentifier AC extension cannot be critical!"));
- return false;
-diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java
---- voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-10-14 14:19:12.000000000 +0200
-+++ voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-11-17 17:50:20.346253852 +0100
+@@ -239,8 +239,8 @@
+ private boolean checkNoRevAvailExtension(VOMSAttribute attributes,
+ List<VOMSValidationErrorMessage> validationErrors) {
+
+- X509Extension noRevAvail = attributes.getVOMSAC().getExtension(
+- X509Extension.noRevAvail);
++ Extension noRevAvail = attributes.getVOMSAC().getExtension(
++ Extension.noRevAvail);
+ if (noRevAvail != null && noRevAvail.isCritical()) {
+ validationErrors.add(newErrorMessage(other,
+ "NoRevAvail AC extension cannot be critical!"));
+@@ -252,8 +252,8 @@
+ private boolean checkAuthorityKeyIdentifierExtension(
+ VOMSAttribute attributes, List<VOMSValidationErrorMessage> validationErrors) {
+
+- X509Extension authKeyId = attributes.getVOMSAC().getExtension(
+- X509Extension.authorityKeyIdentifier);
++ Extension authKeyId = attributes.getVOMSAC().getExtension(
++ Extension.authorityKeyIdentifier);
+ if (authKeyId != null && authKeyId.isCritical()) {
+ validationErrors.add(newErrorMessage(other,
+ "AuthorityKeyIdentifier AC extension cannot be critical!"));
+diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java
+--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-12-09 10:55:31.000000000 +0100
++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACGenerator.java 2014-12-17 09:45:43.404176616 +0100
@@ -30,20 +30,21 @@
import org.bouncycastle.asn1.ASN1Encodable;
import org.bouncycastle.asn1.ASN1EncodableVector;
@@ -79,121 +60,126 @@ diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSAC
import org.bouncycastle.cert.X509AttributeCertificateHolder;
import org.bouncycastle.cert.X509v2AttributeCertificateBuilder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-@@ -160,7 +161,7 @@
- return String.format("%s://%s:%d", voName, host, port);
- }
-
-- private ASN1Encodable buildACCertsExtensionContent(
-+ private ASN1Object buildACCertsExtensionContent(
- EnumSet<ACGenerationProperties> properties) {
-
- ASN1EncodableVector issuerCertsContainer = new ASN1EncodableVector();
-@@ -169,7 +170,7 @@
- issuerCertsContainer.add(new DERSequence());
- else
- issuerCertsContainer.add(new DERSequence(
-- getCertAsDEREncodable(aaCredential.getCertificate())));
-+ getCertAsASN1Encodable(aaCredential.getCertificate())));
-
- return new DERSequence(issuerCertsContainer);
- }
-@@ -177,7 +178,7 @@
- private AuthorityKeyIdentifier buildAuthorityKeyIdentifier() {
-
- byte[] authKeyId = aaCredential.getCertificate().getExtensionValue(
-- X509Extension.authorityKeyIdentifier.toString());
-+ Extension.authorityKeyIdentifier.toString());
-
- if (authKeyId != null) {
- return new AuthorityKeyIdentifier(authKeyId);
-@@ -186,7 +187,7 @@
- return null;
- }
-
-- private ASN1Encodable buildFQANsAttributeContent(List<String> fqans,
-+ private ASN1Object buildFQANsAttributeContent(List<String> fqans,
- GeneralName policyAuthorityInfo) {
-
- ASN1EncodableVector container = new ASN1EncodableVector();
-@@ -204,7 +205,7 @@
- return new DERSequence(container);
- }
-
-- private ASN1Encodable buildGAExtensionContent(
-+ private ASN1Object buildGAExtensionContent(
- EnumSet<ACGenerationProperties> properties, List<VOMSGenericAttribute> gas,
- GeneralName policyAuthorityInfo) {
-
-@@ -265,7 +266,7 @@
-
- }
-
-- private ASN1Encodable buildTargetsExtensionContent(
-+ private ASN1Object buildTargetsExtensionContent(
- EnumSet<ACGenerationProperties> properties, List<String> targets) {
-
- ASN1EncodableVector targetSeq = new ASN1EncodableVector();
-@@ -329,6 +330,8 @@
- GeneralName policyAuthorityInfo = buildPolicyAuthorityInfo(voName, host,
- port);
-
-+ try {
+@@ -156,7 +157,7 @@
+ return String.format("%s://%s:%d", voName, host, port);
+ }
+
+- private ASN1Encodable buildACCertsExtensionContent(
++ private ASN1Object buildACCertsExtensionContent(
+ EnumSet<ACGenerationProperties> properties) {
+
+ ASN1EncodableVector issuerCertsContainer = new ASN1EncodableVector();
+@@ -166,7 +167,7 @@
+ issuerCertsContainer.add(new DERSequence());
+ else
+ issuerCertsContainer.add(new DERSequence(
+- getCertAsDEREncodable(aaCredential.getCertificate())));
++ getCertAsASN1Encodable(aaCredential.getCertificate())));
+
+ return new DERSequence(issuerCertsContainer);
+ }
+@@ -174,7 +175,7 @@
+ private AuthorityKeyIdentifier buildAuthorityKeyIdentifier() {
+
+ byte[] authKeyId = aaCredential.getCertificate().getExtensionValue(
+- X509Extension.authorityKeyIdentifier.toString());
++ Extension.authorityKeyIdentifier.toString());
+
+ if (authKeyId != null) {
+ return new AuthorityKeyIdentifier(authKeyId);
+@@ -183,7 +184,7 @@
+ return null;
+ }
+
+- private ASN1Encodable buildFQANsAttributeContent(List<String> fqans,
++ private ASN1Object buildFQANsAttributeContent(List<String> fqans,
+ GeneralName policyAuthorityInfo) {
+
+ ASN1EncodableVector container = new ASN1EncodableVector();
+@@ -201,7 +202,7 @@
+ return new DERSequence(container);
+ }
+
+- private ASN1Encodable buildGAExtensionContent(
++ private ASN1Object buildGAExtensionContent(
+ EnumSet<ACGenerationProperties> properties, List<VOMSGenericAttribute> gas,
+ GeneralName policyAuthorityInfo) {
+
+@@ -262,7 +263,7 @@
+
+ }
+
+- private ASN1Encodable buildTargetsExtensionContent(
++ private ASN1Object buildTargetsExtensionContent(
+ EnumSet<ACGenerationProperties> properties, List<String> targets) {
+
+ ASN1EncodableVector targetSeq = new ASN1EncodableVector();
+@@ -315,6 +316,8 @@
+ GeneralName policyAuthorityInfo = buildPolicyAuthorityInfo(voName, host,
+ port);
+
++ try {
+
- builder.addAttribute(VOMS_FQANS_OID,
- buildFQANsAttributeContent(fqans, policyAuthorityInfo));
+ builder.addAttribute(VOMS_FQANS_OID,
+ buildFQANsAttributeContent(fqans, policyAuthorityInfo));
-@@ -341,7 +344,7 @@
- policyAuthorityInfo));
+@@ -327,7 +330,7 @@
+ policyAuthorityInfo));
- if (targets != null && !targets.isEmpty())
-- builder.addExtension(X509Extension.targetInformation, true,
-+ builder.addExtension(Extension.targetInformation, true,
- buildTargetsExtensionContent(generationProperties, targets));
+ if (targets != null && !targets.isEmpty())
+- builder.addExtension(X509Extension.targetInformation, true,
++ builder.addExtension(Extension.targetInformation, true,
+ buildTargetsExtensionContent(generationProperties, targets));
- if (!generationProperties
-@@ -365,16 +368,20 @@
- .contains(ACGenerationProperties.INCLUDE_CRITICAL_AKID_EXTENSION))
- akidIsCritical = true;
+ if (!generationProperties
+@@ -350,13 +353,17 @@
+ .contains(ACGenerationProperties.INCLUDE_CRITICAL_AKID_EXTENSION))
+ akidIsCritical = true;
-- builder.addExtension(X509Extension.noRevAvail,
-+ builder.addExtension(Extension.noRevAvail,
- noRevAvailIsCritical,
- new DERNull());
+- builder.addExtension(X509Extension.noRevAvail, noRevAvailIsCritical,
+- new DERNull());
++ builder.addExtension(Extension.noRevAvail, noRevAvailIsCritical,
++ DERNull.INSTANCE);
- AuthorityKeyIdentifier akid = buildAuthorityKeyIdentifier();
+ AuthorityKeyIdentifier akid = buildAuthorityKeyIdentifier();
-- builder.addExtension(X509Extension.authorityKeyIdentifier,
-+ builder.addExtension(Extension.authorityKeyIdentifier,
- akidIsCritical,
- akid != null ? akid : new DERNull());
-
-+ } catch (CertIOException e) {
-+ throw new VOMSError(e.getMessage(), e);
-+ }
+- builder.addExtension(X509Extension.authorityKeyIdentifier, akidIsCritical,
+- akid != null ? akid : new DERNull());
++ builder.addExtension(Extension.authorityKeyIdentifier, akidIsCritical,
++ akid != null ? akid : DERNull.INSTANCE);
+
- return builder.build(getSigner(generationProperties));
++ } catch (CertIOException e) {
++ throw new VOMSError(e.getMessage(), e);
++ }
+
+ return builder.build(getSigner(generationProperties));
+
+@@ -373,19 +380,19 @@
+ DERSequence acSeq = new DERSequence(vomsACs);
+
+ CertificateExtension ext = new CertificateExtension(
+- VOMS_EXTENSION_OID.getId(), acSeq.toASN1Object(), false);
++ VOMS_EXTENSION_OID.getId(), acSeq.toASN1Primitive(), false);
- }
-@@ -395,14 +402,14 @@
- return ext;
- }
+ return ext;
+ }
-- private DEREncodable getCertAsDEREncodable(X509Certificate cert) {
-+ private ASN1Encodable getCertAsASN1Encodable(X509Certificate cert) {
+- private DEREncodable getCertAsDEREncodable(X509Certificate cert) {
++ private ASN1Encodable getCertAsASN1Encodable(X509Certificate cert) {
- try {
- byte[] certBytes = cert.getEncoded();
+ try {
+ byte[] certBytes = cert.getEncoded();
- ByteArrayInputStream bais = new ByteArrayInputStream(certBytes);
- ASN1InputStream is = new ASN1InputStream(bais);
-- DERObject derCert = is.readObject();
-+ ASN1Primitive derCert = is.readObject();
- is.close();
- return derCert;
+ ByteArrayInputStream bais = new ByteArrayInputStream(certBytes);
+ ASN1InputStream is = new ASN1InputStream(bais);
+- DERObject derCert = is.readObject();
++ ASN1Primitive derCert = is.readObject();
+ is.close();
+ return derCert;
-diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java
---- voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-10-14 14:19:12.000000000 +0200
-+++ voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-11-17 17:50:20.347253840 +0100
+diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java
+--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-09 10:55:31.000000000 +0100
++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSACUtils.java 2014-12-17 09:51:02.983413156 +0100
@@ -31,21 +31,21 @@
import org.bouncycastle.asn1.ASN1InputStream;
@@ -220,82 +206,94 @@ diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSAC
import org.bouncycastle.cert.X509AttributeCertificateHolder;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jce.provider.X509CertificateObject;
-@@ -160,7 +160,7 @@
- private static List<String> deserializeACTargets(X509AttributeCertificateHolder ac){
- List<String> targets = new ArrayList<String>();
-
-- X509Extension targetExtension = ac.getExtension(X509Extension.targetInformation);
-+ Extension targetExtension = ac.getExtension(Extension.targetInformation);
-
- if (targetExtension == null)
- return targets;
-@@ -172,7 +172,7 @@
-
- // The deserialization has to be done by hand since it seems VOMS
- // does not correctly encode the ACTargets extension...
-- ASN1Sequence targetSequence = (ASN1Sequence) asn1TargetContainer.getDERObject();
-+ ASN1Sequence targetSequence = (ASN1Sequence) asn1TargetContainer.toASN1Primitive();
- Target[] asn1Targets = new Target[targetSequence.size()];
-
- int count = 0;
-@@ -257,8 +257,8 @@
- Attribute[] asn1Attrs = acHolder.getAttributes(VOMS_FQANS_OID);
-
- for (Attribute a: asn1Attrs){
-- DERObject theVOMSDerObject = a.getAttributeValues()[0].getDERObject();
-- IetfAttrSyntax attrSyntax = new IetfAttrSyntax(ASN1Sequence.getInstance(theVOMSDerObject));
-+ ASN1Primitive theVOMSDerObject = a.getAttributeValues()[0].toASN1Primitive();
-+ IetfAttrSyntax attrSyntax = IetfAttrSyntax.getInstance(ASN1Sequence.getInstance(theVOMSDerObject));
-
-
- String policyAuthority = policyAuthoritySanityChecks(attrSyntax);
-@@ -307,7 +307,7 @@
-
- List<VOMSGenericAttribute> gas = new ArrayList<VOMSGenericAttribute>();
-
-- X509Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID);
-+ Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID);
-
- if (gasExtension == null)
- return gas;
-@@ -365,7 +365,7 @@
- private static X509Certificate[] deserializeACCerts(X509AttributeCertificateHolder ac){
- List<X509Certificate> certs = new ArrayList<X509Certificate>();
-
-- X509Extension e = ac.getExtension(VOMS_CERTS_OID);
-+ Extension e = ac.getExtension(VOMS_CERTS_OID);
-
- if (e == null)
- return null;
-@@ -378,7 +378,7 @@
- certSeq = (ASN1Sequence)certSeq.getObjectAt(0);
-
- @SuppressWarnings("unchecked")
-- Enumeration<DERSequence> encodedCerts = certSeq.getObjects();
-+ Enumeration<DLSequence> encodedCerts = certSeq.getObjects();
-
- CertificateFactory cf = null;
-
-@@ -390,14 +390,14 @@
-
- while (encodedCerts.hasMoreElements()){
-
-- DERSequence s = encodedCerts.nextElement();
-+ DLSequence s = encodedCerts.nextElement();
- X509CertificateObject certObj = null;
- byte[] certData = null;
- X509Certificate theCert = null;
-
- try {
-
-- certObj = new X509CertificateObject(X509CertificateStructure.getInstance(ASN1Sequence.getInstance(s)));
-+ certObj = new X509CertificateObject(Certificate.getInstance(ASN1Sequence.getInstance(s)));
- certData = certObj.getEncoded();
- theCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(certData));
-
-diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java
---- voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-10-14 14:19:12.000000000 +0200
-+++ voms-api-java-3.0.4/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-11-17 17:50:20.347253840 +0100
+@@ -124,7 +124,7 @@
+
+ while (theACs.hasMoreElements()) {
+
+- AttributeCertificate parsedAC = new AttributeCertificate(
++ AttributeCertificate parsedAC = AttributeCertificate.getInstance(
+ theACs.nextElement());
+ acs.add(parsedAC);
+ }
+@@ -178,8 +178,8 @@
+
+ List<String> targets = new ArrayList<String>();
+
+- X509Extension targetExtension = ac
+- .getExtension(X509Extension.targetInformation);
++ Extension targetExtension = ac
++ .getExtension(Extension.targetInformation);
+
+ if (targetExtension == null)
+ return targets;
+@@ -193,7 +193,7 @@
+ // The deserialization has to be done by hand since it seems VOMS
+ // does not correctly encode the ACTargets extension...
+ ASN1Sequence targetSequence = (ASN1Sequence) asn1TargetContainer
+- .getDERObject();
++ .toASN1Primitive();
+ Target[] asn1Targets = new Target[targetSequence.size()];
+
+ int count = 0;
+@@ -291,8 +291,8 @@
+ Attribute[] asn1Attrs = acHolder.getAttributes(VOMS_FQANS_OID);
+
+ for (Attribute a : asn1Attrs) {
+- DERObject theVOMSDerObject = a.getAttributeValues()[0].getDERObject();
+- IetfAttrSyntax attrSyntax = new IetfAttrSyntax(
++ ASN1Primitive theVOMSDerObject = a.getAttributeValues()[0].toASN1Primitive();
++ IetfAttrSyntax attrSyntax = IetfAttrSyntax.getInstance(
+ ASN1Sequence.getInstance(theVOMSDerObject));
+
+ String policyAuthority = policyAuthoritySanityChecks(attrSyntax);
+@@ -350,7 +350,7 @@
+
+ List<VOMSGenericAttribute> gas = new ArrayList<VOMSGenericAttribute>();
+
+- X509Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID);
++ Extension gasExtension = ac.getExtension(VOMS_GENERIC_ATTRS_OID);
+
+ if (gasExtension == null)
+ return gas;
+@@ -416,7 +416,7 @@
+
+ List<X509Certificate> certs = new ArrayList<X509Certificate>();
+
+- X509Extension e = ac.getExtension(VOMS_CERTS_OID);
++ Extension e = ac.getExtension(VOMS_CERTS_OID);
+
+ if (e == null)
+ return null;
+@@ -429,7 +429,7 @@
+ certSeq = (ASN1Sequence) certSeq.getObjectAt(0);
+
+ @SuppressWarnings("unchecked")
+- Enumeration<DERSequence> encodedCerts = certSeq.getObjects();
++ Enumeration<DLSequence> encodedCerts = certSeq.getObjects();
+
+ CertificateFactory cf = null;
+
+@@ -443,7 +443,7 @@
+
+ while (encodedCerts.hasMoreElements()) {
+
+- DERSequence s = encodedCerts.nextElement();
++ DLSequence s = encodedCerts.nextElement();
+ X509CertificateObject certObj = null;
+ byte[] certData = null;
+ X509Certificate theCert = null;
+@@ -451,7 +451,7 @@
+ try {
+
+ certObj = new X509CertificateObject(
+- X509CertificateStructure.getInstance(ASN1Sequence.getInstance(s)));
++ Certificate.getInstance(ASN1Sequence.getInstance(s)));
+ certData = certObj.getEncoded();
+ theCert = (X509Certificate) cf
+ .generateCertificate(new ByteArrayInputStream(certData));
+diff -ur voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java
+--- voms-api-java-3.0.5.orig/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-12-09 10:55:31.000000000 +0100
++++ voms-api-java-3.0.5/src/main/java/org/italiangrid/voms/asn1/VOMSConstants.java 2014-12-17 09:19:10.761933034 +0100
@@ -20,7 +20,7 @@
import java.util.Set;
@@ -305,21 +303,19 @@ diff -ur voms-api-java-3.0.4.orig/src/main/java/org/italiangrid/voms/asn1/VOMSCo
/**
* A set of useful constants for ASN.1 parsing of VOMS attributes.
-@@ -54,8 +54,8 @@
- VOMS_FQANS_OID,
- VOMS_CERTS_OID,
- VOMS_GENERIC_ATTRS_OID,
-- X509Extension.targetInformation,
-- X509Extension.noRevAvail,
-- X509Extension.authorityKeyIdentifier));
-+ Extension.targetInformation,
-+ Extension.noRevAvail,
-+ Extension.authorityKeyIdentifier));
-
+@@ -56,7 +56,7 @@
+
+ public final Set<ASN1ObjectIdentifier> VOMS_HANDLED_EXTENSIONS = new HashSet<ASN1ObjectIdentifier>(
+ Arrays.asList(VOMS_FQANS_OID, VOMS_CERTS_OID, VOMS_GENERIC_ATTRS_OID,
+- X509Extension.targetInformation, X509Extension.noRevAvail,
+- X509Extension.authorityKeyIdentifier));
++ Extension.targetInformation, Extension.noRevAvail,
++ Extension.authorityKeyIdentifier));
+
}
-diff -ur voms-api-java-3.0.4.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java voms-api-java-3.0.4/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java
---- voms-api-java-3.0.4.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-10-14 14:19:12.000000000 +0200
-+++ voms-api-java-3.0.4/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-11-17 17:50:20.348253829 +0100
+diff -ur voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java
+--- voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-12-09 10:55:31.000000000 +0100
++++ voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestNoExtensionValidation.java 2014-12-17 09:19:10.761933034 +0100
@@ -15,6 +15,7 @@
*/
package org.italiangrid.voms.test.ac;
@@ -328,12 +324,13 @@ diff -ur voms-api-java-3.0.4.orig/src/test/java/org/italiangrid/voms/test/ac/Tes
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.SignatureException;
-@@ -52,7 +53,7 @@
- }
-
- @Test
-- public void testNoExtensionValidation() throws InvalidKeyException, CertificateParsingException, SignatureException, NoSuchAlgorithmException {
-+ public void testNoExtensionValidation() throws InvalidKeyException, CertificateParsingException, SignatureException, NoSuchAlgorithmException, IOException {
- ProxyCertificateOptions options = new ProxyCertificateOptions(cred.getCertificateChain());
- options.setType(ProxyType.LEGACY);
-
+@@ -55,7 +56,8 @@
+
+ @Test
+ public void testNoExtensionValidation() throws InvalidKeyException,
+- CertificateParsingException, SignatureException, NoSuchAlgorithmException {
++ CertificateParsingException, SignatureException, NoSuchAlgorithmException,
++ IOException {
+
+ ProxyCertificateOptions options = new ProxyCertificateOptions(
+ cred.getCertificateChain());
diff --git a/voms-api-java-no-local.patch b/voms-api-java-no-local.patch
index d088970..e63d618 100644
--- a/voms-api-java-no-local.patch
+++ b/voms-api-java-no-local.patch
@@ -1,21 +1,21 @@
-diff -ur voms-api-java-3.0.4.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java voms-api-java-3.0.4/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
---- voms-api-java-3.0.4.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2014-10-14 14:19:12.000000000 +0200
-+++ voms-api-java-3.0.4/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2014-11-18 17:42:40.727483267 +0100
-@@ -330,7 +330,7 @@
- r.getValidationErrors().get(0).getMessage());
- }
-
-- @Test
-+ // @Test
- public void testTargetValidationSuccess() throws Exception {
- VOMSAA aa = Utils.getVOMSAA();
-
-@@ -357,7 +357,7 @@
- Assert.assertTrue(r.isValid());
- }
-
-- @Test
-+ // @Test
- public void testTargetValidationFailure() throws Exception {
- VOMSAA aa = Utils.getVOMSAA();
-
+diff -ur voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java
+--- voms-api-java-3.0.5.orig/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2014-12-09 10:55:31.000000000 +0100
++++ voms-api-java-3.0.5/src/test/java/org/italiangrid/voms/test/ac/TestACValidator.java 2014-12-16 14:00:01.144948880 +0100
+@@ -351,7 +351,7 @@
+ .getValidationErrors().get(0).getMessage());
+ }
+
+- @Test
++ // @Test
+ public void testTargetValidationSuccess() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
+@@ -379,7 +379,7 @@
+ Assert.assertTrue(r.isValid());
+ }
+
+- @Test
++ // @Test
+ public void testTargetValidationFailure() throws Exception {
+
+ VOMSAA aa = Utils.getVOMSAA();
diff --git a/voms-api-java.spec b/voms-api-java.spec
index a2248ab..8a89f2d 100644
--- a/voms-api-java.spec
+++ b/voms-api-java.spec
@@ -1,5 +1,5 @@
Name: voms-api-java
-Version: 3.0.4
+Version: 3.0.5
Release: 1%{?dist}
Summary: Virtual Organization Membership Service Java API
@@ -57,6 +57,11 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%if %{?fedora}%{!?fedora:0} >= 21 || %{?rhel}%{!?rhel:0} >= 7
%patch0 -p1
+%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:groupId/text()" "org.bouncycastle"
+%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:artifactId/text()" "bcpkix-jdk15on"
+%else
+%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:groupId/text()" "org.bouncycastle"
+%pom_xpath_replace "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:artifactId/text()" "bcmail-jdk16"
%endif
%patch1 -p1
@@ -90,6 +95,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%doc LICENSE
%changelog
+* Tue Dec 16 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0.5-1
+- Update to version 3.0.5
+- Rebase patches (and fix some deprecation warnings)
+
* Mon Nov 17 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0.4-1
- Update to version 3.0.4
- Drop patch voms-api-java-timezone-dep-test.patch (fixed upstream)
More information about the scm-commits
mailing list