diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index 6880118..f033b10 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -cbf23fd9a8c5392230ddd687320e7a74232e3b3c SOURCES/dotnet-v6.0.110.tar.gz +3f58ee721f0b8bc3ddb112aa923cf5229f08c5d1 SOURCES/dotnet-v6.0.112.tar.gz diff --git a/.gitignore b/.gitignore index 0e97296..6a51dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.110.tar.gz +SOURCES/dotnet-v6.0.112.tar.gz diff --git a/SOURCES/check-debug-symbols.py b/SOURCES/check-debug-symbols.py index 53d5fd2..b873c77 100755 --- a/SOURCES/check-debug-symbols.py +++ b/SOURCES/check-debug-symbols.py @@ -65,7 +65,7 @@ def scan_file(file): def is_elf(file): result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True) - return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout) + return re.search('ELF 64-bit LSB (?:pie )(?:executable|shared object)', result.stdout) def scan_file_if_sensible(file): if is_elf(file): diff --git a/SOURCES/installer-12516-portablerid.patch b/SOURCES/installer-12516-portablerid.patch deleted file mode 100644 index 4cb4ab6..0000000 --- a/SOURCES/installer-12516-portablerid.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -Date: Wed, 3 Nov 2021 15:12:59 +0100 -Subject: [PATCH] GetRuntimeInformation.targets: determine - PortableProductMonikerRid based on HostOSName and Architecture. - ---- - src/redist/targets/GetRuntimeInformation.targets | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets -index 5133c3a3841..01f704c7d8e 100644 ---- a/src/redist/targets/GetRuntimeInformation.targets -+++ b/src/redist/targets/GetRuntimeInformation.targets -@@ -28,6 +28,8 @@ - '$(Rid)' == 'linux-musl-x64' ">$(Rid) - $(OSName)-$(Architecture) - -+ $(HostOSName)-$(Architecture) -+ - dotnet-sdk-internal$(PgoTerm) - dotnet-sdk$(PgoTerm) - diff --git a/SOURCES/runtime-66594-s390x-debuginfo.patch b/SOURCES/runtime-66594-s390x-debuginfo.patch deleted file mode 100644 index 5637645..0000000 --- a/SOURCES/runtime-66594-s390x-debuginfo.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/mono/mono.proj b/src/mono/mono.proj -index fb98ffc1896..d6a0c9a8ec2 100644 ---- a/src/mono/mono.proj -+++ b/src/mono/mono.proj -@@ -519,17 +519,17 @@ - - <_Objcopy Condition="'$(_ObjcopyFound)' != '0'">objcopy - -- -+ - - - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - - diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 444d9a1..afc4798 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/dotnet6.0.spec @@ -20,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.10 -%global runtime_version 6.0.10 +%global host_version 6.0.12 +%global runtime_version 6.0.12 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.110 +%global sdk_version 6.0.112 %global sdk_feature_band_version %(echo %{sdk_version} | 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 }') @@ -86,8 +86,6 @@ Source11: dotnet.sh.in Patch100: runtime-arm64-lld-fix.patch # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315 Patch101: runtime-mono-remove-ilstrip.patch -# https://github.com/dotnet/runtime/pull/66594 -Patch102: runtime-66594-s390x-debuginfo.patch # Disable apphost, needed for s390x Patch500: fsharp-no-apphost.patch @@ -115,8 +113,6 @@ Patch1500: sdk-telemetry-optout.patch # https://github.com/dotnet/sdk/pull/22373 Patch1501: sdk-22373-portablerid.patch -# https://github.com/dotnet/installer/pull/12516 -Patch1600: installer-12516-portablerid.patch %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -320,7 +316,7 @@ applications using the .NET SDK. %dotnet_targeting_pack dotnet-apphost-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Host.%{runtime_id} %dotnet_targeting_pack dotnet-targeting-pack-6.0 %{runtime_rpm_version} Microsoft.NETCore.App 6.0 Microsoft.NETCore.App.Ref %dotnet_targeting_pack aspnetcore-targeting-pack-6.0 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 6.0 Microsoft.AspNetCore.App.Ref -%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref +#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref %package -n dotnet-sdk-6.0-source-built-artifacts @@ -381,7 +377,6 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/ pushd src/runtime %patch100 -p1 %patch101 -p1 -%patch102 -p1 popd pushd src/fsharp @@ -418,7 +413,6 @@ pushd src/sdk popd pushd src/installer -%patch1600 -p1 popd %if ! %{use_bundled_libunwind} @@ -481,7 +475,7 @@ export COMPlus_LTTng=0 export OPENSSL_ENABLE_SHA1_SIGNATURES=1 %endif -VERBOSE=1 ./build.sh \ +CheckEolTargetFramework=false VERBOSE=1 ./build.sh \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ %endif @@ -507,7 +501,6 @@ tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id} find %{buildroot}%{_libdir}/dotnet/ -type f -name 'testhost.x86' -delete find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete -# Install managed symbols # Install managed symbols: disabled because they don't contain sources # but point to the paths the sources would have been at in the build # servers. The end user experience is pretty bad atm. @@ -529,28 +522,33 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \; -install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ -install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}%%{_sysconfdir}/profile.d/ +#install dotnet.sh %%{buildroot}%%{_sysconfdir}/profile.d/ -install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}/%%{_datadir}/bash-completion/completions # dynamic completion needs the file to be named the same as the base command -install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet +#install src/sdk/scripts/register-completions.bash %%{buildroot}/%%{_datadir}/bash-completion/completions/dotnet # TODO: the zsh completion script needs to be ported to use #compdef #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions #install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet -install -dm 0755 %{buildroot}%{_bindir} -ln -s ../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/ +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}%%{_bindir} +#ln -s ../../%%{_libdir}/dotnet/dotnet %%{buildroot}%%{_bindir}/ -install -dm 0755 %{buildroot}%{_mandir}/man1/ -find -iname 'dotnet*.1' -type f -exec cp {} %{buildroot}%{_mandir}/man1/ \; +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}%%{_mandir}/man1/ +#find -iname 'dotnet*.1' -type f -exec cp {} %%{buildroot}%%{_mandir}/man1/ \; -install -dm 0755 %{buildroot}%{_sysconfdir}/dotnet -echo "%{_libdir}/dotnet" >> install_location -install install_location %{buildroot}%{_sysconfdir}/dotnet/ -echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch} -install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ +# Provided by dotnet-host from another SRPM +#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet +#echo "%%{_libdir}/dotnet" >> install_location +#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/ +#echo "%%{_libdir}/dotnet" >> install_location_%%{runtime_arch} +#install install_location_%%{runtime_arch} %%{buildroot}%%{_sysconfdir}/dotnet/ install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ @@ -565,8 +563,7 @@ test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/ echo "Testing build results for debug symbols..." %{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/ - -%check +# Self-check %if 0%{?fedora} > 35 # lttng in Fedora > 35 is incompatible with .NET export COMPlus_LTTng=0 @@ -575,21 +572,13 @@ export COMPlus_LTTng=0 %{buildroot}%{_libdir}/dotnet/dotnet --info %{buildroot}%{_libdir}/dotnet/dotnet --version +# Provided by dotnet-host from another SRPM +rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt +rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt +rm %{buildroot}%{_libdir}/dotnet/dotnet -%files -n dotnet-host -%dir %{_libdir}/dotnet -%{_libdir}/dotnet/dotnet -%dir %{_libdir}/dotnet/host -%dir %{_libdir}/dotnet/host/fxr -%{_bindir}/dotnet -%license %{_libdir}/dotnet/LICENSE.txt -%license %{_libdir}/dotnet/ThirdPartyNotices.txt -%doc %{_mandir}/man1/dotnet*.1.gz -%config(noreplace) %{_sysconfdir}/profile.d/dotnet.sh -%config(noreplace) %{_sysconfdir}/dotnet -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/dotnet +# Provided by netstandard-targeting-pack-2.1 from another SRPM +rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %files -n dotnet-hostfxr-6.0 %dir %{_libdir}/dotnet/host/fxr @@ -623,38 +612,53 @@ export COMPlus_LTTng=0 %changelog -* Fri Sep 30 2022 Omair Majid - 6.0.110-1 +* Fri Dec 02 2022 Omair Majid - 6.0.112-1 +- Update to .NET SDK 6.0.112 and Runtime 6.0.12 +- Resolves: RHBZ#2150148 + +* Wed Nov 09 2022 Omair Majid - 6.0.111-1 +- Update to .NET SDK 6.0.111 and Runtime 6.0.11 +- Resolves: RHBZ#2138278 + +* Tue Nov 08 2022 Omair Majid - 6.0.110-2 +- Fix build with newer versions of clang +- Related: RHBZ#2131326 + +* Fri Oct 28 2022 Omair Majid - 6.0.110-1 - Update to .NET SDK 6.0.110 and Runtime 6.0.10 -- Resolves: RHBZ#2131328 +- Resolves: RHBZ#2131326 + +* Tue Sep 20 2022 Omair Majid - 6.0.109-3 +- Disable packages now produced by another SRPM +- Related: RHBZ#2123788 -* Fri Sep 02 2022 Omair Majid - 6.0.109-1 +* Wed Sep 14 2022 Omair Majid - 6.0.109-2 - Update to .NET SDK 6.0.109 and Runtime 6.0.9 -- Resolves: RHBZ#2123791 +- Resolves: RHBZ#2123788 -* Fri Jul 29 2022 Omair Majid - 6.0.108-1 +* Tue Aug 09 2022 Omair Majid - 6.0.108-1 - Update to .NET SDK 6.0.108 and Runtime 6.0.8 -- Resolves: RHBZ#2112413 +- Resolves: RHBZ#2112409 -* Fri Jul 15 2022 Andrew Slice - 6.0.107-1 +* Thu Jul 21 2022 Omair Majid - 6.0.107-2 - Update to .NET SDK 6.0.107 and Runtime 6.0.7 - Resolves: RHBZ#2103269 -* Mon Jun 06 2022 Omair Majid - 6.0.106-1 +* Thu Jun 23 2022 Omair Majid - 6.0.106-1 - Update to .NET SDK 6.0.106 and Runtime 6.0.6 -- Resolves: RHBZ#2093433 +- Resolves: RHBZ#2093431 -* Mon May 09 2022 Omair Majid - 6.0.105-1 +* Wed May 25 2022 Omair Majid - 6.0.105-1 - Update to .NET SDK 6.0.105 and Runtime 6.0.5 -- Resolves: RHBZ#2082268 +- Resolves: RHBZ#2082266 -* Tue May 03 2022 Omair Majid - 6.0.104-1 +* Sat Apr 30 2022 Omair Majid - 6.0.104-1 - Update to .NET SDK 6.0.104 and Runtime 6.0.4 -- Resolves: RHBZ#2080460 +- Resolves: RHBZ#2078604 -* Mon Apr 04 2022 Omair Majid - 6.0.103-1 +* Mon Apr 25 2022 Omair Majid - 6.0.103-2 - Update to .NET SDK 6.0.103 and Runtime 6.0.3 -- Sync with RHEL 8 -- Resolves: RHBZ#2071808 +- Resolves: RHBZ#2072015 * Tue Feb 15 2022 Omair Majid - 6.0.102-3 - Disable bootstrap