X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysql.spec;h=f1b667e62fb8332d2598e79c6cd7b4dcb3aff1da;hb=da608bb7673207e574610ab4ceae97a34615966c;hp=a73f76b7e3105229b01d3e0be600ffc04af7b7ed;hpb=b067390d9f75187144b137e886029262cde5828e;p=packages%2Fmysql.git

diff --git a/mysql.spec b/mysql.spec
index a73f76b..f1b667e 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -31,7 +31,7 @@
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
 %bcond_with	sphinx		# Sphinx storage engine support
 %bcond_with	tokudb		# TokuDB
-%bcond_without	rocksdb		# RocksDB
+%bcond_with	rocksdb		# RocksDB
 # mysql needs boost 1.59.0 and doesn't support newer/older boost versions
 %bcond_with	system_boost	# Use system boost package
 %bcond_with	tests		# FIXME: don't run correctly
@@ -44,8 +44,8 @@
 %undefine	with_tokudb
 %endif
 
-%define		rel	2
-%define		percona_rel	40
+%define		rel	1
+%define		percona_rel	46
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
 Summary(fr.UTF-8):	MySQL: un serveur SQL rapide et fiable
@@ -55,12 +55,12 @@ Summary(ru.UTF-8):	MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
-Version:	5.7.37
+Version:	5.7.42
 Release:	%{percona_rel}.%{rel}
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 Source0:	https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5:	ab5a63fbe6872b719c49f1bbf091c09b
+# Source0-md5:	6f937a7fe774edad0213a75e34df19d5
 Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:	5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -89,7 +89,6 @@ Patch5:		mysql-5.7-sphinx.patch
 Patch6:		mysql-chain-certs.patch
 Patch7:		mysql-dubious-exports.patch
 Patch8:		mysql-cmake.patch
-Patch9:		openssl-3.patch
 URL:		https://www.percona.com/software/mysql-database/percona-server
 BuildRequires:	bison >= 1.875
 BuildRequires:	cmake >= 2.8.2
@@ -509,7 +508,6 @@ sed -i -e 's#perconaserverclient#mysqlclient#g' libmysql/libmysql.{ver.in,map} s
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
@@ -703,7 +701,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 89 mysql
-%useradd -u 89 -d %{_mysqlhome} -s /bin/sh -g mysql -c "MySQL Server" mysql
+%useradd -u 89 -d %{_mysqlhome} -s /bin/false -g mysql -c "MySQL Server" mysql
 
 %post
 /sbin/ldconfig