From 2032b3d24e5fba78d6a09cc53d53700216312bc0 Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Thu, 2 Feb 2023 16:14:50 +0800 Subject: [PATCH] Change the compilation dependency of openssl to compat-openssl --- mysql.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mysql.spec b/mysql.spec index 5387268..960658b 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.29 -Release: 1 +Release: 2 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD @@ -70,7 +70,7 @@ BuildRequires: lz4-devel mecab-devel bison libzstd-devel %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif -BuildRequires: openssl openssl-devel libcurl-devel make +BuildRequires: compat-openssl11-devel libcurl-devel make BuildRequires: perl-interpreter perl-generators BuildRequires: rpcgen libtirpc-devel BuildRequires: protobuf-lite-devel rapidjson-devel zlib zlib-devel multilib-rpm-config procps @@ -177,7 +177,7 @@ the MySQL server and some accompanying files and directories. %package devel Summary: Files for development of MySQL applications %{?with_clibrary:Requires: %{name}-libs%{?_isa} = %{sameevr}} -Requires: openssl-devel zlib-devel libzstd-devel +Requires: compat-openssl11-devel zlib-devel libzstd-devel %{?with_conflicts:Conflicts: mariadb-devel} %description devel MySQL is a multi-user, multi-threaded SQL database server. This @@ -189,7 +189,7 @@ developing MySQL client applications. %package test Summary: The test suite distributed with MySQL Requires: %{name}%{?_isa} = %{sameevr} %{name}-common%{?_isa} = %{sameevr} -Requires: %{name}-server%{?_isa} = %{sameevr} gzip lz4 openssl perl(Digest::file) +Requires: %{name}-server%{?_isa} = %{sameevr} gzip lz4 compat-openssl11-devel perl(Digest::file) Requires: perl(Digest::MD5) perl(Env) perl(Exporter) perl(Fcntl) perl(File::Temp) Requires: perl(FindBin) perl(Data::Dumper) perl(Getopt::Long) perl(IPC::Open3) perl(JSON) Requires: perl(LWP::Simple) perl(Memoize) perl(Socket) perl(Sys::Hostname) @@ -543,6 +543,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Thu Feb 2 2023 caodongxia - 8.0.29-2 +- Change the compilation dependency of openssl to compat-openssl + *Mon May 9 2022 jintang song - 8.0.29-1 - Upgrade mysql to 8.0.29,fix CVES:'CVE-2022-21423 CVE-2022-21451 CVE-2022-21444 CVE-2022-21460 CVE-2022-21417 CVE-2022-21427 CVE-2022-21414 -- Gitee