SOFTWARE-5790: update to igtf-126

Author: mwestphall

CHANGES

@@ -8,6 +8,11 @@ the VDT, then please refer to this link:
    http://vdt.cs.wisc.edu/releases/certs/ca_changes.txt
 OSG CA Package in new format (md5, sha1 hashes) to support openssl 1.x
 
+===== Version 1.117 (IGTF 1.126) ===========
+Built 3 JAN 2024
+
+* removed replaced InCommon IGTF Server CA and associated Comodo RSA CA (US)
+* removed discontinued UNLPGrid CA (CL)
 
 ===== Version 1.116 (IGTF 1.125) ===========
 Built 29 NOV 2023

rpm/igtf-ca-certs.spec

@@ -1,5 +1,5 @@
-%define igtf_version 1.125
-%define osg_version  1.116
+%define igtf_version 1.126
+%define osg_version  1.117
 %define release_num  1
 %define vtag         %{osg_version}.igtf.%{igtf_version}-%{release_num}
 
@@ -61,6 +61,9 @@ sha256sum -c cacerts_sha256sum.txt
 %doc
 
 %changelog
+* Wed Jan 3 2024 Matt Westphall <westphall@wisc.edu> - 1.117-1
+- Update to IGTF 1.126 (SOFTWARE-5790)
+
 * Wed Nov 29 2023 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.125-1
 - Update to IGTF 1.125 (SOFTWARE-5764)
 

rpm/osg-ca-certs.spec

@@ -1,6 +1,6 @@
-%define igtf_version 1.125
-%define osg_version  1.116
-%define release_num  3
+%define igtf_version 1.126
+%define osg_version  1.117
+%define release_num  1
 %define vtag         %{osg_version}.igtf.%{igtf_version}-%{release_num}
 %define enable_trusted_sha1_certs 0
 
@@ -33,26 +33,10 @@ Conflicts:      osg-ca-scripts
 Obsoletes:      vdt-ca-certs
 Obsoletes:      osg-ca-certs-experimental
 Obsoletes:      osg-ca-certs-compat <= 1:1.37
-%if 0%{?rhel} >= 8
-RemovePathPostfixes: .trusted-cert
-%endif
 
 %description
 For details about the current certificate release, see https://repo.opensciencegrid.org/cadist/ and change log at https://repo.opensciencegrid.org/cadist/CHANGES.
 
-%if 0%{?rhel} >= 8
-%package java
-Summary: Java-compatible SHA1 certs for %{name}
-BuildArch: noarch
-Conflicts: osg-ca-scripts
-Provides:  grid-certificates = 7
-
-RemovePathPostfixes: .java-cert
-
-%description java
-For details about the current certificate release, see https://repo.opensciencegrid.org/cadist/ and change log at https://repo.opensciencegrid.org/cadist/CHANGES.
-%endif
-
 %prep
 %setup    -n osg-certificates-%{vtag}
 %setup -D -n osg-certificates-%{vtag} -a 1
@@ -67,16 +51,6 @@ export PKG_NAME=%{name}
 
 ./build-certificates-dir.sh
 
-%if 0%{?rhel} >= 8
-%if 0%{?enable_trusted_sha1_certs}
-./add-trusted-sha1-certs.sh certificates trusted-cert java-cert
-%else
-# We still want to make the osg-ca-certs and osg-ca-certs-java RPMs
-find certificates -name "*.pem" -exec cp '{}' '{}.java-cert' ';'
-find certificates -name "*.pem" -exec mv '{}' '{}.trusted-cert' ';'
-%endif
-%endif
-
 %install
 mkdir -p $RPM_BUILD_ROOT/etc/grid-security/certificates
 mv certificates/* $RPM_BUILD_ROOT/etc/grid-security/certificates/
@@ -93,15 +67,10 @@ mv certificates/* $RPM_BUILD_ROOT/etc/grid-security/certificates/
 /etc/grid-security/certificates/*
 %doc
 
-%if 0%{?rhel} >= 8
-%files java
-%defattr(0644,root,root,-)
-%dir %attr(0755,root,root) /etc/grid-security/certificates
-/etc/grid-security/certificates/*
-%doc
-%endif
-
 %changelog
+* Wed Jan 3 2024 Matt Westphall <westphall@wisc.edu> - 1.117-1
+- Update to IGTF 1.126, remove java certs again (SOFTWARE-5790)
+
 * Thu Nov 30 2023 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.116-3
 - Provide grid-certificates in osg-ca-certs-java (SOFTWARE-5764)