diff --git a/mysql-boost-8.0.40.tar.gz b/mysql-boost-8.0.40.tar.gz index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5eab17a166098c6d56b3aa72775c8a41fc89f97d 100644 Binary files a/mysql-boost-8.0.40.tar.gz and b/mysql-boost-8.0.40.tar.gz differ diff --git a/mysql.spec b/mysql.spec index 69fad9f55bbaad07ab86219d2d26e986ec186d14..6a2a592ea2ac0e006696fceb69c9a94e9d33faa4 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.40 -Release: 1 +Release: 2 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND GPL-1.0-or-later OR Artistic-1.0-Perl AND BSD-2-Clause @@ -67,7 +67,7 @@ Patch129: fix-protobuf-version-22-and-up.patch Patch130: fix-build-error-for-loongarch64.patch BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel lz4 -BuildRequires: lz4-devel mecab-devel bison libzstd-devel +BuildRequires: lz4-devel mecab-devel bison libzstd-devel libudev-devel %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif @@ -220,23 +220,23 @@ wget -qO %{SOURCE0} https://user-repo.openeuler.openatom.cn/lfs-tar/mysql/mysql- gpg --import %{SOURCE33} gpg --verify %{SOURCE32} %{SOURCE0} %setup -q -n mysql-%{version} -%patch1 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch52 -p1 -%patch55 -p1 -%patch75 -p1 -%patch81 -p1 +%patch -P1 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P52 -p1 +%patch -P55 -p1 +%patch -P75 -p1 +%patch -P81 -p1 pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) -%patch115 -p0 -%patch125 -p1 +%patch -P115 -p0 +%patch -P125 -p1 popd %ifarch riscv64 -%patch128 -p1 +%patch -P128 -p1 %endif -%patch129 -p1 -%patch130 -p1 +%patch -P129 -p1 +%patch -P130 -p1 pushd mysql-test add_test () { echo "$1" : BUG#0 "${@:2}" >> %{skiplist} @@ -300,8 +300,7 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ exit 1 fi %endif -mkdir -p build && chmod +w build && cd build -cmake .. \ +%cmake \ -DBUILD_CONFIG=mysql_release \ -DFEATURE_SET="community" \ -DINSTALL_LAYOUT=RPM \ @@ -343,7 +342,7 @@ cmake .. \ -DWITH_ROUTER=OFF \ -DWITH_SYSTEM_LIBS=ON \ -DWITH_MECAB=system \ - -DWITH_BOOST=../boost \ + -DWITH_BOOST=%{_vpath_srcdir}/boost \ -DREPRODUCIBLE_BUILD=OFF \ -DCMAKE_C_FLAGS="%{optflags}%{?with_debug: -fno-strict-overflow -Wno-unused-result -Wno-unused-function -Wno-unused-but-set-variable}" \ -DCMAKE_CXX_FLAGS="%{optflags}%{?with_debug: -fno-strict-overflow -Wno-unused-result -Wno-unused-function -Wno-unused-but-set-variable}" \ @@ -354,37 +353,35 @@ cmake .. \ -DWITH_MYSQLD_LDFLAGS="%{build_ldflags}" \ -DCMAKE_C_LINK_FLAGS="%{build_ldflags}" \ -DCMAKE_CXX_LINK_FLAGS="%{build_ldflags}" -cmake .. -LAH +%cmake -LAH -%make_build -cd - +%cmake_build %install -cd build -make DESTDIR=%{buildroot} install +%cmake_install if %multilib_capable; then mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits} -install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config +install -p -m 0755 %{__cmake_builddir}/scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config fi install -p -m 0644 Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/ -install -p -m 0644 Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/ +install -p -m 0644 %{__cmake_builddir}/Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/ mkdir -p %{buildroot}%{logfiledir} mkdir -p %{buildroot}%{pidfiledir} install -p -m 0755 -d %{buildroot}%{dbdatadir} install -p -m 0750 -d %{buildroot}%{_localstatedir}/lib/mysql-files install -p -m 0700 -d %{buildroot}%{_localstatedir}/lib/mysql-keyring -install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf +install -D -p -m 0644 %{__cmake_builddir}/scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf -install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service -install -D -p -m 644 scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service -install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{daemon_name}.conf +install -D -p -m 644 %{__cmake_builddir}/scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service +install -D -p -m 644 %{__cmake_builddir}/scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service +install -D -p -m 0644 %{__cmake_builddir}/scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{daemon_name}.conf rm -r %{buildroot}%{_tmpfilesdir}/mysql.conf -install -D -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir -install -p -m 755 scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop -install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket -install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common -install -D -p -m 0644 scripts/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf +install -D -p -m 755 %{__cmake_builddir}/scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir +install -p -m 755 %{__cmake_builddir}/scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop +install -p -m 755 %{__cmake_builddir}/scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket +install -p -m 644 %{__cmake_builddir}/scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common +install -D -p -m 0644 %{__cmake_builddir}/scripts/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf rm %{buildroot}%{_libdir}/mysql/*.a rm %{buildroot}%{_mandir}/man1/comp_err.1* mkdir -p %{buildroot}%{logrotateddir} @@ -402,7 +399,6 @@ mv %{buildroot}%{_bindir}/mysqld-debug %{buildroot}%{_libexecdir}/mysqld chrpath-d%{buildroot}%{_libexecdir}/mysqld %endif -cd - install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}} install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}} install -p -m 0644 mysql-test/%{skiplist} %{buildroot}%{_datadir}/mysql-test @@ -415,8 +411,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/my.cnf.d %check %if %runselftest -pushd build -make test VERBOSE=1 +%ctest cd mysql-test cp ../../mysql-test/%{skiplist} . export MTR_BUILD_THREAD=%{__isa_bits} @@ -432,7 +427,6 @@ export MTR_BUILD_THREAD=%{__isa_bits} %endif rm -r var $(readlink var) cd - -popd %endif %pre server @@ -551,6 +545,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Tue Nov 05 2024 Funda Wang - 8.0.40-2 +- adopt to new cmake macro + * Thu Oct 17 2024 wangkai <13474090681@163.com> - 8.0.40-1 - Update to 8.0.40 for fix CVEs(CVE-2024-21218,CVE-2024-21196,CVE-2024-21207, CVE-2024-21198,CVE-2024-21203,CVE-2024-21213,CVE-2024-21239,CVE-2024-21199,