From 36338610f7bf2b846ddd01ca930dc576af90a8ce Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 01 2022 14:07:33 +0000
Subject: import rh-mariadb103-mariadb-10.3.35-1.el7


---

diff --git a/.gitignore b/.gitignore
index 47349ad..d8d0bcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mariadb-10.3.32.tar.gz
+SOURCES/mariadb-10.3.35.tar.gz
diff --git a/.rh-mariadb103-mariadb.metadata b/.rh-mariadb103-mariadb.metadata
index 0a968da..4d3a05a 100644
--- a/.rh-mariadb103-mariadb.metadata
+++ b/.rh-mariadb103-mariadb.metadata
@@ -1 +1 @@
-ad2b6d16fcbcdc3e0a131e75efe72ec695054be3 SOURCES/mariadb-10.3.32.tar.gz
+ea904f8e036c72f0b1db78cf2d350c1dd8250375 SOURCES/mariadb-10.3.35.tar.gz
diff --git a/SOURCES/mariadb-groonga.patch b/SOURCES/mariadb-groonga.patch
deleted file mode 100644
index 3a0e74c..0000000
--- a/SOURCES/mariadb-groonga.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Fixing conflict with groonga package
-# https://bugzilla.redhat.com/show_bug.cgi?id=1763287
-
---- mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt.withoutoption	2019-11-11 14:01:07.762595716 +0100
-+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt	2019-11-11 14:33:05.224012458 +0100
-@@ -86,7 +86,9 @@
- set(INCLUDE_DIR "include")
- set(GRN_INCLUDE_DIR "include/groonga")
- set(DATA_DIR "share")
--set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
-+if(NOT DEFINED GRN_DATA_DIR)
-+    set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
-+endif()
- set(CONFIG_DIR "etc")
- set(GRN_CONFIG_DIR "${CONFIG_DIR}/${GRN_PROJECT_NAME}")
- set(GRN_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${GRN_CONFIG_DIR}/groonga.conf")
-
---- mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt.withoutoption	2019-11-11 14:34:22.661005715 +0100
-+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt	2019-11-11 14:35:59.962244120 +0100
-@@ -16,7 +16,9 @@
- # MA 02110-1335  USA
- 
- cmake_minimum_required(VERSION 2.6)
--set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
-+if (NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
-+    set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
-+endif()
- project("${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
- 
- if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED)
diff --git a/SOURCES/mariadb-logrotate.patch b/SOURCES/mariadb-logrotate.patch
index 14ef932..e3b7e7c 100644
--- a/SOURCES/mariadb-logrotate.patch
+++ b/SOURCES/mariadb-logrotate.patch
@@ -32,7 +32,7 @@ Update 01/2022
 
 --- mariadb-10.3.32/support-files/mysql-log-rotate.sh	2022-01-14 17:03:27.000000000 +0100
 +++ mariadb-10.3.32/support-files/mysql-log-rotate.sh_patched	2022-01-17 15:07:54.205379672 +0100
-@@ -3,35 +3,21 @@
+@@ -3,36 +3,22 @@
  # in the [mysqld] section as follows:
  #
  # [mysqld]
@@ -56,6 +56,7 @@ Update 01/2022
 -        # create 600 mysql mysql
 +@LOG_LOCATION@ {
 +        create 600 mysql mysql
+         su mysql mysql
          notifempty
          daily
          rotate 3
diff --git a/SOURCES/mariadb-scl-env-check.patch b/SOURCES/mariadb-scl-env-check.patch
index a767635..52ab473 100644
--- a/SOURCES/mariadb-scl-env-check.patch
+++ b/SOURCES/mariadb-scl-env-check.patch
@@ -5,8 +5,8 @@ diff -up mariadb-10.3.11/scripts/galera_new_cluster.sh.p90 mariadb-10.3.11/scrip
  fi
  
  systemctl set-environment _WSREP_NEW_CLUSTER='--wsrep-new-cluster' && \
--    systemctl start ${1:-mariadb}
-+    systemctl start ${1:-@DAEMON_NAME@}
+-    systemctl restart ${1:-mariadb}
++    systemctl restart ${1:-@DAEMON_NAME@}
  
  extcode=$?
  
diff --git a/SPECS/mariadb.spec b/SPECS/mariadb.spec
index 4d38ed8..0ebc5b2 100644
--- a/SPECS/mariadb.spec
+++ b/SPECS/mariadb.spec
@@ -169,8 +169,8 @@
 %endif
 
 Name:             %{?scl_prefix}mariadb
-Version:          10.3.32
-Release:          2%{?with_debug:.debug}%{?dist}
+Version:          10.3.35
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -224,8 +224,6 @@ Patch13:          %{pkgnamepatch}-ssl-cipher-tests.patch
 Patch14:          %{pkgnamepatch}-spider_on_armv7hl.patch
 #   Patch15: Remove the '-Werror' flag so the debug build won't crash on random warnings
 Patch15:          %{pkgnamepatch}-debug_build.patch
-# Patch16:  Add option to edit groonga's and groonga-normalizer-mysql install path
-Patch16:          %{pkgnamepatch}-groonga.patch
 
 
 # Patches specific for scl
@@ -790,7 +788,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch13 -p1
 %patch14 -p1
 #%patch15 -p1
-%patch16 -p1
 
 # workaround for upstream bug #56342
 #rm mysql-test/t/ssl_8k_key-master.opt
@@ -1847,6 +1844,13 @@ fi
 %endif
 
 %changelog
+* Thu Jun 30 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3:10.3.35-1
+- Rebase to 10.3.35
+
+* Thu Jun 30 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3:10.3.34-1
+- Rebase to 10.3.34
+- Patch 16 upstreamed
+
 * Mon Jan 17 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3:10.3.32-2
 - Add delaycompress option to the logrotate script
 - Resolves: rhbz:#2050538