diff --git a/.dotnet3.1.metadata b/.dotnet3.1.metadata index 22f541f..4931058 100644 --- a/.dotnet3.1.metadata +++ b/.dotnet3.1.metadata @@ -1 +1 @@ -2eb08344cbfd9a51f3d8e4887687dc848608c77f SOURCES/dotnet-v3.1.101-SDK.tar.gz +0d2b94cb9441ab154c9e79f320a46cfd06ff7ddf SOURCES/dotnet-v3.1.103-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 9de317f..028cb88 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v3.1.101-SDK.tar.gz +SOURCES/dotnet-v3.1.103-SDK.tar.gz diff --git a/SPECS/dotnet3.1.spec b/SPECS/dotnet3.1.spec index b85bfc9..09b76ab 100644 --- a/SPECS/dotnet3.1.spec +++ b/SPECS/dotnet3.1.spec @@ -23,11 +23,11 @@ %endif %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global host_version 3.1.1 -%global runtime_version 3.1.1 +%global host_version 3.1.3 +%global runtime_version 3.1.3 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 3.1.101 -%global templates_version %{runtime_version} +%global sdk_version 3.1.103 +%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version %{host_version} %global runtime_rpm_version %{runtime_version} @@ -296,10 +296,10 @@ applications using the .NET Core SDK. %endif # Fix bad hardcoded path in build -sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp +sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp # Disable warnings -sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj +sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props pushd src/corefx.* %patch100 -p1 @@ -311,21 +311,21 @@ pushd src/coreclr.* %patch201 -p1 popd -pushd src/dotnet-core-setup.* +pushd src/core-setup.* %patch300 -p1 %patch301 -p1 popd -pushd src/dotnet-cli.* +pushd src/cli.* %patch500 -p1 popd # If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back -grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.proj || \ - sed -i 's|\$(BuildArguments) |$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' repos/coreclr.proj +grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.common.props || \ + sed -i 's|\$(BuildArguments) |$(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' repos/coreclr.common.props %if %{use_bundled_libunwind} -sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.proj +sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=FALSE|' repos/coreclr.common.props %endif cat source-build-info.txt @@ -341,6 +341,7 @@ export CXXFLAGS="%{dotnet_cflags}" export LDFLAGS="%{dotnet_ldflags}" VERBOSE=1 ./build.sh \ + -- \ /v:n \ /p:LogVerbosity=n \ /p:MinimalConsoleLogOutput=false \ @@ -369,17 +370,13 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/sdk/%{sdk_version}/AppHostTemplate/app chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/libnethost.so chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/apphost chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{runtime_id}/%{runtime_version}/runtimes/%{runtime_id}/native/nethost.h -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/ref/netcoreapp3.1/*.xml -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.cache -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/Microsoft.AspNetCore.App.Ref/3.1.0/Debug/netstandard2.0/Microsoft.AspNetCore.App.Ref.assets.cache +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/ref/netcoreapp3.1/*.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/PackageOverrides.txt +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/FrameworkList.xml +chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/PlatformManifest.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PackageOverrides.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/FrameworkList.xml chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PlatformManifest.txt -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/data/PackageOverrides.txt -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/data/FrameworkList.xml -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/data/PlatformManifest.txt -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/obj/Microsoft.AspNetCore.App.Ref.csproj.nuget.dgspec.json -chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.0/obj/project.assets.json chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/FrameworkList.xml @@ -388,7 +385,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions # dynamic completion needs the file to be named the same as the base command -install src/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet +install src/cli.*/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 @@ -457,7 +454,15 @@ echo "Testing build results for debug symbols..." %dir %{_libdir}/dotnet/packs %changelog -* Wed Jan 20 2020 Omair Majid - 3.1.101-1 +* Mon Mar 23 2020 Omair Majid - 3.1.103-1 +- Update to .NET Core Runtime 3.1.3 and SDK 3.1.103 +- Resolves: RHBZ#1816192 + +* Tue Feb 25 2020 Omair Majid - 3.1.102-1 +- Update to .NET Core Runtime 3.1.2 and SDK 3.1.102 +- Resolves: RHBZ#1806670 + +* Mon Jan 20 2020 Omair Majid - 3.1.101-1 - Update to .NET Core Runtime 3.1.1 and SDK 3.1.101 - Resolves: RHBZ#1794437 - CVE-2020-0602 - Resolves: RHBZ#1794435 - CVE-2020-0603