From 45ceebdabf1f7b118b432f3a3053d2ce1f44ef94 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Nov 28 2020 17:56:53 +0000 Subject: Updated to version 1.7.0. --- diff --git a/.gitignore b/.gitignore index 59eaf05..c710d96 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /tdlib-1.4.0.tar.gz /tdlib-1.5.0.tar.gz /tdlib-1.6.0.tar.gz +/tdlib-1.7.0.tar.gz diff --git a/sources b/sources index fa92ce7..95d67c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tdlib-1.6.0.tar.gz) = aee8b3df17e8571ca587cc72092305fd0992fefc4d9f60b2c530c9e6726c6b6371f0e5819ca4d5a4ffbbef1345f2a18156aae979b80e124ffe183423f8f515e0 +SHA512 (tdlib-1.7.0.tar.gz) = eeff4921cd2624cb29386d319510c84eb49ea01321319e23e0ae92978c831eeaf9e4b891b22bc08a4eeb7fa24c1c9d0604f8affc7065c8e722fa3a055f882ea6 diff --git a/tdlib-system-crypto.patch b/tdlib-system-crypto.patch deleted file mode 100644 index b70053a..0000000 --- a/tdlib-system-crypto.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9da7dffcb048e409b51faadbae241cbd8d5ea165 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Mon, 17 Sep 2018 00:55:54 +0200 -Subject: [PATCH] Use system-wide crypto policies. - -More information: https://fedoraproject.org/wiki/Packaging:CryptoPolicies - -Signed-off-by: Vitaly Zaitsev ---- - tdnet/td/net/SslStream.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tdnet/td/net/SslStream.cpp b/tdnet/td/net/SslStream.cpp -index 64f7a9c..c04c44e 100644 ---- a/tdnet/td/net/SslStream.cpp -+++ b/tdnet/td/net/SslStream.cpp -@@ -295,7 +295,7 @@ class SslStreamImpl { - - // TODO(now): cipher list - string cipher_list; -- if (SSL_CTX_set_cipher_list(ssl_ctx, cipher_list.empty() ? "DEFAULT" : cipher_list.c_str()) == 0) { -+ if (SSL_CTX_set_cipher_list(ssl_ctx, cipher_list.empty() ? "PROFILE=SYSTEM" : cipher_list.c_str()) == 0) { - return create_openssl_error(-9, PSLICE() << "Failed to set cipher list \"" << cipher_list << '"'); - } - --- -2.17.1 - diff --git a/tdlib.spec b/tdlib.spec index 8ccbe05..fdfd74a 100644 --- a/tdlib.spec +++ b/tdlib.spec @@ -1,29 +1,13 @@ %undefine __cmake_in_source_build -# Build conditionals (with - OFF, without - ON)... -%bcond_with clang -%bcond_with ipo -%bcond_without mindbg - -# Applying workaround to RHBZ#1559007... -%if %{with clang} -%global optflags %(echo %{optflags} | sed -e 's/-mcet//g' -e 's/-fcf-protection//g' -e 's/-fstack-clash-protection//g' -e 's/$/-Qunused-arguments -Wno-unknown-warning-option/') -%endif - -# Decrease debuginfo verbosity to reduce memory consumption... -%if %{with mindbg} -%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%endif - Name: tdlib -Version: 1.6.0 -Release: 2%{?dist} -Summary: Cross-platform library for building Telegram clients +Version: 1.7.0 +Release: 1%{?dist} License: Boost URL: https://github.com/%{name}/td -Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{name}-system-crypto.patch +Summary: Cross-platform library for building Telegram clients +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gperftools-devel BuildRequires: openssl-devel @@ -34,12 +18,6 @@ BuildRequires: gperf BuildRequires: cmake BuildRequires: gcc -%if %{with clang} -BuildRequires: compiler-rt -BuildRequires: clang -BuildRequires: llvm -%endif - # Building with default settings require at least 16 GB of free RAM. # Builds on ARM and other low-memory architectures are failing. ExclusiveArch: x86_64 @@ -66,29 +44,12 @@ Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %prep %autosetup -n td-%{version} -p1 +sed -e 's/"DEFAULT"/"PROFILE=SYSTEM"/g' -i tdnet/td/net/SslStream.cpp %build %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBDIR=%{_lib} \ -%if %{with clang} - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_AR=%{_bindir}/llvm-ar \ - -DCMAKE_RANLIB=%{_bindir}/llvm-ranlib \ - -DCMAKE_LINKER=%{_bindir}/llvm-ld \ - -DCMAKE_OBJDUMP=%{_bindir}/llvm-objdump \ - -DCMAKE_NM=%{_bindir}/llvm-nm \ -%else - -DCMAKE_AR=%{_bindir}/gcc-ar \ - -DCMAKE_RANLIB=%{_bindir}/gcc-ranlib \ - -DCMAKE_NM=%{_bindir}/gcc-nm \ -%endif -%if %{with ipo} && %{with mindbg} - -DTD_ENABLE_LTO:BOOL=ON \ -%else - -DTD_ENABLE_LTO:BOOL=OFF \ -%endif -DTD_ENABLE_JNI:BOOL=OFF \ -DTD_ENABLE_DOTNET:BOOL=OFF %cmake_build @@ -105,37 +66,14 @@ Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %{_includedir}/td %{_libdir}/libtd*.so %{_libdir}/cmake/Td +%{_libdir}/pkgconfig/td*.pc %files static %{_libdir}/libtd*.a %changelog +* Sat Nov 28 2020 Vitaly Zaitsev - 1.7.0-1 +- Updated to version 1.7.0. + * Wed Jul 29 2020 Fedora Release Engineering - 1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Feb 01 2020 Vitaly Zaitsev - 1.6.0-1 -- Updated to version 1.6.0. - -* Fri Jan 31 2020 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Sep 10 2019 Vitaly Zaitsev - 1.5.0-1 -- Updated to version 1.5.0. - -* Sat Jul 27 2019 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 02 2019 Vitaly Zaitsev - 1.4.0-1 -- Updated to version 1.4.0. - -* Mon Feb 04 2019 Vitaly Zaitsev - 1.3.0-4 -- Switched to clang on Fedora 30+. - -* Sun Feb 03 2019 Fedora Release Engineering - 1.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Sep 16 2018 Vitaly Zaitsev - 1.3.0-2 -- Fixed issue with crypto policies. - -* Sat Sep 15 2018 Vitaly Zaitsev - 1.3.0-1 -- Initial SPEC release.