From 3ddc25242865fa567a91f6c0766dd0e5da7f6d76 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 25 Sep 2024 21:31:19 +0000 Subject: [PATCH] Backport 24-main/osg-release changes to 23-main (SOFTWARE-5986) Namely: - Use osg-htc.org instead of opensciencegrid.org - Use "distrepo" repos for minefield - Drop osg-next repo files also delete unused GPG key files git-svn-id: https://vdt.cs.wisc.edu/svn/native/redhat/branches/23-main@28038 4e558342-562e-0410-864c-e07659590f8c --- osg-release/osg/RPM-GPG-KEY-OSG-2 | 52 ------------------- osg-release/osg/RPM-GPG-KEY-OSG-4 | 52 ------------------- osg-release/osg/osg-release.spec | 38 ++++++++------ osg-release/osg/repoinfo.txt | 15 ++---- osg-release/osg/template.repo.basic | 4 +- osg-release/osg/template.repo.contrib | 8 +-- osg-release/osg/template.repo.direct | 8 +-- osg-release/osg/template.repo.distrepo | 16 ++++++ ...emplate.repo.koji => template.repo.kojira} | 2 +- osg-release/osg/template.repo.standard | 8 +-- 10 files changed, 57 insertions(+), 146 deletions(-) delete mode 100644 osg-release/osg/RPM-GPG-KEY-OSG-2 delete mode 100644 osg-release/osg/RPM-GPG-KEY-OSG-4 create mode 100644 osg-release/osg/template.repo.distrepo rename osg-release/osg/{template.repo.koji => template.repo.kojira} (59%) diff --git a/osg-release/osg/RPM-GPG-KEY-OSG-2 b/osg-release/osg/RPM-GPG-KEY-OSG-2 deleted file mode 100644 index 8832172f5..000000000 --- a/osg-release/osg/RPM-GPG-KEY-OSG-2 +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) - -mQINBGA21PYBEADl6zH4i9hcmfjvBA+5J8qYmVF4yYCcl02EcyvTEOTbvEqqEocH -JeJemWq7V2hyZHyp71yNn5kLD4gjNkA37llDD3OBXKVzPzdaQBBRMdjSFfMEFoq/ -+VDl0C8NCfPn5KmvtlpI0/R3nczBfV6t4A2G/vlpOpp7kVLlhBNLCeAk8ahWHVKK -IiGQmDg8z+18/N/jsEGKQeNpI9dh33mOGwBVn3arYakP50dtIf18Q7jc97c5ticH -G1/n5q84i6u5P0oWWWRlUyfk3Q/TIZpJ/G1SYk3mOdh229znr66EZLP2HkGK10QL -oEBoqw97FtE8ylwSnk5xR3XquEE0L/DBdLNEgPjgoFnVZJlQT2hCc9K1bkxB1fi6 -AG2Yibx2CL6y5dLWrZ47IwPVUMZ0ac8s9iqFWlE4hfMW/xUJ2UnnliRwF0o3DHjN -HBaYjgv6bA4arClzxGCUiSvhSZw68LTYQiBe59GDHZ7gTq9qCX3QsWk2z5evYuJY -2uE2rcO4UsYPQ57H3lTgbfKB7UA5+cv9o6516QyahB/osWt6wUgkDZDStGjsZBAr -XRsJ6UFxh7IZbiweqOhOs+QsXF7blVr9TagRMKfpFVx6WE6TofQifQy8kgnSfuM8 -27YjrOHCseGqCKjRbIdb6DNjeyO0svKPNMp1yHIwJ2v9UZ4uCZnTMuxDxwARAQAB -tDVPcGVuIFNjaWVuY2UgR3JpZCBTb2Z0d2FyZSA8aGVscEBvcGVuc2NpZW5jZWdy -aWQub3JnPokCOQQTAQIAIwUCYDbU9gIbAwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4B -AheAAAoJECfcaGSW0rkPwtQP/1/jy5sWdT8gsTmO5zXytNciv0VvuPYd6ntnKsJJ -dWwOaUWMRRBYrQNcro3P8CGkpZdpI8H7dOaMBT7+jVgu99+xaKYgtD0lNWow6HBq -+B/zphHYdYBAgPsHYqf7t6CIbTQUgoqYugRuYfzZev/D0s5cnuyAZ3nP1lpsEI8D -bhVnJUuZq0zVqafaRLX6DLVt14KkFu5xKwMgYdMDQ0LKWoX0MMmIUo5WXQyjz3Yq -OSil4SuhKqmpMH6pdfZf6aQKtaqc24Sr6NOMA03DPwgC5id2CRo8g13ZVwPHgZHf -wP7kJ5ehANrMfCAnGoFyt4ox2UvAYb2EPw9VfzTKpZbn/IO/5LBN86SrcgkaCRRO -mRy/2FKWCq8kR14ijWPbTOQl4QAkVt/zQ2zVGs6S/x05M/RmVo0+lTBcflvZVfZ8 -n23RSG4n6thXYl3Z4ex20UlT7kqGOCyUri0TuK8sArQEoAfzgivViNZK/7e1SzJa -YVsM6mk6Cj1FY3J/0rNSdtEnVwR2zKmRV2BV0NJ91RD+vBif71jY/PoM9Ol0M9wq -8zHQLwDjtyVnV1EFb6b26/o+NswXGtc0ugfqIPEBgY0jf+yoVaqyUBlZlwdaVV7/ -7d02vl6q74CMPNbwEnnJV4lLCqL9NmjjcP0Pck+Wl2AASgTDbwH+j4ULW2F4y2Da -64oUuQINBGA21PYBEACS9HkEH9Lnqh4eiwd+rlMom9I1kZjGiwIwIWNVYH21cy6r -XZQJzKfzbW8z+xatr7CcjWNmr2zMYqe2ych2FhXjyylLpljTytOlOwJEK9fqkY9E -WzSoBfAvH6BiMTuG+JCo9x9rfaKkrvnoWIQDIBcH4UZEspt6lKxr6WmloIvyVlOo -YQQVrlDdR6FugKQ5Ofxe/0JfpBxEalfiDQtAH5OmvWqAiVy7F1DAoyaaT8wnc9mE -AKTJ4uFXdztBHDWlfbXj0CQMyM3NiQvgXrgeh2FgLh+E991UqZDxz9+/zSs2UCp+ -EGhsJmqyqxU1Vi3wUiFQuR7DARtc3EK8n+JJwJ23Lj+IPNVLWNHK8tXchpQp/wnu -IBFM6LD8/JBbmhtfK3loxRGeSCnXb2W3qfKpaaw+GSH5ThwSH9zNJd2BnuNtcZCf -thTeN9lWciC/6EHxl5vDzEcsYGpvDkfoBRrylNZXKIzKfxZYPMeohUiXipIkNLy7 -HIuVwm8EXjlGpznG+BH0Dx10m5USNgL0Nr02EZLZ0MeQF+VfcSlN6m4e1uJU+tye -UnTuxXKDdO8ougPbt1FY8yrBbSd4E5wk4WyyXteruc37Eql6kyWY+IjG/MCWH2lF -HQg2Fp7UkN1NUM92EfkqzjNQJdX6JWSXVJ704ZpDFgouACPHnMobDjtAU3AUFQAR -AQABiQIfBBgBAgAJBQJgNtT2AhsMAAoJECfcaGSW0rkPVOMP/0dVL6Hr/Q3Mqoru -rQm4ng5R0snirfaC1Lt/l7obHHyrd3Gnzh6y2SUV55fLW46PRY5+PVBIPK06+fJQ -T9GKV3tdp1Pg2hwn312SLZtldHqLkidNolmvdDqvV2DOPQfPXQyC54D11dXTvqYW -eRuc0rR1elBc1qh65W1bmE32bZih+zFWwSWg2BTTafIfV5cRcyr8Iv704pdKEoK+ -Mxy5Sjw7Fw5FulxHQ3aMElevZodnEsZTUS/NT1FTvcHkRq8gXY20FzfA/UN/1zSQ -+m5tMA4at3rGwX9RdsGr4yNq4YBMiDdVDIUNLj0VSK+OOUWtdlnMzfJYJ3un6qyB -cRNIAMgxbYsthAuo3tAWehahQCkwFC+S928RxVk+2rB2dgYmcwr7zEOmB2+ThPmc -fMqwbOrkUBZReURNEEUbH8//fmXPJAlw/4xMPNeDNlZ7pip4UU4lt1jJZxTzrYxY -3/p0qISuySvSyt4tYmoGezXh/kvAZ6jNCArzDWVOp1lzTRae1xjsocz/nRLbGPFm -q+Gv4t5khTY8c/YHAmOigbat7aRKrXoRLy7sNT60OKTGbTPj6HJPeA75Tm7UBJzl -Q+CNttL86EK1ktszZ/GMGeTBuhUZt8DkA+cZEiz1iXz9M64F73JBrho+qGkFEDkN -55V9wc72Vg1+qyuxU4M/T/LAjWT2 -=F6xr ------END PGP PUBLIC KEY BLOCK----- diff --git a/osg-release/osg/RPM-GPG-KEY-OSG-4 b/osg-release/osg/RPM-GPG-KEY-OSG-4 deleted file mode 100644 index 6f3c105cf..000000000 --- a/osg-release/osg/RPM-GPG-KEY-OSG-4 +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -C83GhtbqYWhaHWbQv4jS -=PWv+ ------END PGP PUBLIC KEY BLOCK----- diff --git a/osg-release/osg/osg-release.spec b/osg-release/osg/osg-release.spec index 24723b5e3..19a0ab646 100644 --- a/osg-release/osg/osg-release.spec +++ b/osg-release/osg/osg-release.spec @@ -1,10 +1,12 @@ +%define series 23 + Name: osg-release -Version: 23 -Release: 5%{?dist} +Version: %{series} +Release: 6%{?dist} Summary: OSG Software for Enterprise Linux repository configuration License: GPL -URL: https://repo.opensciencegrid.org/ +URL: https://repo.osg-htc.org/ # This is a OSG Software maintained package which is specific to # our distribution. Thus the source is only available from @@ -15,20 +17,19 @@ Source0: generate-repo-files.sh Source1: repoinfo.txt Source2: template.repo.standard Source3: template.repo.basic -Source4: template.repo.koji +Source4: template.repo.kojira Source5: template.repo.direct Source6: template.repo.contrib +Source7: template.repo.distrepo -Source41: RPM-GPG-KEY-OSG-23-auto -Source42: RPM-GPG-KEY-OSG-23-developer +Source41: RPM-GPG-KEY-OSG-%{series}-auto +Source42: RPM-GPG-KEY-OSG-%{series}-developer BuildArch: noarch Requires: redhat-release >= %{rhel} -Obsoletes: vdt-release - %description This package contains the OSG Software for Enterprise Linux repository configuration for yum. @@ -43,27 +44,30 @@ exit 0 %install -#GPG Key -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg -install -pm 644 %{SOURCE41} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-auto -install -pm 644 %{SOURCE42} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-developer +# GPG Key +install -D -pm 644 %{SOURCE41} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-auto +install -D -pm 644 %{SOURCE42} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-developer # yum mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d install -m 644 *.repo $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -sed -i -e 's/gpgcheck=1/gpgcheck=0/' $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/*-minefield.repo %files %defattr(-,root,root,-) %config(noreplace) /etc/yum.repos.d/* -/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-auto -/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-developer +/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-auto +/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-developer %changelog +* Tue Sep 24 2024 Mátyás Selmeci - 23-6 +- Use osg-htc.org (SOFTWARE-5986) +- Use "distrepo" repos for minefield (SOFTWARE-5986) +- Drop osg-next repo files (SOFTWARE-5986) + * Wed Oct 18 2023 Mátyás Selmeci - 23-5 - Use 'auto' key for prerelease repo diff --git a/osg-release/osg/repoinfo.txt b/osg-release/osg/repoinfo.txt index 8d7261a41..9a9f23bdb 100644 --- a/osg-release/osg/repoinfo.txt +++ b/osg-release/osg/repoinfo.txt @@ -5,21 +5,16 @@ osg-development 23-main development standard Development osg-testing 23-main testing standard Testing osg-contrib 23-contrib contrib contrib Contributed osg-empty 23-empty empty basic Empty_Packages -osg-minefield 23-main development koji Build_Repository -osg-prerelease 23-main prerelease koji Prerelease_Repository_for_Internal_Use +osg-minefield 23-main development distrepo Build_Repository +osg-prerelease 23-main prerelease kojira Prerelease_Repository_for_Internal_Use osg-internal-development 23-internal development direct Internal_Development osg-internal 23-internal release direct Internal -osg-internal-minefield 23-internal development koji Internal_build_Repository +osg-internal-minefield 23-internal development distrepo Internal_build_Repository osg-upcoming 23-upcoming release standard Upcoming osg-upcoming-development 23-upcoming development standard Upcoming_Development osg-upcoming-testing 23-upcoming testing standard Upcoming_Testing -osg-upcoming-minefield 23-upcoming development koji Upcoming_Build_Repository -osg-upcoming-prerelease 23-upcoming prerelease koji Upcoming_Prerelease_Repository_for_Internal_Use - -osg-next 24 release standard Next_Release_Series -osg-next-development 24 development standard Next_Development_Series -osg-next-testing 24 testing standard Next_Testing_Series -osg-next-minefield 24 development koji Next_Build_Repository_Series +osg-upcoming-minefield 23-upcoming development distrepo Upcoming_Build_Repository +osg-upcoming-prerelease 23-upcoming prerelease kojira Upcoming_Prerelease_Repository_for_Internal_Use diff --git a/osg-release/osg/template.repo.basic b/osg-release/osg/template.repo.basic index 807919970..ad0f109b1 100644 --- a/osg-release/osg/template.repo.basic +++ b/osg-release/osg/template.repo.basic @@ -1,7 +1,7 @@ [{YUMREPO}] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch -#baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/$basearch -mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/$basearch +#baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/$basearch +mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/$basearch priority=98 enabled=0 gpgcheck=1 diff --git a/osg-release/osg/template.repo.contrib b/osg-release/osg/template.repo.contrib index 40ce81004..3685f82c4 100644 --- a/osg-release/osg/template.repo.contrib +++ b/osg-release/osg/template.repo.contrib @@ -1,7 +1,7 @@ [{YUMREPO}] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch -#baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/$basearch -mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/$basearch +#baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/$basearch +mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/$basearch priority=98 enabled={ENABLED} gpgcheck=1 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} [{YUMREPO}-source] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source -baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/source/SRPMS +baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/source/SRPMS priority=98 enabled=0 gpgcheck=1 @@ -17,7 +17,7 @@ gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} [{YUMREPO}-debuginfo] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Debug -baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/$basearch/debug +baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/$basearch/debug priority=98 enabled=0 gpgcheck=1 diff --git a/osg-release/osg/template.repo.direct b/osg-release/osg/template.repo.direct index a2cb11c19..31004c01f 100644 --- a/osg-release/osg/template.repo.direct +++ b/osg-release/osg/template.repo.direct @@ -1,7 +1,7 @@ [{YUMREPO}] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch -baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch -#mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch +baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch +#mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch priority=98 enabled={ENABLED} gpgcheck=1 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} [{YUMREPO}-source] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source -baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS +baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS priority=98 enabled=0 gpgcheck=1 @@ -17,7 +17,7 @@ gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} [{YUMREPO}-debuginfo] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Debug -baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug +baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug priority=98 enabled=0 gpgcheck=1 diff --git a/osg-release/osg/template.repo.distrepo b/osg-release/osg/template.repo.distrepo new file mode 100644 index 000000000..f53b4a380 --- /dev/null +++ b/osg-release/osg/template.repo.distrepo @@ -0,0 +1,16 @@ +[{YUMREPO}] +name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch +baseurl=https://koji.osg-htc.org/mnt/koji/repos-dist/osg-{SERIES}-el{EL}-{REPO}/latest/$basearch/ +priority=98 +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} + +[{YUMREPO}-source] +name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source +baseurl=https://koji.osg-htc.org/mnt/koji/repos-dist/osg-{SERIES}-el{EL}-{REPO}/latest/src/ +priority=98 +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} + diff --git a/osg-release/osg/template.repo.koji b/osg-release/osg/template.repo.kojira similarity index 59% rename from osg-release/osg/template.repo.koji rename to osg-release/osg/template.repo.kojira index 2fa226902..f97d4b05e 100644 --- a/osg-release/osg/template.repo.koji +++ b/osg-release/osg/template.repo.kojira @@ -1,6 +1,6 @@ [{YUMREPO}] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch -baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-{SERIES}-el{EL}-{REPO}/latest/$basearch/ +baseurl=https://koji.osg-htc.org/mnt/koji/repos/osg-{SERIES}-el{EL}-{REPO}/latest/$basearch/ priority=98 enabled=0 gpgcheck=1 diff --git a/osg-release/osg/template.repo.standard b/osg-release/osg/template.repo.standard index f2dc06dc4..1e8445f53 100644 --- a/osg-release/osg/template.repo.standard +++ b/osg-release/osg/template.repo.standard @@ -1,7 +1,7 @@ [{YUMREPO}] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch -#baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch -mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch +#baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch +mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch priority=98 enabled={ENABLED} gpgcheck=1 @@ -9,7 +9,7 @@ gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} [{YUMREPO}-source] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source -baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS +baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS priority=98 enabled=0 gpgcheck=1 @@ -17,7 +17,7 @@ gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY} [{YUMREPO}-debuginfo] name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Debug -baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug +baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug priority=98 enabled=0 gpgcheck=1