From 8d5dab8198d27115ddd818148cbb16e96c6453e1 Mon Sep 17 00:00:00 2001 From: writings-of-prince-huainan Date: Mon, 30 Nov 2020 19:47:18 +0800 Subject: [PATCH 1/2] issue libprotobuf-lite --- mysql.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mysql.spec b/mysql.spec index 83e0993..f67634d 100644 --- a/mysql.spec +++ b/mysql.spec @@ -7,7 +7,7 @@ %global boost_bundled_version 1.73.0 Name: mysql Version: 8.0.22 -Release: 1 +Release: 2 License: GPLv2 with exceptions and LGPLv2 and BSD Summary: The world's most popular open source database URL: http://www.mysql.com/ @@ -26,7 +26,7 @@ Patch12:boost-1.57.0-mpl-print.patch BuildRequires: cmake openssl-devel ncurses-devel libtirpc-devel rpcgen -Requires: libatomic >= 1.2.0 libstdc++ >= 7.3.0 ncurses libtirpc openssl +Requires: libatomic >= 1.2.0 libstdc++ >= 7.3.0 ncurses libtirpc openssl ldconfig %description The MySQL(TM) software delivers a very fast, multi-threaded, multi-user, @@ -85,6 +85,11 @@ if [ -f %{_prefix}/local/%{name}/support-files/mysql.server > /dev/null 2>&1 ] chkconfig --level 2345 mysql on fi +if [ -f %{_prefix}/local/%{name}/lib/private];then + echo "%{_prefix}/local/%{name}/lib/private" > %{_sysconfdir}/ld.so.conf.d/%{name}.conf + ldconfig +fi + %preun if [ -f %{_sysconfdir}/my.cnf ];then mv %{_sysconfdir}/my.cnf %{_sysconfdir}/my.cnf.rpmold @@ -92,6 +97,10 @@ fi if [ -f %{_initddir}/mysql ];then mv %{_initddir}/mysql %{_initddir}/mysql.rpmold fi +if [ -f %{_sysconfdir}/ld.so.conf.d/%{name}.conf];then + rm -f %{_sysconfdir}/ld.so.conf.d/%{name}.conf + ldconfig +fi %postun userdel -r %{name} &>/dev/null @@ -103,6 +112,9 @@ userdel -r %{name} &>/dev/null %exclude /usr/lib/debug %changelog +* Mon Nov 30 2020 weishengjing 8.0.22-2 +- add libprotobuf-lite.so to /usr/lib64 + * Wed Nov 18 2020 weishengjing 8.0.22-1 - New version 8.0.22 fix CVES: CVE-2020-14852 CVE-2020-14794 CVE-2020-14775 CVE-2020-14893 CVE-2020-14829 CVE-2020-14828 CVE-2020-14888 CVE-2020-14891 -- Gitee From d6ed7dfe203023bba7e12498904c9a8ca95b0759 Mon Sep 17 00:00:00 2001 From: writings-of-prince-huainan Date: Tue, 1 Dec 2020 10:04:38 +0800 Subject: [PATCH 2/2] spec file spec symbol issues --- mysql.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mysql.spec b/mysql.spec index f67634d..8eae925 100644 --- a/mysql.spec +++ b/mysql.spec @@ -7,7 +7,7 @@ %global boost_bundled_version 1.73.0 Name: mysql Version: 8.0.22 -Release: 2 +Release: 3 License: GPLv2 with exceptions and LGPLv2 and BSD Summary: The world's most popular open source database URL: http://www.mysql.com/ @@ -85,7 +85,7 @@ if [ -f %{_prefix}/local/%{name}/support-files/mysql.server > /dev/null 2>&1 ] chkconfig --level 2345 mysql on fi -if [ -f %{_prefix}/local/%{name}/lib/private];then +if [ -e %{_prefix}/local/%{name}/lib/private ];then echo "%{_prefix}/local/%{name}/lib/private" > %{_sysconfdir}/ld.so.conf.d/%{name}.conf ldconfig fi @@ -97,7 +97,7 @@ fi if [ -f %{_initddir}/mysql ];then mv %{_initddir}/mysql %{_initddir}/mysql.rpmold fi -if [ -f %{_sysconfdir}/ld.so.conf.d/%{name}.conf];then +if [ -f %{_sysconfdir}/ld.so.conf.d/%{name}.conf ];then rm -f %{_sysconfdir}/ld.so.conf.d/%{name}.conf ldconfig fi @@ -112,6 +112,9 @@ userdel -r %{name} &>/dev/null %exclude /usr/lib/debug %changelog +* Tue Dec 1 2020 weishengjing 8.0.22-3 +- modify symbol issues of spec + * Mon Nov 30 2020 weishengjing 8.0.22-2 - add libprotobuf-lite.so to /usr/lib64 -- Gitee