Skip to content

Commit

Permalink
Merge pull request #137 from mwestphall/hotfix/revert-136-1
Browse files Browse the repository at this point in the history
Hotfix: Revert Release 136-1
  • Loading branch information
brianhlin authored May 15, 2024
2 parents 1c9aa37 + 455826f commit 4a332d7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions rpm/vo-client.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
%define iam_vomses 0

Name: vo-client
Version: 136
Version: 137
Release: 1%{?dist}
Summary: Contains vomses file for use with user authentication

Expand Down Expand Up @@ -62,8 +62,6 @@ sed -Ei '/.*voms-(alice|lhcb|ops)-auth.app.cern.ch.*/d' vomses
%if ! 0%{?iam_vomses}
# Additional entries from SOFTWARE-5843:
sed -Ei '/.*voms-(alice|atlas|cms|dteam|lhcb)-auth.cern.ch.*/d' vomses
# Additional entries from SOFTWARE-5861:
sed -Ei '/"(alice|atlas|cms|lhcb)".*(lcg-)?voms2.cern.ch.*/d' vomses
%endif

%install
Expand Down Expand Up @@ -96,6 +94,9 @@ find $RPM_BUILD_ROOT/%{_sysconfdir}/grid-security/vomsdir -type d -exec chmod 75
%config(noreplace) %{_datadir}/osg/grid-vorolemap

%changelog
* Wed May 15 2024 Matt Westphall <[email protected]> - 137-1
- Roll back release 136-1 due to incompatibility with new IAM servers

* Mon May 06 2024 Matt Westphall <[email protected]> - 136-1
- Only include *-auth.app.cern.ch in vomses for new CERN IAM endpoints (SOFTWARE-5861)

Expand Down

0 comments on commit 4a332d7

Please sign in to comment.