From 8830fb70a48122cd7239a73c30875806ce008f33 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 25 Mar 2024 13:28:25 +0400 Subject: [PATCH] Beta version 4.15.6: OpenSSL 3.2.1. --- README.md | 3 +-- Telegram/build/docker/centos_env/Dockerfile | 10 +++++----- Telegram/build/prepare/prepare.py | 18 +++++++++--------- cmake | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index b09c6bd73c..6016f9cd49 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Version **1.8.15** was the last that supports older systems ## Third-party * Qt 6 ([LGPL](http://doc.qt.io/qt-6/lgpl.html)) and Qt 5.15 ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) slightly patched -* OpenSSL 1.1.1 and 1.0.1 ([OpenSSL License](https://www.openssl.org/source/license.html)) +* OpenSSL 3.2.1 ([Apache License 2.0](https://www.openssl.org/source/apache-license-2.0.txt)) * WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/LICENSE)) * zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html)) * LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html)) @@ -60,7 +60,6 @@ Version **1.8.15** was the last that supports older systems * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)) * Vazir font ([SIL Open Font License 1.1](https://github.com/rastikerdar/vazir-font/blob/master/OFL.txt)) * Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md)) -* Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt)) * xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE)) * QR Code generator ([MIT License](https://github.com/nayuki/QR-Code-generator#license)) * CMake ([New BSD License](https://github.com/Kitware/CMake/blob/master/Copyright.txt)) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 7ddfb5c421..da6a41df21 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -3,8 +3,8 @@ {%- set QT = "6.7.0" -%} {%- set QT_TAG = "v" ~ QT ~ "-rc2" -%} {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%} -{%- set OPENSSL_VER = "1_1_1" -%} -{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} +{%- set OPENSSL_VER = "3.2.1" -%} +{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-3.2.1" -%} {%- set CMAKE_VER = "3.27.6" -%} {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%} {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%} @@ -23,7 +23,7 @@ RUN dnf -y install epel-release \ && dnf config-manager --set-enabled powertools \ && dnf -y install autoconf automake libtool pkgconfig make patch git \ python3.11-pip python3.11-devel gperf flex bison clang lld yasm \ - file which perl-open perl-XML-Parser xorg-x11-util-macros \ + file which perl-open perl-XML-Parser perl-IPC-Cmd xorg-x11-util-macros \ gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils \ libffi-devel fontconfig-devel freetype-devel libX11-devel \ alsa-lib-devel pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \ @@ -661,8 +661,8 @@ RUN git clone -b 1.23.1 --depth=1 {{ GIT }}/kcat/openal-soft.git \ && rm -rf openal-soft FROM builder AS openssl -ENV opensslDir openssl_{{ OPENSSL_VER }} -RUN git clone -b OpenSSL_{{ OPENSSL_VER }}-stable --depth=1 {{ GIT }}/openssl/openssl.git $opensslDir \ +ENV opensslDir openssl-{{ OPENSSL_VER }} +RUN git clone -b openssl-{{ OPENSSL_VER }} --depth=1 {{ GIT }}/openssl/openssl.git $opensslDir \ && cd $opensslDir \ && ./config \ --prefix="{{ OPENSSL_PREFIX }}" \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 68b422b748..9a2ef4944b 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -578,9 +578,9 @@ mac: cmake --install build """) -stage('openssl', """ - git clone -b OpenSSL_1_1_1-stable https://github.com/openssl/openssl openssl - cd openssl +stage('openssl3', """ + git clone -b openssl-3.2.1 https://github.com/openssl/openssl openssl3 + cd openssl3 win32: perl Configure no-shared no-tests debug-VC-WIN32 win64: @@ -1420,7 +1420,7 @@ win: SET ANGLE_DIR=%LIBS_DIR%\\tg_angle SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg - SET OPENSSL_DIR=%LIBS_DIR%\\openssl + SET OPENSSL_DIR=%LIBS_DIR%\\openssl3 SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib SET WEBP_DIR=%LIBS_DIR%\\libwebp @@ -1534,7 +1534,7 @@ stage('tg_owt', """ win: SET MOZJPEG_PATH=$LIBS_DIR/mozjpeg SET OPUS_PATH=$USED_PREFIX/include/opus - SET OPENSSL_PATH=$LIBS_DIR/openssl/include + SET OPENSSL_PATH=$LIBS_DIR/openssl3/include SET LIBVPX_PATH=$USED_PREFIX/include SET FFMPEG_PATH=$LIBS_DIR/ffmpeg mkdir out @@ -1580,7 +1580,7 @@ mac: -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \ -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \ -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \ -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../.. @@ -1594,7 +1594,7 @@ mac: -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \ -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \ -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \ -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../.. @@ -1610,7 +1610,7 @@ release: -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \ -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \ -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \ -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../.. @@ -1623,7 +1623,7 @@ release: -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl3/include \ -DTG_OWT_OPUS_INCLUDE_PATH=$OPUS_PATH \ -DTG_OWT_LIBVPX_INCLUDE_PATH=$LIBVPX_PATH \ -DTG_OWT_FFMPEG_INCLUDE_PATH=$FFMPEG_PATH ../.. diff --git a/cmake b/cmake index 95c83fd264..161b986c32 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 95c83fd26424c26d4fc4454cef601529616683aa +Subproject commit 161b986c32e0da76aa2d3ae16d316ab55cad9bcc