From 3820bc7652f0abe14ff99779caddf78a0e9ee187 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 8 Feb 2018 18:27:18 +0100 Subject: [PATCH 01/37] Update to version 3.3.0 Drop patches voms-clients-java-except.patch and -canl-2.5.patch --- sources | 2 +- voms-clients-java-canl-2.5.patch | 141 ------------------------------- voms-clients-java-except.patch | 20 ----- voms-clients-java.spec | 20 ++--- 4 files changed, 10 insertions(+), 173 deletions(-) delete mode 100644 voms-clients-java-canl-2.5.patch delete mode 100644 voms-clients-java-except.patch diff --git a/sources b/sources index 60ca32b..9e9ee9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f490ab2686722659049cf18a89b7355 v3.0.7.tar.gz +SHA512 (voms-clients-java-3.3.0.tar.gz) = 854c38c43d7220da3bfed370a98f74864b78c486e87ef2083e0c278d7ed94f2eb3ffc2557027790a4f69905b757dfcc047c1dcc428933a859bbb6657dfcc17b3 diff --git a/voms-clients-java-canl-2.5.patch b/voms-clients-java-canl-2.5.patch deleted file mode 100644 index 0a9b788..0000000 --- a/voms-clients-java-canl-2.5.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java ---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java 2016-09-09 12:06:42.000000000 +0200 -+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java 2018-01-05 16:06:00.586887063 +0100 -@@ -31,7 +31,7 @@ - import java.util.concurrent.TimeUnit; - - import org.bouncycastle.asn1.x509.AttributeCertificate; --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.VOMSError; - import org.italiangrid.voms.VOMSValidators; - import org.italiangrid.voms.ac.VOMSACValidator; -@@ -590,7 +590,7 @@ - - private X509Credential lookupCredential(ProxyInitParams params) { - -- PasswordFinder pf = null; -+ PasswordSupplier pf = null; - - if (params.isReadPasswordFromStdin()) - pf = PasswordFinders.getNoPromptInputStreamPasswordFinder(System.in, -diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java ---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java 2016-09-09 12:06:42.000000000 +0200 -+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadProxyCredential.java 2018-01-05 16:06:00.587887052 +0100 -@@ -15,7 +15,7 @@ - */ - package org.italiangrid.voms.clients.impl; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.clients.util.VOMSProxyPathBuilder; - import org.italiangrid.voms.credential.LoadCredentialsEventListener; - import org.italiangrid.voms.credential.impl.AbstractLoadCredentialsStrategy; -@@ -39,7 +39,7 @@ - } - - @Override -- public X509Credential loadCredentials(PasswordFinder passwordFinder) { -+ public X509Credential loadCredentials(PasswordSupplier passwordFinder) { - - if (proxyFile == null) { - String envProxyPath = System.getenv(X509_USER_PROXY); -diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java ---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java 2016-09-09 12:06:42.000000000 +0200 -+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/LoadUserCredential.java 2018-01-05 16:06:00.587887052 +0100 -@@ -15,7 +15,7 @@ - */ - package org.italiangrid.voms.clients.impl; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.credential.LoadCredentialsEventListener; - import org.italiangrid.voms.credential.impl.AbstractLoadCredentialsStrategy; - -@@ -44,7 +44,7 @@ - } - - @Override -- public X509Credential loadCredentials(PasswordFinder passwordFinder) { -+ public X509Credential loadCredentials(PasswordSupplier passwordFinder) { - - if (pkcs12File != null) - return loadPKCS12Credential(pkcs12File, passwordFinder); -diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java ---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java 2016-09-09 12:06:42.000000000 +0200 -+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/ConsolePasswordFinder.java 2018-01-05 16:06:00.583887096 +0100 -@@ -17,7 +17,7 @@ - - import java.io.Console; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.VOMSError; - - /** -@@ -25,7 +25,7 @@ - * @author andreaceccanti - * - */ --public class ConsolePasswordFinder implements PasswordFinder { -+public class ConsolePasswordFinder implements PasswordSupplier { - - private String promptMessage; - -diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java ---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java 2016-09-09 12:06:42.000000000 +0200 -+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/InputStreamPasswordFinder.java 2018-01-05 16:06:00.584887085 +0100 -@@ -22,10 +22,10 @@ - import java.io.OutputStream; - import java.io.PrintStream; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - import org.italiangrid.voms.VOMSError; - --public class InputStreamPasswordFinder implements PasswordFinder { -+public class InputStreamPasswordFinder implements PasswordSupplier { - - InputStream is; - PrintStream os; -diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java ---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java 2016-09-09 12:06:42.000000000 +0200 -+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/util/PasswordFinders.java 2018-01-05 16:06:00.584887085 +0100 -@@ -18,13 +18,13 @@ - import java.io.InputStream; - import java.io.OutputStream; - --import org.bouncycastle.openssl.PasswordFinder; -+import eu.emi.security.authn.x509.helpers.PasswordSupplier; - - public class PasswordFinders { - - public static final String PROMPT_MESSAGE = "Enter GRID pass phrase for this identity:"; - -- public static PasswordFinder getDefault() { -+ public static PasswordSupplier getDefault() { - - if (System.console() != null) - return new ConsolePasswordFinder(PROMPT_MESSAGE); -@@ -32,18 +32,18 @@ - return new InputStreamPasswordFinder(PROMPT_MESSAGE, System.in, System.out); - } - -- public static PasswordFinder getConsolePasswordFinder() { -+ public static PasswordSupplier getConsolePasswordFinder() { - - return new ConsolePasswordFinder(PROMPT_MESSAGE); - } - -- public static PasswordFinder getInputStreamPasswordFinder(InputStream is, -+ public static PasswordSupplier getInputStreamPasswordFinder(InputStream is, - OutputStream os) { - - return new InputStreamPasswordFinder(PROMPT_MESSAGE, is, os); - } - -- public static PasswordFinder getNoPromptInputStreamPasswordFinder( -+ public static PasswordSupplier getNoPromptInputStreamPasswordFinder( - InputStream is, OutputStream os) { - - return new InputStreamPasswordFinder(null, is, os); diff --git a/voms-clients-java-except.patch b/voms-clients-java-except.patch deleted file mode 100644 index 3de0d93..0000000 --- a/voms-clients-java-except.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java ---- voms-clients-3.0.7.orig/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java 2016-09-09 12:06:42.000000000 +0200 -+++ voms-clients-3.0.7/src/main/java/org/italiangrid/voms/clients/impl/DefaultVOMSProxyInitBehaviour.java 2018-01-05 16:34:10.919346599 +0100 -@@ -457,12 +457,12 @@ - if (params.isLimited()) - limitProxy(proxyOptions); - -- if (acs != null && !acs.isEmpty()) -- proxyOptions.setAttributeCertificates( -- acs.toArray(new AttributeCertificate[acs.size()])); -- - try { - -+ if (acs != null && !acs.isEmpty()) -+ proxyOptions.setAttributeCertificates( -+ acs.toArray(new AttributeCertificate[acs.size()])); -+ - ProxyCertificate proxy = ProxyGenerator.generate(proxyOptions, - credential.getKey()); - diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 67f5435..d93e7a7 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,23 +1,19 @@ Name: voms-clients-java -Version: 3.0.7 -Release: 5%{?dist} +Version: 3.3.0 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS -Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}.tar.gz -# Uncaught exception (backport from upstream) -Patch0: %{name}-except.patch -# Adapt to canl-java 2.5 -Patch1: %{name}-canl-2.5.patch +Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.italiangrid:voms-api-java) -BuildRequires: voms-api-java >= 3.2.0-5 -Requires: voms-api-java >= 3.2.0-5 +BuildRequires: voms-api-java >= 3.3.0 +Requires: voms-api-java >= 3.3.0 Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -40,8 +36,6 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. %prep %setup -q -n voms-clients-%{version} -%patch0 -p1 -%patch1 -p1 # Do not create source jars %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin @@ -148,6 +142,10 @@ fi %license LICENSE %changelog +* Thu Feb 08 2018 Mattias Ellert - 3.3.0-1 +- Update to version 3.3.0 +- Drop patches voms-clients-java-except.patch and -canl-2.5.patch + * Fri Jan 05 2018 Mattias Ellert - 3.0.7-5 - Adapt to canl-java 2.5 From cae19d582d5d21f2737a56c54e55da132bfc8fde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:38:31 +0000 Subject: [PATCH 02/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index d93e7a7..b8fcf85 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -142,6 +142,9 @@ fi %license LICENSE %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Mattias Ellert - 3.3.0-1 - Update to version 3.3.0 - Drop patches voms-clients-java-except.patch and -canl-2.5.patch From d69fb03b4d1c2422fbc85171cdcadcfea9a61830 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 31 Oct 2018 16:48:38 +0100 Subject: [PATCH 03/37] Change default proxy cert key length to 2048 bits Use a more sensible timeout --- ...t-proxy-cert-key-length-to-2048-bits.patch | 48 +++++++++++++++++++ ...nts-java-use-a-more-sensible-timeout.patch | 25 ++++++++++ voms-clients-java.spec | 14 +++++- 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch create mode 100644 voms-clients-java-use-a-more-sensible-timeout.patch diff --git a/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch b/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch new file mode 100644 index 0000000..c882966 --- /dev/null +++ b/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch @@ -0,0 +1,48 @@ +From 2dcbb765d60078c2148f77a1a873895829c7e18e Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Wed, 31 Oct 2018 14:52:28 +0100 +Subject: [PATCH] Change default proxy cert key length to 2048 bits + +--- + README.md | 4 ++-- + .../java/org/italiangrid/voms/clients/ProxyInitParams.java | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/README.md b/README.md +index 85743f1..72fd068 100644 +--- a/README.md ++++ b/README.md +@@ -108,7 +108,7 @@ subject : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr + issuer : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti + identity : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti + type : proxy +-strength : 1024 ++strength : 2048 + path : /tmp/x509up_u501 + timeleft : 11:59:48 + key usage : digitalSignature keyEncipherment dataEncipherment +@@ -122,7 +122,7 @@ subject : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr + issuer : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti + identity : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti + type : proxy +-strength : 1024 ++strength : 2048 + path : /tmp/x509up_u501 + timeleft : 12:04:48 + key usage : digitalSignature keyEncipherment dataEncipherment +diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java +index 8982f72..ce292d7 100644 +--- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java ++++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java +@@ -34,7 +34,7 @@ public class ProxyInitParams { + .toSeconds(12); + public static final int DEFAULT_AC_LIFETIME = (int) TimeUnit.HOURS + .toSeconds(12); +- public static final int DEFAULT_KEY_SIZE = 1024; ++ public static final int DEFAULT_KEY_SIZE = 2048; + + public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10; + +-- +2.17.2 + diff --git a/voms-clients-java-use-a-more-sensible-timeout.patch b/voms-clients-java-use-a-more-sensible-timeout.patch new file mode 100644 index 0000000..4ce5cb7 --- /dev/null +++ b/voms-clients-java-use-a-more-sensible-timeout.patch @@ -0,0 +1,25 @@ +From 752b6566d246210fd690da102c53e329c01a09c2 Mon Sep 17 00:00:00 2001 +From: Andrea Ceccanti +Date: Thu, 28 Jun 2018 14:41:04 +0200 +Subject: [PATCH] Use a more sensible timeout + +--- + src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java +index 87d5cc6..8982f72 100644 +--- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java ++++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java +@@ -36,7 +36,7 @@ public class ProxyInitParams { + .toSeconds(12); + public static final int DEFAULT_KEY_SIZE = 1024; + +- public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 2; ++ public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10; + + private String certFile; + private String keyFile; +-- +2.17.2 + diff --git a/voms-clients-java.spec b/voms-clients-java.spec index b8fcf85..c8d86ad 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,11 +1,17 @@ Name: voms-clients-java Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz +# Use a more sensible timeout +# Backport from upstream git +Patch0: %{name}-use-a-more-sensible-timeout.patch +# Change default proxy cert key length to 2048 bits +# https://github.com/italiangrid/voms-clients/pull/20 +Patch1: %{name}-change-default-proxy-cert-key-length-to-2048-bits.patch BuildArch: noarch BuildRequires: maven-local @@ -36,6 +42,8 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. %prep %setup -q -n voms-clients-%{version} +%patch0 -p1 +%patch1 -p1 # Do not create source jars %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin @@ -142,6 +150,10 @@ fi %license LICENSE %changelog +* Wed Oct 31 2018 Mattias Ellert - 3.3.0-3 +- Change default proxy cert key length to 2048 bits +- Use a more sensible timeout + * Sat Jul 14 2018 Fedora Release Engineering - 3.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d3c0279fc33e59209205e70387ac6bd7ac5f2f30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:26:00 +0000 Subject: [PATCH 04/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index c8d86ad..ae35f6d 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -150,6 +150,9 @@ fi %license LICENSE %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Oct 31 2018 Mattias Ellert - 3.3.0-3 - Change default proxy cert key length to 2048 bits - Use a more sensible timeout From a6fcc57f0cfcbe77a9eac47a9e532dd369d2236b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:09:37 +0000 Subject: [PATCH 05/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index ae35f6d..8288025 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -150,6 +150,9 @@ fi %license LICENSE %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 08fbf981a23f23666abdc12123ba98c2c661ae4e Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 20 Aug 2019 08:45:38 +0200 Subject: [PATCH 06/37] Remove maven-javadoc-plugin configuration --- voms-clients-java.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 8288025..6d8680f 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -45,6 +45,11 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. %patch0 -p1 %patch1 -p1 +# Remove maven-javadoc-plugin configuration +# We are not building the javadoc for this package +# And its presence causes the EPEL 8 build to fail +%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin + # Do not create source jars %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin @@ -150,6 +155,9 @@ fi %license LICENSE %changelog +* Tue Aug 20 2019 Mattias Ellert - 3.3.0-6 +- Remove maven-javadoc-plugin configuration + * Sat Jul 27 2019 Fedora Release Engineering - 3.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 5fc48f82d36d3a95d0090d8b9b91d20693e90ef9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:21:53 +0000 Subject: [PATCH 07/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 6d8680f..80dde83 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -155,6 +155,9 @@ fi %license LICENSE %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 20 2019 Mattias Ellert - 3.3.0-6 - Remove maven-javadoc-plugin configuration From 05c3c9db0787dc27fcc5266e24a8ca6b0985cf8b Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 08:14:00 +0200 Subject: [PATCH 08/37] Rebuilt for JDK-11 --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 80dde83..3e59439 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -155,6 +155,9 @@ fi %license LICENSE %changelog +* Sat Jul 11 2020 Jiri Vanek - 3.3.0-8 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri Jan 31 2020 Fedora Release Engineering - 3.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5d87619fdffb642f88ba0031e6eba6a12e4a7b15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:52:16 +0000 Subject: [PATCH 09/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 3e59439..b18bb3f 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -155,6 +155,9 @@ fi %license LICENSE %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 3.3.0-8 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From d23308e2a0599df51a85a63a8ee32f7f1fadfd17 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 13 Oct 2020 20:45:37 +0200 Subject: [PATCH 10/37] Update to version 3.3.2 Drop patches voms-clients-java-use-a-more-sensible-timeout.patch and voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch --- sources | 2 +- ...t-proxy-cert-key-length-to-2048-bits.patch | 48 ------------------- ...nts-java-use-a-more-sensible-timeout.patch | 25 ---------- voms-clients-java.spec | 21 ++++---- 4 files changed, 10 insertions(+), 86 deletions(-) delete mode 100644 voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch delete mode 100644 voms-clients-java-use-a-more-sensible-timeout.patch diff --git a/sources b/sources index 9e9ee9f..7629928 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.0.tar.gz) = 854c38c43d7220da3bfed370a98f74864b78c486e87ef2083e0c278d7ed94f2eb3ffc2557027790a4f69905b757dfcc047c1dcc428933a859bbb6657dfcc17b3 +SHA512 (voms-clients-java-3.3.2.tar.gz) = 2228e1ee45aac029eaacc8ed859d42ec6668b1d885ab1a7dd2372dfa3fc28814be0edcbea8996f46152fcfed68390dbed8f1526e3d77935de18766748711d4c2 diff --git a/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch b/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch deleted file mode 100644 index c882966..0000000 --- a/voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2dcbb765d60078c2148f77a1a873895829c7e18e Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Wed, 31 Oct 2018 14:52:28 +0100 -Subject: [PATCH] Change default proxy cert key length to 2048 bits - ---- - README.md | 4 ++-- - .../java/org/italiangrid/voms/clients/ProxyInitParams.java | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/README.md b/README.md -index 85743f1..72fd068 100644 ---- a/README.md -+++ b/README.md -@@ -108,7 +108,7 @@ subject : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr - issuer : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti - identity : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti - type : proxy --strength : 1024 -+strength : 2048 - path : /tmp/x509up_u501 - timeleft : 11:59:48 - key usage : digitalSignature keyEncipherment dataEncipherment -@@ -122,7 +122,7 @@ subject : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti/CN=pr - issuer : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti - identity : /C=IT/O=INFN/OU=Personal Certificate/L=CNAF/CN=Andrea Ceccanti - type : proxy --strength : 1024 -+strength : 2048 - path : /tmp/x509up_u501 - timeleft : 12:04:48 - key usage : digitalSignature keyEncipherment dataEncipherment -diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java -index 8982f72..ce292d7 100644 ---- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java -+++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java -@@ -34,7 +34,7 @@ public class ProxyInitParams { - .toSeconds(12); - public static final int DEFAULT_AC_LIFETIME = (int) TimeUnit.HOURS - .toSeconds(12); -- public static final int DEFAULT_KEY_SIZE = 1024; -+ public static final int DEFAULT_KEY_SIZE = 2048; - - public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10; - --- -2.17.2 - diff --git a/voms-clients-java-use-a-more-sensible-timeout.patch b/voms-clients-java-use-a-more-sensible-timeout.patch deleted file mode 100644 index 4ce5cb7..0000000 --- a/voms-clients-java-use-a-more-sensible-timeout.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 752b6566d246210fd690da102c53e329c01a09c2 Mon Sep 17 00:00:00 2001 -From: Andrea Ceccanti -Date: Thu, 28 Jun 2018 14:41:04 +0200 -Subject: [PATCH] Use a more sensible timeout - ---- - src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java -index 87d5cc6..8982f72 100644 ---- a/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java -+++ b/src/main/java/org/italiangrid/voms/clients/ProxyInitParams.java -@@ -36,7 +36,7 @@ public class ProxyInitParams { - .toSeconds(12); - public static final int DEFAULT_KEY_SIZE = 1024; - -- public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 2; -+ public static final int DEFAULT_CONNECT_TIMEOUT_IN_SECONDS = 10; - - private String certFile; - private String keyFile; --- -2.17.2 - diff --git a/voms-clients-java.spec b/voms-clients-java.spec index b18bb3f..d7000d5 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,25 +1,19 @@ Name: voms-clients-java -Version: 3.3.0 -Release: 9%{?dist} +Version: 3.3.2 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz -# Use a more sensible timeout -# Backport from upstream git -Patch0: %{name}-use-a-more-sensible-timeout.patch -# Change default proxy cert key length to 2048 bits -# https://github.com/italiangrid/voms-clients/pull/20 -Patch1: %{name}-change-default-proxy-cert-key-length-to-2048-bits.patch BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(org.italiangrid:voms-api-java) -BuildRequires: voms-api-java >= 3.3.0 -Requires: voms-api-java >= 3.3.0 +BuildRequires: voms-api-java >= 3.3.2 +Requires: voms-api-java >= 3.3.2 Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -42,8 +36,6 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. %prep %setup -q -n voms-clients-%{version} -%patch0 -p1 -%patch1 -p1 # Remove maven-javadoc-plugin configuration # We are not building the javadoc for this package @@ -155,6 +147,11 @@ fi %license LICENSE %changelog +* Tue Oct 13 2020 Mattias Ellert - 3.3.2-1 +- Update to version 3.3.2 +- Drop patches voms-clients-java-use-a-more-sensible-timeout.patch and + voms-clients-java-change-default-proxy-cert-key-length-to-2048-bits.patch + * Wed Jul 29 2020 Fedora Release Engineering - 3.3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f9a3c8d07fff23b9506c0e73f3ef3eb5da650af3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:13:53 +0000 Subject: [PATCH 11/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index d7000d5..52c5206 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -147,6 +147,9 @@ fi %license LICENSE %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Oct 13 2020 Mattias Ellert - 3.3.2-1 - Update to version 3.3.2 - Drop patches voms-clients-java-use-a-more-sensible-timeout.patch and From 4a1dff0fe48483a765a8eab908788b3d3ab5ccd0 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 17 May 2021 10:19:38 +0200 Subject: [PATCH 12/37] Add missing build requires mvn(junit:junit) --- voms-clients-java.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 52c5206..fdc29cc 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.italiangrid:voms-api-java) BuildRequires: voms-api-java >= 3.3.2 Requires: voms-api-java >= 3.3.2 @@ -147,6 +148,9 @@ fi %license LICENSE %changelog +* Mon May 17 2021 Mattias Ellert - 3.3.2-3 +- Add missing build requires mvn(junit:junit) + * Wed Jan 27 2021 Fedora Release Engineering - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1c833e9e0a330465eb979c5feba95ac3c7ff00c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:39:10 +0000 Subject: [PATCH 13/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index fdc29cc..1aeca01 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -148,6 +148,9 @@ fi %license LICENSE %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mattias Ellert - 3.3.2-3 - Add missing build requires mvn(junit:junit) From 98b5537eaa4883b574e544d300d20c7d6d6f8baf Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Fri, 14 Jan 2022 09:51:44 +0100 Subject: [PATCH 14/37] Add bcutil to classpath --- voms-clients-java.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 1aeca01..c74941a 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -63,21 +63,21 @@ mkdir -p %{buildroot}%{_bindir} cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3 cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3 cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3 @@ -148,6 +148,9 @@ fi %license LICENSE %changelog +* Fri Jan 14 2022 Mattias Ellert - 3.3.2-5 +- Add bcutil to classpath + * Fri Jul 23 2021 Fedora Release Engineering - 3.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4231a8fdfd276a27e72344653fe582e272fe21c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:09:56 +0000 Subject: [PATCH 15/37] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index c74941a..04636ee 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -148,6 +148,9 @@ fi %license LICENSE %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.3.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Mattias Ellert - 3.3.2-5 - Add bcutil to classpath From 3eb67ee25feee8b4065dc49951477b770e0dd4e6 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:35:55 +0100 Subject: [PATCH 16/37] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 04636ee..1c9b75d 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -148,6 +148,9 @@ fi %license LICENSE %changelog +* Sat Feb 05 2022 Jiri Vanek - 3.3.2-7 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 3.3.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a826a1604b688106d6eb592102eaf9b1c82f785e Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 16:59:11 +0200 Subject: [PATCH 17/37] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- voms-clients-java.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 1c9b75d..95ef567 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,12 +1,13 @@ Name: voms-clients-java Version: 3.3.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) @@ -148,6 +149,9 @@ fi %license LICENSE %changelog +* Fri Jul 08 2022 Jiri Vanek - 3.3.2-8 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 3.3.2-7 - Rebuilt for java-17-openjdk as system jdk From 1c941628991cf39caf91a8f7af13dbecf5a88d88 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 18 Jul 2022 23:53:58 +0200 Subject: [PATCH 18/37] mixed-use-of-spaces-and-tabs --- voms-clients-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 95ef567..0cd6cdd 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -7,7 +7,7 @@ License: ASL 2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local BuildRequires: mvn(commons-cli:commons-cli) From 9ae2b93ce87d2ed0e6215f1fba5dbc5970c82208 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:05:47 +0000 Subject: [PATCH 19/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 0cd6cdd..4badfe6 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.3.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 3.3.2-8 - Rebuilt for Drop i686 JDKs From 072f6fe933615f300d22be8e412d3e4feb6c96c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:29:16 +0000 Subject: [PATCH 20/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 4badfe6..a12f6a2 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.3.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 3.3.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c20a30e877bba9a86c5588d86096c9e76f25d61b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:51:20 +0000 Subject: [PATCH 21/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index a12f6a2..fb24c06 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.3.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.3.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From de1f386bccdead89fada427822281051d0fd7b7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:11:19 +0000 Subject: [PATCH 22/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index fb24c06..409ee20 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.3.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5ab7015192252a224d549cab6b365dfaa474249d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:28:31 +0100 Subject: [PATCH 23/37] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 409ee20..64fbb9c 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Tue Feb 27 2024 Jiri Vanek - 3.3.2-13 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 73d5cdc8d0c218a61e7af844d8d30c34528992e1 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 21:40:02 +0100 Subject: [PATCH 24/37] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 409ee20..345f5e6 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Mar 02 2024 Jiri Vanek - 3.3.2-13 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2d95f0b2e3ed3ff6ea5a39c5a824468da7fa7c3e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 23 May 2024 10:14:18 +0200 Subject: [PATCH 25/37] Add Requires on java-headless --- voms-clients-java.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 64fbb9c..cdd4409 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -16,6 +16,7 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.italiangrid:voms-api-java) BuildRequires: voms-api-java >= 3.3.2 Requires: voms-api-java >= 3.3.2 +Requires: java-headless Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -149,6 +150,9 @@ fi %license LICENSE %changelog +* Thu May 23 2024 Marian Koncek - 3.3.2-14 +- Add Requires on java-headless + * Tue Feb 27 2024 Jiri Vanek - 3.3.2-13 - Rebuilt for java-21-openjdk as system jdk From 7a8b449212c0be32d3dfd242927edfb4acba0fce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:59:59 +0000 Subject: [PATCH 26/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 0428e8d..ef7e2ad 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -174,6 +174,9 @@ fi %license LICENSE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.3.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 24 2024 Mattias Ellert - 3.3.2-15 - Update License tags (SPDX) - Add additional ghost files to package (rpmlint) From 1ed23e9d78e298e4e8212661577b1d86c369092e Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 3 Aug 2024 23:55:51 +0200 Subject: [PATCH 27/37] Update to version 3.3.3 --- sources | 2 +- voms-clients-java.spec | 61 +++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/sources b/sources index 7629928..76118e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.2.tar.gz) = 2228e1ee45aac029eaacc8ed859d42ec6668b1d885ab1a7dd2372dfa3fc28814be0edcbea8996f46152fcfed68390dbed8f1526e3d77935de18766748711d4c2 +SHA512 (voms-clients-java-3.3.3.tar.gz) = cb53d1dbdd53447af006a5cce9167407c16f7eca055f3f658d3c795a74d0b4f3ec7de240999b98097d26b52c90e7ede771cedb6383feafce23029fed7b0de8ff diff --git a/voms-clients-java.spec b/voms-clients-java.spec index ef7e2ad..904c8ac 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java -Version: 3.3.2 -Release: 16%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -14,8 +14,8 @@ BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.italiangrid:voms-api-java) -BuildRequires: voms-api-java >= 3.3.2 -Requires: voms-api-java >= 3.3.2 +BuildRequires: voms-api-java >= 3.3.3 +Requires: voms-api-java >= 3.3.3 Requires: java-headless Requires(post): %{_sbindir}/update-alternatives @@ -62,43 +62,35 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. mkdir -p %{buildroot}%{_bindir} +%if %{?rhel}%{!?rhel:0} == 8 +guava_cp="guava20" +bc_cp="bcpkix bcprov" +%else +guava_cp="guava/guava" +bc_cp="bcpkix bcutil bcprov" +%endif + cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java ${guava_cp} ${bc_cp} commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3 cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java ${guava_cp} ${bc_cp} commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3 cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java ${guava_cp} ${bc_cp} commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3 -ln -s %{_sysconfdir}/alternatives/voms-proxy-init \ - %{buildroot}%{_bindir}/voms-proxy-init -ln -s %{_sysconfdir}/alternatives/voms-proxy-info \ - %{buildroot}%{_bindir}/voms-proxy-info -ln -s %{_sysconfdir}/alternatives/voms-proxy-destroy \ - %{buildroot}%{_bindir}/voms-proxy-destroy - -mkdir -p %{buildroot}%{_sysconfdir}/alternatives - -ln -s %{_bindir}/voms-proxy-init3 \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-init -ln -s %{_bindir}/voms-proxy-info3 \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-info -ln -s %{_bindir}/voms-proxy-destroy3 \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-destroy - mkdir -p %{buildroot}%{_mandir}/man1 install -p -m 644 man/voms-proxy-init.1 \ %{buildroot}%{_mandir}/man1/voms-proxy-init3.1 @@ -107,19 +99,13 @@ install -p -m 644 man/voms-proxy-info.1 \ install -p -m 644 man/voms-proxy-destroy.1 \ %{buildroot}%{_mandir}/man1/voms-proxy-destroy3.1 -ln -s %{_sysconfdir}/alternatives/voms-proxy-init.1.gz \ - %{buildroot}%{_mandir}/man1/voms-proxy-init.1.gz -ln -s %{_sysconfdir}/alternatives/voms-proxy-info.1.gz \ - %{buildroot}%{_mandir}/man1/voms-proxy-info.1.gz -ln -s %{_sysconfdir}/alternatives/voms-proxy-destroy.1.gz \ - %{buildroot}%{_mandir}/man1/voms-proxy-destroy.1.gz - -ln -s %{_mandir}/man1/voms-proxy-init3.1.gz \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-init.1.gz -ln -s %{_mandir}/man1/voms-proxy-info3.1.gz \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-info.1.gz -ln -s %{_mandir}/man1/voms-proxy-destroy3.1.gz \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-destroy.1.gz +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +for b in voms-proxy-init voms-proxy-info voms-proxy-destroy; do + ln -s %{_bindir}/${b}3 %{buildroot}%{_sysconfdir}/alternatives/${b} + ln -s %{_sysconfdir}/alternatives/${b} %{buildroot}%{_bindir}/${b} + ln -s %{_mandir}/man1/${b}3.1.gz %{buildroot}%{_sysconfdir}/alternatives/${b}.1.gz + ln -s %{_sysconfdir}/alternatives/${b}.1.gz %{buildroot}%{_mandir}/man1/${b}.1.gz +done mkdir -p %{buildroot}%{_mandir}/man5 install -p -m 644 man/vomsdir.5 %{buildroot}%{_mandir}/man5/vomsdir.5 @@ -174,6 +160,9 @@ fi %license LICENSE %changelog +* Sat Aug 03 2024 Mattias Ellert - 3.3.3-1 +- Update to version 3.3.3 + * Sat Jul 20 2024 Fedora Release Engineering - 3.3.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9fc0db2eb82e77f4b0722be2c7ad00b9e4e13d0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:36:15 +0000 Subject: [PATCH 28/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 904c8ac..7d1854e 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -160,6 +160,9 @@ fi %license LICENSE %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Aug 03 2024 Mattias Ellert - 3.3.3-1 - Update to version 3.3.3 From eb7cdfd063c342f63ac30b8fd9adbf1b8dbae651 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 19 Apr 2025 15:30:52 +0200 Subject: [PATCH 29/37] Update to version 3.3.5 --- sources | 2 +- voms-clients-java.spec | 45 ++++++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/sources b/sources index 76118e6..b4e4f9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.3.tar.gz) = cb53d1dbdd53447af006a5cce9167407c16f7eca055f3f658d3c795a74d0b4f3ec7de240999b98097d26b52c90e7ede771cedb6383feafce23029fed7b0de8ff +SHA512 (voms-clients-java-3.3.5.tar.gz) = 4b470ed835036a5f2d554e64ae173e7a72b15d6abb9bdc2f2a605d95f677d9740ac193955e0334f6eef13ab1a3254dfaad7712907df9f846e9d75d6fe68d1b75 diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 7d1854e..eefcbef 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,21 +1,22 @@ Name: voms-clients-java -Version: 3.3.3 -Release: 2%{?dist} +Version: 3.3.5 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 URL: https://wiki.italiangrid.it/VOMS Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz + BuildArch: noarch ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local +BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.italiangrid:voms-api-java) -BuildRequires: voms-api-java >= 3.3.3 -Requires: voms-api-java >= 3.3.3 +BuildRequires: asciidoctor +Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 Requires: java-headless Requires(post): %{_sbindir}/update-alternatives @@ -51,43 +52,46 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. # Don't do assembly %pom_remove_plugin :maven-assembly-plugin -# Remove license plugin -%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin +# The asciidoctor plugin is not available in Fedora +# Run asciidoctor explicitly in the build section instead +%pom_remove_plugin org.asciidoctor:asciidoctor-maven-plugin + +%if %{?rhel}%{!?rhel:0} == 9 +# Default openjdk in RHEL 9 is 11 +%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source/text()" 11 +%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target/text()" 11 +%endif %build %mvn_build -j +pushd man +for x in *.adoc ; do asciidoctor -b manpage $x ; done +popd + %install %mvn_install mkdir -p %{buildroot}%{_bindir} -%if %{?rhel}%{!?rhel:0} == 8 -guava_cp="guava20" -bc_cp="bcpkix bcprov" -%else -guava_cp="guava/guava" -bc_cp="bcpkix bcutil bcprov" -%endif - cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java ${guava_cp} ${bc_cp} commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3 cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java ${guava_cp} ${bc_cp} commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3 cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF #!/bin/sh VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} -java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java ${guava_cp} ${bc_cp} commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" +java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3 @@ -156,10 +160,13 @@ fi %ghost %{_sysconfdir}/alternatives/voms-proxy-init.1* %{_mandir}/man5/vomsdir.5* %{_mandir}/man5/vomses.5* -%doc AUTHORS README.md +%doc README.md %license LICENSE %changelog +* Sat Apr 19 2025 Mattias Ellert - 3.3.5-1 +- Update to version 3.3.5 + * Sun Jan 19 2025 Fedora Release Engineering - 3.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 56d5d340798930d4febbc1d83a6d273b6cbc6589 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 22 Apr 2025 22:43:40 +0200 Subject: [PATCH 30/37] Update URL tag --- voms-clients-java.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index eefcbef..ecb0d4c 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,11 +1,11 @@ Name: voms-clients-java Version: 3.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 -URL: https://wiki.italiangrid.it/VOMS -Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/italiangrid/voms-clients +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -43,7 +43,6 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. # Remove maven-javadoc-plugin configuration # We are not building the javadoc for this package -# And its presence causes the EPEL 8 build to fail %pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin # Do not create source jars @@ -164,6 +163,9 @@ fi %license LICENSE %changelog +* Tue Apr 22 2025 Mattias Ellert - 3.3.5-2 +- Update URL tag + * Sat Apr 19 2025 Mattias Ellert - 3.3.5-1 - Update to version 3.3.5 From 105cedfefe2638bac310cf553e1254e1e1ae2b9a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 8 Jul 2025 22:09:20 +0200 Subject: [PATCH 31/37] Allow alternative java versions in EPEL 9 --- voms-clients-java.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index ecb0d4c..d33f76e 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -17,10 +17,15 @@ BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: asciidoctor Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 +%if %{?rhel}%{!?rhel:0} == 9 +Requires: (java-headless or java-11-headless or java-17-headless or java-21-headless) +Suggests: java-headless +%else Requires: java-headless +%endif Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(preun): %{_sbindir}/update-alternatives # Older versions of voms-clients did not have alternatives Conflicts: voms-clients < 2.0.12 @@ -56,7 +61,7 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. %pom_remove_plugin org.asciidoctor:asciidoctor-maven-plugin %if %{?rhel}%{!?rhel:0} == 9 -# Default openjdk in RHEL 9 is 11 +# Default build JDK in RHEL 9 is 11 %pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source/text()" 11 %pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target/text()" 11 %endif @@ -128,7 +133,7 @@ install -p -m 644 man/vomses.5 %{buildroot}%{_mandir}/man5/vomses.5 --slave %{_mandir}/man1/voms-proxy-destroy.1.gz voms-proxy-destroy-man \ %{_mandir}/man1/voms-proxy-destroy3.1.gz -%postun +%preun if [ $1 -eq 0 ] ; then %{_sbindir}/update-alternatives --remove voms-proxy-init \ %{_bindir}/voms-proxy-init3 @@ -163,10 +168,13 @@ fi %license LICENSE %changelog +* Tue Jul 08 2025 Mattias Ellert - 3.3.5-3 +- Allow alternative java versions in EPEL 9 + * Tue Apr 22 2025 Mattias Ellert - 3.3.5-2 - Update URL tag -* Sat Apr 19 2025 Mattias Ellert - 3.3.5-1 +* Sat Apr 19 2025 Mattias Ellert - 3.3.5-1 - Update to version 3.3.5 * Sun Jan 19 2025 Fedora Release Engineering - 3.3.3-2 From 180b90ed236f2f8a176bbfefe5fa0500fbfce52c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:13:10 +0000 Subject: [PATCH 32/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index d33f76e..1088631 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -168,6 +168,9 @@ fi %license LICENSE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 08 2025 Mattias Ellert - 3.3.5-3 - Allow alternative java versions in EPEL 9 From 6fc6c00dc42183907ace7f49b1df9a9ce25c92c5 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:26:36 +0200 Subject: [PATCH 33/37] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- voms-clients-java.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 1088631..fd9b0da 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -10,7 +10,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) @@ -21,7 +21,7 @@ Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 Requires: (java-headless or java-11-headless or java-17-headless or java-21-headless) Suggests: java-headless %else -Requires: java-headless +Requires: java-25-headless %endif Requires(post): %{_sbindir}/update-alternatives @@ -168,6 +168,9 @@ fi %license LICENSE %changelog +* Mon Jul 28 2025 jiri vanek - 3.3.5-5 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 3.3.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a045e9478632cf5ebbb756e61acc2b4c4264e22a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 6 Aug 2025 10:32:44 +0200 Subject: [PATCH 34/37] Update to version 3.3.6 --- sources | 2 +- voms-clients-java.spec | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sources b/sources index b4e4f9c..6fa7c95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.5.tar.gz) = 4b470ed835036a5f2d554e64ae173e7a72b15d6abb9bdc2f2a605d95f677d9740ac193955e0334f6eef13ab1a3254dfaad7712907df9f846e9d75d6fe68d1b75 +SHA512 (voms-clients-java-3.3.6.tar.gz) = b0ee2a09e7e4001e23f5afd48e07c410a75d08eea3fe62377afce489e1e8058e90ff46e7869ba1afff636969b498b1f1002d14ea6a077cfe24f98a979842542d diff --git a/voms-clients-java.spec b/voms-clients-java.spec index fd9b0da..7340759 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java -Version: 3.3.5 -Release: 5%{?dist} +Version: 3.3.6 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -10,19 +10,24 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch +%if %{?fedora}%{!?fedora:0} >= 43 BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 +%else +BuildRequires: maven-local +%endif +BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.6 BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: asciidoctor -Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 +Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.6 %if %{?rhel}%{!?rhel:0} == 9 -Requires: (java-headless or java-11-headless or java-17-headless or java-21-headless) -Suggests: java-headless +Requires: (java-headless or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java-25-headless) %else -Requires: java-25-headless +Requires: (java-headless or java-21-headless or java-25-headless) %endif +Suggests: java-headless +Requires: javapackages-tools Requires(post): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives @@ -60,12 +65,6 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. # Run asciidoctor explicitly in the build section instead %pom_remove_plugin org.asciidoctor:asciidoctor-maven-plugin -%if %{?rhel}%{!?rhel:0} == 9 -# Default build JDK in RHEL 9 is 11 -%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source/text()" 11 -%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target/text()" 11 -%endif - %build %mvn_build -j @@ -168,6 +167,9 @@ fi %license LICENSE %changelog +* Wed Aug 06 2025 Mattias Ellert - 3.3.6-1 +- Update to version 3.3.6 + * Mon Jul 28 2025 jiri vanek - 3.3.5-5 - Rebuilt for java-25-openjdk as preffered jdk From c8949c50200d5177ac0dba4e01fcdc6e03585bd4 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 21 Dec 2025 05:52:31 +0100 Subject: [PATCH 35/37] Update to version 3.3.7 Increase default max heap memory (following upstream) --- sources | 2 +- voms-clients-java.spec | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 6fa7c95..3bbcccc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.6.tar.gz) = b0ee2a09e7e4001e23f5afd48e07c410a75d08eea3fe62377afce489e1e8058e90ff46e7869ba1afff636969b498b1f1002d14ea6a077cfe24f98a979842542d +SHA512 (voms-clients-java-3.3.7.tar.gz) = 7ed80d50ec844a93fa6f566523fb64dc0b37b7163501bd30029a6ed7bf1d01103fc753daf438405b645c1e8b501846297cc705893fced23e270f31f7b89e7eda diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 7340759..eab22ce 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,5 +1,5 @@ Name: voms-clients-java -Version: 3.3.6 +Version: 3.3.7 Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients @@ -15,12 +15,12 @@ BuildRequires: maven-local-openjdk25 %else BuildRequires: maven-local %endif -BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.6 +BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.7 BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: asciidoctor -Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.6 +Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.7 %if %{?rhel}%{!?rhel:0} == 9 Requires: (java-headless or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java-25-headless) %else @@ -79,21 +79,21 @@ mkdir -p %{buildroot}%{_bindir} cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF #!/bin/sh -VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} +VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx32m"} java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3 cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF #!/bin/sh -VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} +VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx32m"} java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3 cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF #!/bin/sh -VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} +VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx32m"} java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3 @@ -167,7 +167,11 @@ fi %license LICENSE %changelog -* Wed Aug 06 2025 Mattias Ellert - 3.3.6-1 +* Sat Dec 20 2025 Mattias Ellert - 3.3.7-1 +- Update to version 3.3.7 +- Increase default max heap memory (following upstream) + +* Wed Aug 06 2025 Mattias Ellert - 3.3.6-1 - Update to version 3.3.6 * Mon Jul 28 2025 jiri vanek - 3.3.5-5 From 5d1e672620e39f489c846891830319e0c10211cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:02:57 +0000 Subject: [PATCH 36/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index eab22ce..85a58db 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -167,6 +167,9 @@ fi %license LICENSE %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.3.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sat Dec 20 2025 Mattias Ellert - 3.3.7-1 - Update to version 3.3.7 - Increase default max heap memory (following upstream) From 69e28755573088742f5e895dcdf5e0635a99c664 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:37:04 +0000 Subject: [PATCH 37/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 85a58db..144f451 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -167,6 +167,9 @@ fi %license LICENSE %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.3.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 3.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild