From c3bec3cc5cf57bef1de8dd956ef2fb0ea3950db1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 13 2019 13:43:03 +0000 Subject: import rh-dotnet22-dotnet-2.2.105-1.el7 --- diff --git a/.gitignore b/.gitignore index 55d0429..dfb38e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-2.2.103-SDK.tar.gz +SOURCES/dotnet-v2.2.3.tar.gz diff --git a/.rh-dotnet22-dotnet.metadata b/.rh-dotnet22-dotnet.metadata index a607863..b7988d7 100644 --- a/.rh-dotnet22-dotnet.metadata +++ b/.rh-dotnet22-dotnet.metadata @@ -1 +1 @@ -eb058a530039e8575c4ad0facf2752a1b891618c SOURCES/dotnet-2.2.103-SDK.tar.gz +5b951a762cc6fbbda23007a878a730ff46f5be35 SOURCES/dotnet-v2.2.3.tar.gz diff --git a/SOURCES/corefx-32956-alpn.patch b/SOURCES/corefx-32956-alpn.patch index 01fd266..88788b2 100644 --- a/SOURCES/corefx-32956-alpn.patch +++ b/SOURCES/corefx-32956-alpn.patch @@ -12,9 +12,9 @@ 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) + include(CheckFunctionExists) + set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) -set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) +set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) diff --git a/SOURCES/corefx-optflags-support.patch b/SOURCES/corefx-optflags-support.patch index 97e15ac..8b863e5 100644 --- a/SOURCES/corefx-optflags-support.patch +++ b/SOURCES/corefx-optflags-support.patch @@ -15,17 +15,17 @@ index 809ffe318e..de55150e36 100644 --- a/src/Native/Unix/System.Security.Cryptography.Native/configure.cmake +++ b/src/Native/Unix/System.Security.Cryptography.Native/configure.cmake @@ -3,6 +3,11 @@ include(CheckFunctionExists) - - set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + include(CheckLibraryExists) + include(CheckFunctionExists) +set (PREVIOUS_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +set (CMAKE_CXX_FLAGS "") +set (PREVIOUS_CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) +set (CMAKE_C_FLAGS "") + - # Check which versions of TLS the OpenSSL/ssl library supports - 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_INCLUDES ${OPENSSL_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY} ${OPENSSL_SSL_LIBRARY}) + @@ -17,6 +22,9 @@ check_function_exists( SSL_get0_alpn_selected HAVE_OPENSSL_ALPN) diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index a2ed2a2..0d1ee30 100644 --- a/SPECS/dotnet.spec +++ b/SPECS/dotnet.spec @@ -36,13 +36,13 @@ %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 host_version 2.2.1 -%global sdk_version 2.2.103 -%global runtime_version 2.2.1 +%global host_version 2.2.3 +%global runtime_version 2.2.3 +%global sdk_version 2.2.105 Name: %{?scl_prefix}dotnet Version: %{sdk_version} -Release: 2%{?dist} +Release: 1%{?dist} Group: Development/Languages Summary: .NET Core CLI tools and runtime License: MIT and ASL 2.0 and BSD @@ -55,7 +55,7 @@ URL: https://github.com/dotnet/ # - ./build-source-tarball.sh dotnet-%%{sdk_version} # - tar cvzf dotnet-%%{sdk_version}.tar.gz dotnet-%%{sdk_version} -Source0: dotnet-%{sdk_version}-SDK.tar.gz +Source0: dotnet-v%{runtime_version}.tar.gz Source1: check-debug-symbols.py Patch100: corefx-32956-alpn.patch @@ -186,7 +186,7 @@ It particularly focuses on creating console applications, web applications and micro-services. %prep -%setup -q -n %{pkg_name}-%{sdk_version}-SDK +%setup -q -n %{pkg_name}-v%{runtime_version} # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj @@ -294,12 +294,20 @@ echo "Testing build results for debug symbols..." %{_libdir}/%{pkg_name}/sdk/%{sdk_version} %changelog +* Tue Mar 05 2019 Omair Majid - 2.2.105-1 +- Update to .NET Core Runtime 2.2.3 and SDK 2.2.105 +- Resolves: RHBZ#1685718 + +* Wed Jan 30 2019 Omair Majid - 2.2.104-2 +- Update to .NET Core Runtime 2.2.2 and SDK 2.2.104 +- Resolves: RHBZ#1671056 + * Tue Jan 15 2019 Omair Majid - 2.2.103-2 - Update to .NET Core SDK 2.2.103 - Resolves: RHBZ#1666465 * Tue Dec 18 2018 Omair Majid - 2.2.102-1 -- Update to .NET Core Runtime 2.1.2 and SDK 2.2.102 +- Update to .NET Core Runtime 2.2.1 and SDK 2.2.102 - Resolves: RHBZ#1660223 * Thu Nov 29 2018 Omair Majid - 2.2.100-5