From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 18 Dec 2023 00:14:51 +0000 (+0100)
Subject: - reenabled system-xxhash, cleanup
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=659a5d4f7163ecf4245ca9dfa3643d803ad683e9;p=packages%2Fmysql.git

- reenabled system-xxhash, cleanup
---

diff --git a/mysql-opt.patch b/mysql-opt.patch
deleted file mode 100644
index b48ce5d..0000000
--- a/mysql-opt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- mysql-5.7.27/cmake/build_configurations/compiler_options.cmake.orig	2019-06-10 16:43:20.000000000 +0200
-+++ mysql-5.7.27/cmake/build_configurations/compiler_options.cmake	2019-07-29 05:55:55.892824445 +0200
-@@ -50,8 +50,8 @@
-     IF(C_NO_EXPENSIVE_OPTIMIZATIONS)
-       SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -fno-expensive-optimizations")
-     ENDIF()
--    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
--    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -59,7 +59,7 @@
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                     OUTPUT_VARIABLE GXX_VERSION)
-     IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
--      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -std=gnu++03")
-+      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -std=gnu++11")
-     ENDIF()
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-@@ -80,15 +80,15 @@
-     IF(CXX_NO_EXPENSIVE_OPTIMIZATIONS)
-       SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -fno-expensive-optimizations")
-     ENDIF()
--    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
--    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # Default Clang flags
-   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
--    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
--    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_DEBUG          "${CMAKE_C_FLAGS_DEBUG} ${COMMON_C_FLAGS}")
-+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-@@ -95,11 +95,11 @@
-     IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0 OR
-         CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
-       IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
--        SET(COMMON_CXX_FLAGS           "${COMMON_CXX_FLAGS} -std=gnu++03")
-+        SET(COMMON_CXX_FLAGS           "${COMMON_CXX_FLAGS} -std=gnu++11")
-       ENDIF()
-     ENDIF()
--    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
--    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_DEBUG          "${CMAKE_CXX_FLAGS_DEBUG} ${COMMON_CXX_FLAGS}")
-+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMMON_CXX_FLAGS}")
-   ENDIF()
- 
-   # Solaris flags
diff --git a/mysql.spec b/mysql.spec
index 3b57211..7d51c70 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -41,7 +41,6 @@ Version:	8.0.35
 Release:        1
 License:	GPL v2 + MySQL FOSS License Exception
 Group:		Applications/Databases
-#Source0Download: https://dev.mysql.com/downloads/mysql/8.2.html#downloads
 Source0:	http://cdn.mysql.com/Downloads/MySQL-%{majorver}/mysql-%{version}.tar.gz
 # Source0-md5:	825afed06344b52faa8d9dcd52d7e696
 Source100:	http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
@@ -63,7 +62,6 @@ Source11:	mysql-ndb-cpc.init
 Source12:	mysql-ndb-cpc.sysconfig
 Source13:	mysql-client.conf
 Source14:	my.cnf
-Patch0:		mysql-opt.patch
 Patch1:		mysql-system-xxhash.patch
 
 Patch17:	mysql-5.7-sphinx.patch
@@ -72,7 +70,6 @@ Patch18:	mysql-sphinx.patch
 Patch24:	mysql-cmake.patch
 Patch25:	mysql-readline.patch
 
-Patch26:	mysqldumpslow-clusters.patch
 URL:		http://www.mysql.com/products/community/
 BuildRequires:	bison >= 1.875
 %{?with_system_boost:BuildRequires:	boost-devel >= 1.77.0}
@@ -80,7 +77,6 @@ BuildRequires:	cmake >= 2.8.2
 %{?with_ldap:BuildRequires:	cyrus-sasl-devel}
 # for configure and tests
 %{?with_ldap:BuildRequires:	cyrus-sasl-scram}
-#%{?with_ldap:BuildRequires:	krb5-devel}
 BuildRequires:	libaio-devel
 BuildRequires:	libevent-devel
 BuildRequires:	libhsclient-devel
@@ -473,9 +469,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 %prep
 %setup -q %{?with_sphinx:-a100} %{!?with_system_boost:-a101} -n mysql-%{version}
 
-#%patch0 -p1
-# FIXME
-#%patch1 -p1
+%patch1 -p1
 
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
@@ -487,16 +481,13 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 %patch24 -p1
 %patch25 -p1
 
