diff --git a/mysql-boost-8.0.29.tar.gz b/mysql-boost-8.0.30.tar.gz similarity index 100% rename from mysql-boost-8.0.29.tar.gz rename to mysql-boost-8.0.30.tar.gz diff --git a/mysql-boost-8.0.29.tar.gz.ac b/mysql-boost-8.0.30.tar.gz.aa similarity index 85% rename from mysql-boost-8.0.29.tar.gz.ac rename to mysql-boost-8.0.30.tar.gz.aa index 216dfd1c594c2b35999a9f691ee6aebe7a3cd3cc..a1cf51cafdedd5b84d997a8ca471900c865d0bd2 100644 Binary files a/mysql-boost-8.0.29.tar.gz.ac and b/mysql-boost-8.0.30.tar.gz.aa differ diff --git a/mysql-boost-8.0.29.tar.gz.aa b/mysql-boost-8.0.30.tar.gz.ab similarity index 85% rename from mysql-boost-8.0.29.tar.gz.aa rename to mysql-boost-8.0.30.tar.gz.ab index 4c6072befa3d8b5aaa60108ce401628c846ab166..0b872d05b25134d808749c3b987584412138fe9d 100644 Binary files a/mysql-boost-8.0.29.tar.gz.aa and b/mysql-boost-8.0.30.tar.gz.ab differ diff --git a/mysql-boost-8.0.29.tar.gz.ab b/mysql-boost-8.0.30.tar.gz.ac similarity index 85% rename from mysql-boost-8.0.29.tar.gz.ab rename to mysql-boost-8.0.30.tar.gz.ac index 1c3322cf20022ee106a2afd5e1e3ffb2068cadb3..403d211385f716b84a553bb92d3992793cd65c65 100644 Binary files a/mysql-boost-8.0.29.tar.gz.ab and b/mysql-boost-8.0.30.tar.gz.ac differ diff --git a/mysql-boost-8.0.29.tar.gz.ad b/mysql-boost-8.0.30.tar.gz.ad similarity index 50% rename from mysql-boost-8.0.29.tar.gz.ad rename to mysql-boost-8.0.30.tar.gz.ad index 7fcf8142ed9209192de6caa7e12575e75601043d..e3296235cf6c3253aaed1a7ed56b01f37ea25517 100644 Binary files a/mysql-boost-8.0.29.tar.gz.ad and b/mysql-boost-8.0.30.tar.gz.ad differ diff --git a/mysql-chain-certs.patch b/mysql-chain-certs.patch deleted file mode 100644 index 5f26c48b97efb00a3c5c20dd6567ec9230d49d44..0000000000000000000000000000000000000000 --- a/mysql-chain-certs.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix things so that chains of certificates work in the server and client -certificate files. - -This only really works for OpenSSL-based builds, as yassl is unable to read -multiple certificates from a file. The patch below to yassl/src/ssl.cpp -doesn't fix that, but just arranges that the viosslfactories.c patch won't -have any ill effects in a yassl build. Since we don't use yassl in Red Hat/ -Fedora builds, I'm not feeling motivated to try to fix yassl for this. - -See RH bug #598656. Filed upstream at http://bugs.mysql.com/bug.php?id=54158 - -diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc -index 5e881e3..2927e7f 100644 ---- a/vio/viosslfactories.cc -+++ b/vio/viosslfactories.cc -@@ -198,7 +198,7 @@ static int vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, - if (!key_file && cert_file) key_file = cert_file; - - if (cert_file && -- SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) { -+ SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0) { - *error = SSL_INITERR_CERT; - DBUG_PRINT("error", - ("%s from file '%s'", sslGetErrString(*error), cert_file)); diff --git a/mysql.spec b/mysql.spec index 960658b29e8d556fe5dbd5b80fa770554bdac51b..de5e20537ebec6583596250b61d399b232a0d457 100644 --- a/mysql.spec +++ b/mysql.spec @@ -29,12 +29,12 @@ %bcond_without conflicts %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.0.29 -Release: 2 +Version: 8.0.30 +Release: 1 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD -Source0: https://cdn.mysql.com//Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz +Source0: https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-%{version}.tar.gz Source2: mysql_config_multilib.sh Source3: my.cnf.in Source6: README.mysql-docs @@ -48,15 +48,14 @@ Source17: mysql-wait-stop.sh Source18: mysql@.service.in Source30: %{pkgnamepatch}.rpmlintrc Source31: server.cnf.in -Source32: %{name}-boost-%{version}.tar.gz.aa -Source33: %{name}-boost-%{version}.tar.gz.ab -Source34: %{name}-boost-%{version}.tar.gz.ac -Source35: %{name}-boost-%{version}.tar.gz.ad +Source32: %{name}-boost-%{version}.tar.gz.aa +Source33: %{name}-boost-%{version}.tar.gz.ab +Source34: %{name}-boost-%{version}.tar.gz.ac +Source35: %{name}-boost-%{version}.tar.gz.ad Patch1: %{pkgnamepatch}-install-test.patch Patch3: %{pkgnamepatch}-file-contents.patch Patch4: %{pkgnamepatch}-scripts.patch Patch5: %{pkgnamepatch}-paths.patch -Patch51: %{pkgnamepatch}-chain-certs.patch Patch52: %{pkgnamepatch}-sharedir.patch Patch55: %{pkgnamepatch}-rpath.patch Patch75: %{pkgnamepatch}-arm32-timer.patch @@ -70,7 +69,7 @@ BuildRequires: lz4-devel mecab-devel bison libzstd-devel %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif -BuildRequires: compat-openssl11-devel libcurl-devel make +BuildRequires: openssl openssl-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 +176,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: compat-openssl11-devel zlib-devel libzstd-devel +Requires: openssl-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 +188,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 compat-openssl11-devel perl(Digest::file) +Requires: %{name}-server%{?_isa} = %{sameevr} gzip lz4 openssl 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) @@ -221,7 +220,6 @@ cd .. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch51 -p1 %patch52 -p1 %patch55 -p1 %patch75 -p1 @@ -543,10 +541,13 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Thu Feb 9 2023 caodongxia - 8.0.30-1 +- Update to 8.0.30 + * 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 +* 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 CVE-2022-21435 CVE-2022-21452 CVE-2022-21413 CVE-2022-21462 CVE-2022-21412 @@ -554,6 +555,7 @@ fi CVE-2022-21459 CVE-2022-21478 CVE-2022-21479 CVE-2022-21440 CVE-2022-21425 CVE-2022-21457 CVE-2022-21454 CVE-2022-21483 CVE-2022-21482 CVE-2022-21484 CVE-2022-21485 CVE-2022-21486 CVE-2022-21489 CVE-2022-21490 + * Tue Jan 25 2022 yaoxin - 8.0.28-1 - Upgrade mysql to 8.0.28 to fix cves.