Commit cf36a904 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet3.1-3.1.118-1.el8_4

parent 7d8327f0
ee23286997751dba3e8eac6fe72a5ad7a0b150fe SOURCES/dotnet-v3.1.117-SDK.tar.gz
ccc393389b53e9e1cdf5e3a754e0e6b61d7895e2 SOURCES/dotnet-v3.1.118-SDK.tar.gz
SOURCES/dotnet-v3.1.117-SDK.tar.gz
SOURCES/dotnet-v3.1.118-SDK.tar.gz
diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-coreclr.8fa8e21ba346527781651b2571f33d7a78422fcc/init-distro-rid.sh dotnet-v3.1.117-SDK-mod/src/dotnet-coreclr.8fa8e21ba346527781651b2571f33d7a78422fcc/init-distro-rid.sh
--- dotnet-v3.1.117-SDK-orig/src/dotnet-coreclr.8fa8e21ba346527781651b2571f33d7a78422fcc/init-distro-rid.sh 2021-06-24 15:40:57.000000000 -0700
+++ dotnet-v3.1.117-SDK-mod/src/dotnet-coreclr.8fa8e21ba346527781651b2571f33d7a78422fcc/init-distro-rid.sh 2021-07-15 11:40:47.919950462 -0700
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh dotnet-v3.1.118-SDK/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh
--- dotnet-v3.1.118-SDK-orig/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh 2021-07-29 11:51:27.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-coreclr.2aee3eb10b6303dff09cbe5ac99b6fae4644f346/init-distro-rid.sh 2021-08-11 16:09:37.673740318 -0700
@@ -51,7 +51,7 @@ initNonPortableDistroRid()
# We have forced __PortableBuild=0. This is because -portablebuld
# has been passed as false.
......@@ -17,9 +17,9 @@ diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-coreclr.8fa8e21ba346527781651b25
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.117-SDK-mod/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-06-24 15:41:21.000000000 -0700
+++ dotnet-v3.1.117-SDK-mod/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-15 11:44:20.288681643 -0700
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-29 11:51:44.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-11 16:12:33.225921253 -0700
@@ -3204,6 +3204,75 @@
"any",
"base"
......@@ -103,9 +103,9 @@ diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.117-SDK-mod/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-06-24 15:41:21.000000000 -0700
+++ dotnet-v3.1.117-SDK-mod/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-15 11:45:31.307594946 -0700
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-29 11:51:44.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-11 16:13:16.146454465 -0700
@@ -137,6 +137,12 @@
<Versions>9</Versions>
</RuntimeGroup>
......@@ -119,9 +119,9 @@ diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c
<RuntimeGroup Include="sles">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.117-SDK-mod/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-06-24 15:41:21.000000000 -0700
+++ dotnet-v3.1.117-SDK-mod/src/dotnet-corefx.707cf4f62ea1fdbca730c910c4c18c0d3217412e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-15 11:46:37.072439080 -0700
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v3.1.118-SDK-orig/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-29 11:51:44.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-corefx.35d34d408c00b1a44a5f4df0f434030849419f1e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-11 16:13:54.429930073 -0700
@@ -1428,6 +1428,40 @@
"rhel-x64"
]
......@@ -170,9 +170,9 @@ diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-corefx.707cf4f62ea1fdbca730c910c
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/build.sh dotnet-v3.1.117-SDK-mod/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/build.sh
--- dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/build.sh 2021-06-24 15:41:30.000000000 -0700
+++ dotnet-v3.1.117-SDK-mod/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/build.sh 2021-07-15 11:47:25.690062221 -0700
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh
--- dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh 2021-07-29 11:51:50.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/build.sh 2021-08-11 16:14:31.400389369 -0700
@@ -21,7 +21,7 @@ init_rid_plat()
__rid_plat=""
if [ -e /etc/os-release ]; then
......@@ -182,9 +182,9 @@ diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7
# remove the last version number
VERSION_ID=${VERSION_ID%.*}
fi
diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/common/pal.unix.cpp dotnet-v3.1.117-SDK-mod/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/common/pal.unix.cpp
--- dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/common/pal.unix.cpp 2021-06-24 15:41:30.000000000 -0700
+++ dotnet-v3.1.117-SDK-mod/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/corehost/common/pal.unix.cpp 2021-07-15 11:49:42.538816196 -0700
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp
--- dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp 2021-07-29 11:51:50.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/corehost/common/pal.unix.cpp 2021-08-11 16:15:47.296332247 -0700
@@ -496,6 +496,7 @@ pal::string_t normalize_linux_rid(pal::s
{
pal::string_t rhelPrefix(_X("rhel."));
......@@ -204,9 +204,9 @@ diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7
if (lastVersionSeparatorIndex != std::string::npos)
{
diff -Naurp dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs dotnet-v3.1.117-SDK-mod/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
--- dotnet-v3.1.117-SDK-orig/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-06-24 15:41:30.000000000 -0700
+++ dotnet-v3.1.117-SDK-mod/src/dotnet-core-setup.3a75b805fa07bdff238a7406ae019bb938585eee/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-07-15 11:50:34.995488560 -0700
diff -Naurp dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
--- dotnet-v3.1.118-SDK-orig/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-07-29 11:51:50.000000000 -0700
+++ dotnet-v3.1.118-SDK/src/dotnet-core-setup.5d3919d34e0d8940ee50c36d823ddc28d6b1723c/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-08-11 16:16:25.319804622 -0700
@@ -181,7 +181,7 @@ namespace Microsoft.DotNet.PlatformAbstr
lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1);
}
......
......@@ -23,10 +23,10 @@
%endif
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
%global host_version 3.1.17
%global runtime_version 3.1.17
%global host_version 3.1.18
%global runtime_version 3.1.18
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.117
%global sdk_version 3.1.118
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
%global host_rpm_version %{host_version}
......@@ -59,7 +59,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
Release: 1%{?dist}.rocky.2
Release: 1%{?dist}.rocky.1
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
......@@ -72,15 +72,13 @@ Source100: check-debug-symbols.py
Source101: dotnet.sh.in
Patch100: corefx-optflags-support.patch
Patch103: corefx-39633-cgroupv2-mountpoints.patch
Patch104: corefx-hardening-flags.patch
Patch101: corefx-39633-cgroupv2-mountpoints.patch
Patch200: coreclr-27048-sysctl-deprecation.patch
Patch201: coreclr-hardening-flags.patch
Patch202: coreclr-libunwind-fno-common.patch
Patch300: core-setup-do-not-strip.patch
Patch301: core-setup-hardening-flags.patch
Patch500: cli-telemetry-optout.patch
Patch501: core-rocky-rid.patch
......@@ -306,8 +304,7 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props
pushd src/dotnet-corefx.*
%patch100 -p1
%patch103 -p1
%patch104 -p1
%patch101 -p1
popd
pushd src/dotnet-coreclr.*
......@@ -318,7 +315,6 @@ popd
pushd src/dotnet-core-setup.*
%patch300 -p1
%patch301 -p1
popd
pushd src/dotnet-cli.*
......@@ -453,9 +449,12 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%dir %{_libdir}/dotnet/packs
%changelog
* Thu Jul 15 2021 Louis Abel <label@rockylinux.org> - 3.1.117-1.rocky.2
* Wed Aug 11 2021 Release Engineering <releng@rockylinux.org> - 3.1.118-1.rocky.1
- Add Rocky Runtime ID with minor versions
- Merge Michael Young's slim patch
* Thu Aug 05 2021 Omair Majid <omajid@redhat.com> - 3.1.118-1
- Update to .NET SDK 3.1.118 and Runtime 3.1.18
- Resolves: RHBZ#1990189
* Fri Jul 02 2021 Andrew Slice <aslice@redhat.com> - 3.1.117-1
- Update to .NET SDK 3.1.117 and Runtime 3.1.17
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment