From 50daf99f89de7421a93588e95513bed78de06056 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 21 Jan 2025 11:26:25 -0600 Subject: [PATCH 1/4] Don't include new IAM service vomses entry for CMS (SOFTWARE-6060) Also remove dead code and use some macros. --- rpm/vo-client.spec | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/rpm/vo-client.spec b/rpm/vo-client.spec index 5733c23..0f50213 100644 --- a/rpm/vo-client.spec +++ b/rpm/vo-client.spec @@ -1,12 +1,10 @@ -# Set to 1 to enable IAM-based VOMS endpoints -# (SOFTWARE-4666, SOFTWARE-4576, SOFTWARE-4595, SOFTWARE-5843) -%define iam 1 -# Set to 1 to include IAM-based VOMS endpoints in the vomses file (SOFTWARE-5843) -%define iam_vomses 1 +# These macros exclude vomses entries for specific VOs -- see the %build section +%define delete_iam_legacy_vomses sed -Ei '/.*voms-'%1'-auth.app.cern.ch.*/d' vomses +%define delete_iam_prod_vomses sed -Ei '/.*voms-'%1'-auth.cern.ch.*/d' vomses Name: vo-client Version: 137 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Contains vomses file for use with user authentication License: Apache 2.0 @@ -47,23 +45,21 @@ Requires: %{name} = %{version}-%{release} %build make -%if ! 0%{?iam} -rm -f vomsdir/atlas/voms-atlas-auth.app.cern.ch.lsc -rm -f vomsdir/cms/voms-cms-auth.app.cern.ch.lsc - -for vo in alice atlas cms dteam lhcb; do - rm -f vomsdir/${vo}/voms-${vo}-auth.cern.ch.lsc -done -%endif # FIXME: Remove IAM vomses entries to avoid use by VOMS clients until # IAM LSC files are more widely distributed across the world # (SOFTWARE-4595) -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 -%endif + +%delete_iam_legacy_vomses alice +%delete_iam_legacy_vomses lhcb +%delete_iam_legacy_vomses ops + +#delete_iam_prod_vomses alice +#delete_iam_prod_vomses atlas +%delete_iam_prod_vomses cms +#delete_iam_prod_vomses dteam +#delete_iam_prod_vomses lhcb + %install install -d $RPM_BUILD_ROOT/%{_sysconfdir} @@ -95,6 +91,9 @@ find $RPM_BUILD_ROOT/%{_sysconfdir}/grid-security/vomsdir -type d -exec chmod 75 %config(noreplace) %{_datadir}/osg/grid-vorolemap %changelog +* Tue Jan 21 2025 Mátyás Selmeci - 137-4 +- Except for CMS (SOFTWARE-6060) + * Fri Jan 17 2025 Mátyás Selmeci - 137-3 - Include new CERN IAM endpoints again (SOFTWARE-6060) From 81a5c9c64ee4329698018afd8111b3a90850fdce Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 21 Jan 2025 15:04:43 -0600 Subject: [PATCH 2/4] Also exlude dteam entry --- rpm/vo-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/vo-client.spec b/rpm/vo-client.spec index 0f50213..1ec2e92 100644 --- a/rpm/vo-client.spec +++ b/rpm/vo-client.spec @@ -57,7 +57,7 @@ make #delete_iam_prod_vomses alice #delete_iam_prod_vomses atlas %delete_iam_prod_vomses cms -#delete_iam_prod_vomses dteam +%delete_iam_prod_vomses dteam #delete_iam_prod_vomses lhcb From ba46ad6e9b31828df9649a3cba879a7b1afa1e49 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 22 Jan 2025 11:51:55 -0600 Subject: [PATCH 3/4] Parameterized macros require parentheses --- rpm/vo-client.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/vo-client.spec b/rpm/vo-client.spec index 1ec2e92..dba09ac 100644 --- a/rpm/vo-client.spec +++ b/rpm/vo-client.spec @@ -1,6 +1,6 @@ # These macros exclude vomses entries for specific VOs -- see the %build section -%define delete_iam_legacy_vomses sed -Ei '/.*voms-'%1'-auth.app.cern.ch.*/d' vomses -%define delete_iam_prod_vomses sed -Ei '/.*voms-'%1'-auth.cern.ch.*/d' vomses +%define delete_iam_legacy_vomses() sed -Ei '/.*voms-'%1'-auth.app.cern.ch.*/d' vomses +%define delete_iam_prod_vomses() sed -Ei '/.*voms-'%1'-auth.cern.ch.*/d' vomses Name: vo-client Version: 137 From 9261776ebd73e1fb274fa2a449f0016dc5fc94e1 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 22 Jan 2025 12:13:32 -0600 Subject: [PATCH 4/4] Fix changelog --- rpm/vo-client.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/vo-client.spec b/rpm/vo-client.spec index dba09ac..56ddcae 100644 --- a/rpm/vo-client.spec +++ b/rpm/vo-client.spec @@ -92,7 +92,7 @@ find $RPM_BUILD_ROOT/%{_sysconfdir}/grid-security/vomsdir -type d -exec chmod 75 %changelog * Tue Jan 21 2025 Mátyás Selmeci - 137-4 -- Except for CMS (SOFTWARE-6060) +- Except for CMS and DTEAM (SOFTWARE-6060) * Fri Jan 17 2025 Mátyás Selmeci - 137-3 - Include new CERN IAM endpoints again (SOFTWARE-6060)