Skip to content

Commit 878aa60

Browse files
committed
Drop the el9 cert changes for now; still make an osg-ca-certs-java RPM
1 parent c053a6f commit 878aa60

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

rpm/osg-ca-certs.spec

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
%define osg_version 1.116
33
%define release_num 1
44
%define vtag %{osg_version}.igtf.%{igtf_version}-%{release_num}
5+
%define enable_trusted_sha1_certs 0
56

67
Name: osg-ca-certs
78
Version: %{osg_version}
@@ -59,7 +60,14 @@ export CADIST=$PWD/certificates
5960
export PKG_NAME=%{name}
6061

6162
./build-certificates-dir.sh
63+
64+
%if 0%{?enable_trusted_sha1_certs}
6265
./add-trusted-sha1-certs.sh certificates trusted-cert java-cert
66+
%else
67+
# We still want to make the osg-ca-certs and osg-ca-certs-java RPMs
68+
find certificates -name "*.pem" -exec cp '{}' '{}.java-cert' ';'
69+
find certificates -name "*.pem" -exec mv '{}' '{}.trusted-cert' ';'
70+
%endif
6371

6472
%install
6573
mkdir -p $RPM_BUILD_ROOT/etc/grid-security/certificates

0 commit comments

Comments
 (0)