rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix OpenSSL 3 patch

Browse Source 
It has to be applied AFTER the mariadb-ssl-cipher-tests.patch
This commit is contained in:
Michal Schorm 2021-12-01 14:24:29 +01:00
parent cf60f44fa1
commit 9fa16bbecc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mariadb.spec
View File

@ -204,10 +204,6 @@ Source71: LICENSE.clustercheck
# https://jira.mariadb.org/browse/MDEV-12646 # https://jira.mariadb.org/browse/MDEV-12646
Source72: mariadb-server-galera.te Source72: mariadb-server-galera.te
# Patch1: OpenSSL 3 patch
# Picked from the upstream developement branch for MariaDB 10.8.
# https://jira.mariadb.org/browse/MDEV-25785
Patch1: %{pkgnamepatch}-openssl3.patch
# Patch4: Red Hat distributions specific logrotate fix # Patch4: Red Hat distributions specific logrotate fix
# it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2 # it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2
Patch4: %{pkgnamepatch}-logrotate.patch Patch4: %{pkgnamepatch}-logrotate.patch
@ -219,6 +215,10 @@ Patch9: %{pkgnamepatch}-ownsetup.patch
Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch
# Patch11: Use PCDIR CMake option, if configured # Patch11: Use PCDIR CMake option, if configured
Patch11: %{pkgnamepatch}-pcdir.patch Patch11: %{pkgnamepatch}-pcdir.patch
# Patch12: OpenSSL 3 patch
# Picked from the upstream developement branch for MariaDB 10.8.
# https://jira.mariadb.org/browse/MDEV-25785
Patch12: %{pkgnamepatch}-openssl3.patch
# Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path # Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path
Patch15: %{pkgnamepatch}-groonga.patch Patch15: %{pkgnamepatch}-groonga.patch
# Patch16: Fix port bug in mysql_setpermission perl script # Patch16: Fix port bug in mysql_setpermission perl script
@ -745,14 +745,14 @@ rm -r storage/rocksdb/
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
%patch1 -p1
%endif
%patch4 -p1 %patch4 -p1
%patch7 -p1 %patch7 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
%patch12 -p1
%endif
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1