Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mariadb.git#7d46a8244f4691d51199a8530eb989e5cc0a9a5c
This commit is contained in:
DistroBaker
parent
19a7626c6a
commit
38d034d0f7
|
|
@ -26,9 +26,15 @@ Update 6/2018
|
|||
beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can.
|
||||
* Submited as PR: https://github.com/MariaDB/server/pull/807
|
||||
|
||||
--- mariadb-10.5.4/support-files/mysql-log-rotate.sh.old 2020-09-16 13:36:57.247955135 +0200
|
||||
+++ mariadb-10.5.4/support-files/mysql-log-rotate.sh 2020-09-16 13:40:59.744220908 +0200
|
||||
@@ -3,23 +3,10 @@
|
||||
Update 02/2021
|
||||
* Enhance the script as proposed in:
|
||||
https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/
|
||||
* Discussion continues in:
|
||||
https://jira.mariadb.org/browse/MDEV-16621
|
||||
|
||||
--- mariadb-10.5.8/support-files/mysql-log-rotate.sh 2021-02-12 08:37:47.857289694 +0100
|
||||
+++ mariadb-10.5.8/support-files/mysql-log-rotate.sh_pacthed 2021-02-12 08:40:26.420372325 +0100
|
||||
@@ -3,35 +3,22 @@
|
||||
# in the [mysqld] section as follows:
|
||||
#
|
||||
# [mysqld]
|
||||
|
|
@ -55,10 +61,12 @@ Update 6/2018
|
|||
notifempty
|
||||
daily
|
||||
rotate 3
|
||||
@@ -27,11 +14,9 @@
|
||||
missingok
|
||||
compress
|
||||
+ delaycompress
|
||||
+ sharedscripts
|
||||
postrotate
|
||||
# just if mariadbd is really running
|
||||
# just if mariadbd is really running
|
||||
- if test -x @bindir@/mysqladmin && \
|
||||
- @bindir@/mysqladmin ping &>/dev/null
|
||||
- then
|
||||
|
|
|
|||
62
mariadb.spec
62
mariadb.spec
|
|
@ -62,14 +62,18 @@
|
|||
%bcond_without oqgraph
|
||||
|
||||
# Other plugins
|
||||
# S3 storage engine
|
||||
# https://mariadb.com/kb/en/s3-storage-engine/
|
||||
%if 0%{?fedora}
|
||||
%bcond_without cracklib
|
||||
%bcond_without connect
|
||||
%bcond_without sphinx
|
||||
%bcond_without s3
|
||||
%else
|
||||
%bcond_with cracklib
|
||||
%bcond_with connect
|
||||
%bcond_with sphinx
|
||||
%bcond_with s3
|
||||
%endif
|
||||
|
||||
%bcond_without gssapi
|
||||
|
|
@ -154,7 +158,7 @@
|
|||
|
||||
Name: mariadb
|
||||
Version: 10.5.8
|
||||
Release: 4%{?with_debug:.debug}%{?dist}
|
||||
Release: 8%{?with_debug:.debug}%{?dist}
|
||||
Epoch: 3
|
||||
|
||||
Summary: A very fast and robust SQL database server
|
||||
|
|
@ -219,7 +223,7 @@ Patch15: %{pkgnamepatch}-groonga.patch
|
|||
# Patch16: Workaround for "chown 0" with priviledges dropped to "mysql" user
|
||||
Patch16: %{pkgnamepatch}-auth_pam_tool_dir.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: make
|
||||
BuildRequires: cmake gcc-c++
|
||||
BuildRequires: multilib-rpm-config
|
||||
BuildRequires: selinux-policy-devel
|
||||
|
|
@ -480,6 +484,10 @@ Conflicts: community-mysql-server
|
|||
# Bench subpackage has been deprecated in F32
|
||||
Obsoletes: %{name}-bench <= %{sameevr}
|
||||
|
||||
%if %{without tokudb}
|
||||
Obsoletes: %{name}-tokudb-engine <= %{sameevr}
|
||||
%endif
|
||||
|
||||
%description server
|
||||
MariaDB is a multi-user, multi-threaded SQL database server. It is a
|
||||
client/server implementation consisting of a server daemon (mysqld)
|
||||
|
|
@ -556,9 +564,6 @@ Requires: jemalloc
|
|||
The TokuDB storage engine from Percona.
|
||||
%endif
|
||||
|
||||
%if %{without tokudb}
|
||||
Obsoletes: %{name}-tokudb-engine <= %{sameevr}
|
||||
%endif
|
||||
|
||||
%if %{with cracklib}
|
||||
%package cracklib-password-check
|
||||
|
|
@ -600,6 +605,20 @@ The Sphinx storage engine for MariaDB.
|
|||
%endif
|
||||
|
||||
|
||||
%if %{with s3}
|
||||
%package s3-engine
|
||||
Summary: The S3 storage engine for MariaDB
|
||||
Requires: %{name}-server%{?_isa} = %{sameevr}
|
||||
|
||||
BuildRequires: curl-devel
|
||||
|
||||
%description s3-engine
|
||||
The S3 read only storage engine allows archiving MariaDB tables in Amazon S3,
|
||||
or any third-party public or private cloud that implements S3 API,
|
||||
but still have them accessible for reading in MariaDB.
|
||||
%endif
|
||||
|
||||
|
||||
%package server-utils
|
||||
Summary: Non-essential server utilities for MariaDB/MySQL applications
|
||||
Requires: %{name}-server%{?_isa} = %{sameevr}
|
||||
|
|
@ -608,7 +627,7 @@ Provides: mysql-perl = %{sameevr}
|
|||
%endif
|
||||
Conflicts: community-mysql-server
|
||||
# mysqlhotcopy needs DBI/DBD support
|
||||
Requires: perl(DBI) perl(DBD::mysql)
|
||||
Requires: perl(DBI) perl(DBD::MariaDB)
|
||||
|
||||
%description server-utils
|
||||
This package contains all non-essential server utilities and scripts for
|
||||
|
|
@ -687,6 +706,7 @@ Summary: The test suite distributed with MariaDB
|
|||
Requires: %{name}%{?_isa} = %{sameevr}
|
||||
Requires: %{name}-common%{?_isa} = %{sameevr}
|
||||
Requires: %{name}-server%{?_isa} = %{sameevr}
|
||||
Requires: patch
|
||||
Requires: perl(Env)
|
||||
Requires: perl(Exporter)
|
||||
Requires: perl(Fcntl)
|
||||
|
|
@ -854,6 +874,7 @@ fi
|
|||
-DPLUGIN_SPHINX=%{?with_sphinx:DYNAMIC}%{!?with_sphinx:NO} \
|
||||
-DPLUGIN_TOKUDB=%{?with_tokudb:DYNAMIC}%{!?with_tokudb:NO} \
|
||||
-DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
|
||||
-DPLUGIN_S3=%{?with_s3:DYNAMIC}%{!?with_s3:NO} \
|
||||
-DPLUGIN_CLIENT_ED25519=OFF \
|
||||
-DPYTHON_SHEBANG=%{python_path} \
|
||||
-DPLUGIN_CACHING_SHA2_PASSWORD=%{?with_clibrary:DYNAMIC}%{!?with_clibrary:OFF} \
|
||||
|
|
@ -1180,6 +1201,10 @@ rm %{buildroot}%{_mandir}/man1/maria{,db-}backup.1*
|
|||
rm %{buildroot}%{_mandir}/man1/mbstream.1*
|
||||
%endif
|
||||
|
||||
%if %{without s3}
|
||||
rm %{buildroot}%{_mandir}/man1/aria_s3_copy.1*
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if %{with test}
|
||||
%if %runselftest
|
||||
|
|
@ -1426,12 +1451,13 @@ fi
|
|||
%{?with_tokudb:%exclude %{_libdir}/%{pkg_name}/plugin/ha_tokudb.so}
|
||||
%{?with_gssapi:%exclude %{_libdir}/%{pkg_name}/plugin/auth_gssapi.so}
|
||||
%{?with_sphinx:%exclude %{_libdir}/%{pkg_name}/plugin/ha_sphinx.so}
|
||||
%{?with_s3:%exclude %{_libdir}/%{pkg_name}/plugin/ha_s3.so}
|
||||
%if %{with clibrary}
|
||||
%exclude %{_libdir}/%{pkg_name}/plugin/dialog.so
|
||||
%exclude %{_libdir}/%{pkg_name}/plugin/mysql_clear_password.so
|
||||
%endif
|
||||
|
||||
%{_mandir}/man1/aria_{chk,dump_log,ftdump,pack,read_log,s3_copy}.1*
|
||||
%{_mandir}/man1/aria_{chk,dump_log,ftdump,pack,read_log}.1*
|
||||
%{_mandir}/man1/galera_new_cluster.1*
|
||||
%{_mandir}/man1/galera_recovery.1*
|
||||
%{_mandir}/man1/mariadb-service-convert.1*
|
||||
|
|
@ -1569,6 +1595,14 @@ fi
|
|||
%{_libdir}/%{pkg_name}/plugin/ha_connect.so
|
||||
%endif
|
||||
|
||||
%if %{with s3}
|
||||
%files s3-engine
|
||||
%{_bindir}/aria_s3_copy
|
||||
%{_mandir}/man1/aria_s3_copy.1*
|
||||
%config(noreplace) %{_sysconfdir}/my.cnf.d/s3.cnf
|
||||
%{_libdir}/%{pkg_name}/plugin/ha_s3.so
|
||||
%endif
|
||||
|
||||
%files server-utils
|
||||
# Perl utilities
|
||||
%{_bindir}/mysql{_convert_table_format,dumpslow,_fix_extensions,hotcopy,_setpermission}
|
||||
|
|
@ -1629,6 +1663,20 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Feb 16 2021 Lukas Javorsky <ljavorsk@redhat.com> - 3:10.5.8-8
|
||||
- Replace the tokudb Obsoletes to the right place
|
||||
- Resolves: #1928757
|
||||
|
||||
* Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.8-7
|
||||
- Enhance the logrotate script
|
||||
- Resolves: #1683981
|
||||
|
||||
* Fri Feb 12 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.8-6
|
||||
- Fix Perl database driver dependency
|
||||
|
||||
* Wed Feb 10 2021 Michal Schorm <mschorm@redhat.com> - 3:10.5.8-5
|
||||
- Add support for S3 storage engine
|
||||
|
||||
* Thu Jan 28 2021 Honza Horak <hhorak@redhat.com> - 3:10.5.8-4
|
||||
- For compatibility with upstream RPMs, create mysqld symlink in sbin
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue