12:47 p.m.
commit 03357f24c8fd7161722e092abe1f9a61f788d322
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Dec 9 13:46:49 2021 +0100
Updated to version 3.3.0.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-openssl30-fixes.patch | 31 +++++++++++++++++++++++++++++++
telegram-desktop.spec | 16 ++++++++++------
4 files changed, 43 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5fd5577..04a60c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,4 @@
/tdesktop-3.0.1-full.tar.gz
/tdesktop-3.2.4-full.tar.gz
/tdesktop-3.2.5-full.tar.gz
+/tdesktop-3.3.0-full.tar.gz
diff --git a/sources b/sources
index d0a8eb7..addec2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-3.2.5-full.tar.gz) =
37405780239d2bbc14762299ddca3a5d9cd61ecad70ce960c9f4ed27a31a55f01ccd2e366ca976695a0f1e90bdf57da2344059157df076820933c475043fa0f6
+SHA512 (tdesktop-3.3.0-full.tar.gz) =
ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
diff --git a/telegram-desktop-openssl30-fixes.patch
b/telegram-desktop-openssl30-fixes.patch
new file mode 100644
index 0000000..72a9215
--- /dev/null
+++ b/telegram-desktop-openssl30-fixes.patch
@@ -0,0 +1,31 @@
+From 4baac8ce815225a3fe8fbfdaa06d114d5e7aa144 Mon Sep 17 00:00:00 2001
+From: Vitaly Zaitsev <vitaly(a)easycoding.org>
+Date: Thu, 9 Dec 2021 12:41:17 +0100
+Subject: [PATCH] Fixed build against OpenSSL 3.0.
+
+Deprecated function FIPS_mode_set() was removed in OpenSSL 3.0.
+
+Switched to EVP_default_properties_enable_fips() as described in OpenSSL
+3.0 migration guide.
+
+Signed-off-by: Vitaly Zaitsev <vitaly(a)easycoding.org>
+---
+ Telegram/SourceFiles/core/utils.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
+index 160af3f77047..16b9e2d8fa51 100644
+--- a/Telegram/SourceFiles/core/utils.cpp
++++ b/Telegram/SourceFiles/core/utils.cpp
+@@ -125,7 +125,11 @@ namespace ThirdParty {
+ void finish() {
+ CRYPTO_cleanup_all_ex_data();
+ #ifndef LIBRESSL_VERSION_NUMBER
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++ EVP_default_properties_enable_fips(nullptr, 0);
++#else
+ FIPS_mode_set(0);
++#endif
+ #endif
+ ENGINE_cleanup();
+ CONF_modules_unload(1);
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 23af905..9f4397a 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,7 +1,7 @@
%undefine __cmake_in_source_build
# Build conditionals...
-%global enable_wayland 0
+%global enable_wayland 1
%global enable_x11 1
%global system_libtgvoip 0
%global system_rlottie 0
@@ -25,7 +25,7 @@
%endif
Name: telegram-desktop
-Version: 3.2.5
+Version: 3.3.0
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -37,6 +37,9 @@ URL: https://github.com/telegramdesktop/%{appname}
Summary: Telegram Desktop official messaging app
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}-full.tar.gz
+# https://github.com/telegramdesktop/tdesktop/pull/17371
+Patch100: %{name}-openssl30-fixes.patch
+
# Telegram Desktop require more than 8 GB of RAM on linking stage.
# Disabling all low-memory architectures.
ExclusiveArch: x86_64 aarch64
@@ -79,10 +82,6 @@ BuildRequires: minizip-compat-devel
BuildRequires: ninja-build
BuildRequires: python3
-%if 0%{?fedora} && 0%{?fedora} > 35
-BuildRequires: openssl1.1-devel
-%endif
-
%if %{use_clang}
BuildRequires: compiler-rt
BuildRequires: clang
@@ -261,6 +260,11 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Thu Dec 09 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.3.0-1
+- Updated to version 3.3.0.
+- Enabled Wayland integration.
+- Build with OpenSSL 3.0 for Fedora 36+.
+
* Tue Nov 16 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.2.5-1
- Updated to version 3.2.5.
- Added OpenSSL workaround for Fedora 36+.