From 24950d65435a0f51338ab5cf8c7b4e08e23221bc Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Nov 13 2018 15:56:56 +0000 Subject: Update to .NET Core Runtime 2.1.6 and SDK 2.1.500 --- diff --git a/core-setup-4510-commit-id.patch b/core-setup-4510-commit-id.patch new file mode 100644 index 0000000..cf896ef --- /dev/null +++ b/core-setup-4510-commit-id.patch @@ -0,0 +1,48 @@ +From e02ee86364b9db3edc298a6a081004aa07473d09 Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Wed, 29 Aug 2018 17:03:25 -0400 +Subject: [PATCH] Allow setting the commit id using /p:LatestCommit + +This is similar to how CommitCount is already supported. + +This lets consumers who are building outside a git repo, such as +source-build, set a commit id which is displayed by `dotnet --info` +and `strings dotnet | grep '@(#)'`. + +See: https://github.com/dotnet/source-build/issues/651 +See: https://github.com/dotnet/cli/pull/5945 +--- + dir.targets | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/dir.targets b/dir.targets +index 8d34872c6..59dc1ebde 100644 +--- a/dir.targets ++++ b/dir.targets +@@ -17,7 +17,8 @@ + + + +- ++ + + + +@@ -29,13 +30,13 @@ + + + +- ++ + ++ ConsoleToMSBuild="true"> + + + diff --git a/corefx-32956-alpn.patch b/corefx-32956-alpn.patch new file mode 100644 index 0000000..01fd266 --- /dev/null +++ b/corefx-32956-alpn.patch @@ -0,0 +1,22 @@ +From 9b9697318e9990655ea878a28a00eda44fb615c2 Mon Sep 17 00:00:00 2001 +From: Jeremy Barton +Date: Mon, 22 Oct 2018 11:54:52 -0700 +Subject: [PATCH] Fix ALPN detection logic (for non-portable shim builds) + +--- + .../Unix/System.Security.Cryptography.Native/configure.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Native/Unix/System.Security.Cryptography.Native/configure.cmake b/src/Native/Unix/System.Security.Cryptography.Native/configure.cmake +index cdc9f50f3c33..fac8c16343df 100644 +--- a/src/Native/Unix/System.Security.Cryptography.Native/configure.cmake ++++ b/src/Native/Unix/System.Security.Cryptography.Native/configure.cmake +@@ -2,7 +2,7 @@ include(CheckLibraryExists) + check_library_exists(${OPENSSL_SSL_LIBRARY} "TLSv1_1_method" "" HAVE_TLS_V1_1) + check_library_exists(${OPENSSL_SSL_LIBRARY} "TLSv1_2_method" "" HAVE_TLS_V1_2) + +-set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) ++set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) + + check_function_exists( + EC_GF2m_simple_method diff --git a/dotnet.spec b/dotnet.spec index b9227d9..3a149c7 100644 --- a/dotnet.spec +++ b/dotnet.spec @@ -18,12 +18,12 @@ %global dotnet_cflags %(echo %optflags | sed -e 's/-fcf-protection//' | sed -re 's/-specs=[^ ]*//g') %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g') -%global sdk_version 2.1.403 -%global runtime_version 2.1.5 +%global sdk_version 2.1.500 +%global runtime_version 2.1.6 Name: dotnet Version: %{sdk_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD URL: https://github.com/dotnet/ @@ -35,12 +35,15 @@ URL: https://github.com/dotnet/ # - ./build-source-tarball.sh dotnet-%%{sdk_version} # - tar cvzf dotnet-%%{sdk_version}.tar.gz dotnet-%%{sdk_version} -Source0: dotnet-%{runtime_version}.tar.gz +Source0: dotnet-v%{runtime_version}a.tar.gz Source1: check-debug-symbols.py Source2: dotnet.sh Patch1: corefx-optflags-support.patch -Patch2: cli-telemetry-optout.patch +Patch2: corefx-32956-alpn.patch + +Patch300: core-setup-4510-commit-id.patch +Patch400: cli-telemetry-optout.patch ExclusiveArch: x86_64 @@ -139,7 +142,7 @@ applications and micro-services. Version: %{sdk_version} Summary: .NET Core 2.1 Software Development Kit -Requires: %{name}-sdk-2.1.4xx%{?_isa} +Requires: %{name}-sdk-2.1.5xx%{?_isa} %description sdk-2.1 The .NET Core SDK is a collection of command line applications to @@ -151,14 +154,14 @@ cross platform applications that work on Linux, Mac and Windows. It particularly focuses on creating console applications, web applications and micro-services. -%package sdk-2.1.4xx +%package sdk-2.1.5xx Version: %{sdk_version} -Summary: .NET Core 2.1.4xx Software Development Kit +Summary: .NET Core 2.1.5xx Software Development Kit Requires: %{name}-runtime-2.1%{?_isa} -%description sdk-2.1.4xx +%description sdk-2.1.5xx The .NET Core SDK is a collection of command line applications to create, build, publish and run .NET Core applications. @@ -169,17 +172,22 @@ It particularly focuses on creating console applications, web applications and micro-services. %prep -%setup -q -n %{name}-%{runtime_version} +%setup -q -n %{name}-v%{runtime_version}a # Fix bad hardcoded path in build sed -i 's|/usr/share/dotnet|%{_libdir}/%{name}|' src/core-setup/src/corehost/common/pal.unix.cpp pushd src/corefx %patch1 -p1 +%patch2 -p1 +popd + +pushd src/core-setup +%patch300 -p1 popd pushd src/cli -%patch2 -p1 +%patch400 -p1 popd %build @@ -257,11 +265,14 @@ echo "Testing build results for debug symbols..." %files sdk-2.1 # empty package useful for dependencies -%files sdk-2.1.4xx +%files sdk-2.1.5xx %dir %{_libdir}/%{name}/sdk %{_libdir}/%{name}/sdk/%{sdk_version} %changelog +* Tue Nov 13 2018 Omair Majid - 2.1.500-1 +- Update to .NET Core Runtime 2.1.6 and SDK 2.1.500 + * Fri Nov 02 2018 Omair Majid - 2.1.403-3 - Add host-fxr-2.1 subpackage