diff --git a/.gitignore b/.gitignore index 58ebc46..ff5c810 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /dotnet-v8.0.0.tar.gz /dotnet-v8.0.1.tar.gz /dotnet-v8.0.2.tar.gz +/dotnet-8.0.3.tar.gz +/dotnet-8.0.3.tar.gz.sig diff --git a/dotnet8.0.spec b/dotnet8.0.spec index cf446e0..573e2a3 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -8,10 +8,10 @@ %global dotnetver 8.0 -%global host_version 8.0.2 -%global runtime_version 8.0.2 +%global host_version 8.0.3 +%global runtime_version 8.0.3 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 8.0.102 +%global sdk_version 8.0.103 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -53,7 +53,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 3%{?dist} +Release: 2%{?dist} Summary: .NET Runtime and SDK License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib @@ -72,16 +72,12 @@ Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-ppc64le.tar.gz # Generated manually, same pattern as the arm64 tarball Source3: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz %else -# For non-releases, the source is generated on a Fedora box via: -# ./build-dotnet-tarball %%{upstream_tag} or commit -%global tarball_name dotnet-sdk-source-%{upstream_tag} -Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag}.tar.gz +Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz +Source1: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz.sig +Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc %endif Source5: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json -#Source10: %%{tarball_name}-nm-dev.tgz -#Source11: %%{tarball_name}-nm-prod.tgz - Source20: check-debug-symbols.py Source21: dotnet.sh.in @@ -110,6 +106,7 @@ BuildRequires: git %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: glibc-langpack-en %endif +BuildRequires: gnupg2 BuildRequires: hostname BuildRequires: krb5-devel BuildRequires: libicu-devel @@ -402,6 +399,8 @@ These are not meant for general use. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' + release_json_tag=$(grep tag %{SOURCE5} | cut -d: -f2 | sed -E 's/[," ]*//g') if [[ ${release_json_tag} != %{upstream_tag} ]]; then echo "error: tag in release.json doesn't match tag in spec file" @@ -708,6 +707,10 @@ export COMPlus_LTTng=0 %changelog +* Tue Mar 19 2024 Omair Majid - 8.0.103-2 +- Update to .NET SDK 8.0.103 and Runtime 8.0.3 +- Resolves: RHEL-27553 + * Tue Feb 20 2024 Tom Deseyn - 8.0.102-3 - Backport MSBuild locale fix - Resolves: RHEL-23936 diff --git a/release-key-2023.asc b/release-key-2023.asc new file mode 100644 index 0000000..96844b6 --- /dev/null +++ b/release-key-2023.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: BSN Pgp v1.1.0.0 + +mQINBGUKsUYBEADVCJm4EhXALr1ld42kWeh/vM0XMZ2orNT6NRLDRYjpE4mm4UqA +vpjfGCwt5fLcrT4yZng8ABkB3QwTsZzmxesAMD5AZR/gdU1G96DuDGsjp6zJvTuX +zvz3PXUYfcl9n5X32acA6N9J5Xfp10xqX3oitUODBdYy/vKW/v/y87ZxgaR6a3wp +pPJBJIVKwFJx13v4BHRsGp1fepliQcXPvmNKFNI20le5+FbLq6C9hY5wcwGHGfQr +EokH79GsmqgSImqxDOIh06J5VfWA+JwV+3vf95pD8IUrRfGQ+GK7b1/bySxtM5Qa +b/IDgvl/Qq3AzEpGarMBaqGbqMz1C7jd8Y6nyKMP/V+OCjbEdYNM8GRz6kBP3Un+ +Frat5Lc2o4DF+zB3PKIJS3hku5gwlJu6IU1F23vmYFtjUcpRGmyQZDoWyBbOWlB5 +4SXqVu16amUsRFYmOK8BJMjdotcVbriVIv6WRmugfhIMoRJzVGxYkdbuiuMAX69V +xDoGpxX5A8S5A79y0USUVtadQfFavMTyb/gUuUe8oDsqK9gdI3ETxLYG4gYwauVX +fCGfoLOKsq5dPzEuEA7GCRrMau+rHKFaM7BigSdnHFW7xNZ4v0YnXAagoqM2G5o5 +9sak0l57vxxTVk2V3iZzkoU2J2Zlyxyh72n5vjRmb7aNwmQh4Eav6a8ssQARAQAB +tBlvbm54Y29yZWRldkBtaWNyb3NvZnQuY29tiQI4BBMBCAAiBQJlCrFGAhsDBgsJ +CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRD9v1PCTbSHLtfzEADIKq15XDeQxLSo +BG1aFa9n82K1YADVcu1LeddfhDmQWLnZNgyHtQlKN2n59282CXtgymzae3uc05s2 +feIJaqF4M4NnCX8Ct3K7Hq1jI7ZktlquPCCy9XHq9aQY8XTxmdtRevtclKgYTwDh +w+D/KbE8vTZ6o7JoubA3MKf4k3S8qL/0rIyaC6h0EpiWoMy1TdNMMK7BT4kl6Vz4 +W6KmNgOux1Pzku5ULM4WuOzmwW+NAzpOLJowfDs1ZC2RM3+g9i1/DmwWtCHngvGD ++clA0I0agXxo05toOBTfwxd2gWYczuo/Ole16fYTzqT6n0DHqOjjcc9A7EmC72fQ +J+hHAqM+4+CbEGuMpNnTMpCZs98bcK3Rqx/bDJYtbclZzm5O/V4nVbDrJZKzpgA1 +KuzNMLkr62P6/t15UsStgmrlTILmE5NG0CR1mj/46+mNbsMZCel3dcvnT1Zf4rTq +QxMC7Dd/DECKQVC339G/BRfNyhOk2S1mZR/g1uS4bznL+tiwudDh/TAi5C3ZBDMh +0muwD9caXS/QFIBWtb2ai3IcpU357R/ERPKLcWYtoYJ80RuKi6XYr1WxSPBmd5Qm +wuncye+wR2dveo2jnIXZGUSgz50ZNgBxs/cYWAQ8J6KMgIBa+JY2qalzvIGbrC5x +Sr+CkhS8vrktfnRgc8yBssJnvNfqXA== +=pKgS +-----END PGP PUBLIC KEY BLOCK----- diff --git a/release.json b/release.json index de0aaf9..16ac31c 100644 --- a/release.json +++ b/release.json @@ -1,9 +1,9 @@ { - "release": "8.0.2", + "release": "8.0.3", "channel": "8.0", - "tag": "v8.0.2", - "sdkVersion": "8.0.102", - "runtimeVersion": "8.0.2", + "tag": "v8.0.3", + "sdkVersion": "8.0.103", + "runtimeVersion": "8.0.3", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "d396b0c4d3e51c2d8d679b2f7233912bc5bfc2fa" + "sourceVersion": "49a39629323839c28481dd42545ce44d11c75c5a" } diff --git a/sources b/sources index 89c40d8..1587d42 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (dotnet-v8.0.2.tar.gz) = a3deea4728a09825e4db7c979f6f1c4441d5a8011accee073f46ea0457f0e2ea84ddca7396681c6b333990ea6a8b549f3736d98b2d0be0602cf7c2f1e4e11a95 +SHA512 (dotnet-8.0.3.tar.gz) = ba5f17716a61e954c1191ef01671b255192161b6d642c225ce2b733cc14586b8edf275a26c475de20896351f970ed4298dd45a9bb7d51b318691f86c552a7e3f +SHA512 (dotnet-8.0.3.tar.gz.sig) = 7783a0831c94778d062e5f3701cf816b5e4543bddea22633601329a3f2507ee657fa9a3d1f4e0c04f714c60f575ab38173026f31e4fdc8cab0727f6d8398043f diff --git a/update-release b/update-release index 5725315..89d44fc 100755 --- a/update-release +++ b/update-release @@ -103,7 +103,9 @@ else if [[ -f "dotnet-${tag}.tar.gz" ]]; then echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" elif [[ -n ${user_provided_tarball_name} ]]; then - cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz" + tag_without_v=${tag#v} + cp -a "${user_provided_tarball_name}" dotnet-${tag_without_v}.tar.gz + cp -a "${user_provided_tarball_name}.sig" dotnet-${tag_without_v}.tar.gz.sig cp -a "${release_json}" release.json else rm -f release.json