From 62dc5f4bdea3c8e93a9c1618c31a26ba91e4b9f9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 14 2018 07:46:32 +0000 Subject: import rh-dotnet21-dotnet-2.1.500-3.el7 --- diff --git a/.gitignore b/.gitignore index 71e6f3c..48e4d49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-2.1.5.tar.gz +SOURCES/dotnet-v2.1.6a.tar.gz diff --git a/.rh-dotnet21-dotnet.metadata b/.rh-dotnet21-dotnet.metadata index c28de91..295aec9 100644 --- a/.rh-dotnet21-dotnet.metadata +++ b/.rh-dotnet21-dotnet.metadata @@ -1 +1 @@ -a6964bc7a1e1351287fa5edab51e2daf92b85ef0 SOURCES/dotnet-2.1.5.tar.gz +db2f013144bd22de339b990f559614bc29c94920 SOURCES/dotnet-v2.1.6a.tar.gz diff --git a/SOURCES/core-setup-4510-commit-id.patch b/SOURCES/core-setup-4510-commit-id.patch new file mode 100644 index 0000000..cf896ef --- /dev/null +++ b/SOURCES/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/SOURCES/corefx-32956-alpn.patch b/SOURCES/corefx-32956-alpn.patch new file mode 100644 index 0000000..01fd266 --- /dev/null +++ b/SOURCES/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/SPECS/dotnet.spec b/SPECS/dotnet.spec index 3b87b25..ff03703 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -30,12 +30,12 @@ # on system libcurl package. We require the %%{?scl_prefix}libcurl package %global __requires_exclude ^(%{privlibs}|libcurl)\\.so -%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: %{?scl_prefix}dotnet Version: %{sdk_version} -Release: 1%{?dist} +Release: 3%{?dist} Group: Development/Languages Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD @@ -48,9 +48,12 @@ 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 +Patch100: corefx-32956-alpn.patch +Patch300: core-setup-4510-commit-id.patch + ExclusiveArch: x86_64 BuildRequires: llvm-toolset-7-clang @@ -125,7 +128,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 @@ -137,14 +140,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. @@ -155,7 +158,7 @@ It particularly focuses on creating console applications, web applications and micro-services. %prep -%setup -q -n %{pkg_name}-%{runtime_version} +%setup -q -n %{pkg_name}-v%{runtime_version}a # See https://github.com/dotnet/source-build/pull/669 rm -rf Tools/configuration/configuration.props @@ -166,6 +169,14 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj # Fix bad hardcoded path in build sed -i 's|/usr/share/dotnet|%{_libdir}/%{pkg_name}|' src/core-setup/src/corehost/common/pal.unix.cpp +pushd src/corefx +%patch100 -p1 +popd + +pushd src/core-setup +%patch300 -p1 +popd + %build %{?scl:scl enable %scl llvm-toolset-7 - << \EOF} set -xe @@ -239,11 +250,25 @@ 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}/%{pkg_name}/sdk %{_libdir}/%{pkg_name}/sdk/%{sdk_version} %changelog +* Fri Nov 09 2018 Omair Majid - 2.1.500-3 +- Fix linking alpn support by linking to OpenSSL correctly +- Fix commit ids in dotnet --info +- Resolves: rhbz#1643978 +- Resolves: rhbz#1648425 + +* Thu Nov 08 2018 Omair Majid - 2.1.500-2 +- Update to rebuild of .NET Core Runtime 2.1.5 and SDK 2.1.500 +- Resolves: rhbz#1646697 + +* Mon Nov 05 2018 Omair Majid - 2.1.500-1 +- Update to .NET Core Runtime 2.1.5 and SDK 2.1.500 +- Resolves: rhbz#1646697 + * Mon Oct 01 2018 Omair Majid - 2.1.403-1 - Update to .NET Core Runtime 2.1.5 and SDK 2.1.403 - Resolves: rhbz#1634169