-#%patch26 -p1
-
 # to get these files rebuild
 [ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
 [ -f sql/sql_yacc.h ] && %{__rm} sql/sql_yacc.h
 
 # ensure sytstem lib
 # need to keep xxhash.[ch]
-# FIXME
-#%{__rm} -rv extra/lz4/lz4**
+%{__rm} -rv extra/lz4/lz4**
 
 %build
 install -d build
@@ -618,7 +609,6 @@ sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
 %{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamchk
 %{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamlog
 %{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisampack
-#%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_fix_privilege_tables
 %{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/my_print_defaults
 %{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
 
@@ -627,9 +617,6 @@ sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_safe
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_multi
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}*
-#%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate
-#%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server
-#%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server*
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/comp_err.1*
@@ -747,9 +734,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_socket.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_test_plugin.so
-#%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_fido_client.so
-#%{?with_ldap:%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_ldap_sasl_client.so}
-#%attr(755,root,root) %{_libdir}/%{name}/plugin/authentication_oci_client.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/component_audit_api_message_emit.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/component_keyring_file.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/component_log_filter_dragnet.so
@@ -990,17 +974,10 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/plugin/test_services_host_application_signal.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/test_services_plugin_registry.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/udf_example.so
-#%dir %{_datadir}/sql-bench
-#%{_datadir}/sql-bench/[CDRl]*
-#%attr(755,root,root) %{_datadir}/sql-bench/[bcgirst]*
 %{_mandir}/man1/lz4_decompress.1*
 %{_mandir}/man1/mysqlslap%{majorver}.1*
 %{_mandir}/man1/zlib_decompress%{majorver}.1*
 
-#%files doc
-#%defattr(644,root,root,755)
-#%doc Docs/manual.html Docs/manual_toc.html
-
 %if %{with ndb}
 %files ndb
 %defattr(644,root,root,755)
diff --git a/mysqldumpslow-clusters.patch b/mysqldumpslow-clusters.patch
deleted file mode 100644
index 415ab93..0000000
--- a/mysqldumpslow-clusters.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- percona-server-5.6.20-68.0/scripts/mysqldumpslow.sh~	2014-08-29 10:58:05.000000000 +0300
-+++ percona-server-5.6.20-68.0/scripts/mysqldumpslow.sh	2014-09-06 20:50:22.000000000 +0300
-@@ -51,8 +51,33 @@
- 
- $opt{'help'} and usage();
- 
-+# find config file for first defined cluster
-+sub get_defaults_file {
-+	my $clusters_file = '/etc/mysql/clusters.conf';
-+	return unless -f $clusters_file;
-+
-+	open(my $fh , "< $clusters_file") or return;
-+	while (<$fh>) {
-+		my ($config, $clusterdir) = m{^([^#]+)\s*=\s*(.+)$};
-+		next unless $config;
-+
-+		if ($config !~ m{/}) {
-+			my $f = "/etc/mysql/$config";
-+			return $f if -f $f;
-+
-+			my $f = "$clusterdir/$config";
-+			return $f if -f $f;
-+		}
-+		return $config;
-+	}
-+	close($fh) or die $!;
-+	return undef;
-+}
-+
- unless (@ARGV) {
--    my $defaults   = `my_print_defaults mysqld`;
-+	my $defaults_file = get_defaults_file;
-+	my $defaults_arg = "-c $defaults_file" if $defaults_file;
-+   my $defaults   = `my_print_defaults $defaults_arg mysqld`;
-     my $basedir = ($defaults =~ m/--basedir=(.*)/)[0]
- 	or die "Can't determine basedir from 'my_print_defaults mysqld' output: $defaults";
-     warn "basedir=$basedir\n" if $opt{v};
-@@ -61,7 +86,7 @@
-     my $slowlog = ($defaults =~ m/--slow-query-log-file=(.*)/)[0];
-     if (!$datadir or $opt{i}) {
- 	# determine the datadir from the instances section of /etc/my.cnf, if any
--	my $instances  = `my_print_defaults instances`;
-+	my $instances  = `my_print_defaults $defaults_arg instances`;
- 	die "Can't determine datadir from 'my_print_defaults mysqld' output: $defaults"
- 	    unless $instances;
- 	my @instances = ($instances =~ m/^--(\w+)-/mg);