Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix: Revert Release 136-1 #137

Merged
merged 2 commits into from
May 15, 2024
Merged

Hotfix: Revert Release 136-1 #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3b7754
Revert "Edit vomses for atlas, alice, lhcb, and cms in spec file"
mwestphall May 15, 2024
455826f
bump release version
mwestphall May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions rpm/vo-client.spec
View file
Open in desktop
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
Loading