]> TLD Linux GIT Repositories - packages/mysql.git/blobdiff - drop-sysctl_h.patch
TLD / packages / mysql.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 5.7.35-38
[packages/mysql.git] / drop-sysctl_h.patch
diff --git a/drop-sysctl_h.patch b/drop-sysctl_h.patch
index 8921b7e491b5eb272f2d516abcde0a95b97b4f41..ea8d4136ab13d99d7bb424f023c342ddb4629a3a 100644 (file)
--- a/drop-sysctl_h.patch
+++ b/drop-sysctl_h.patch
@@ -1,7 +1,20 @@
-diff -ur percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt percona-server-5.7.28-31/extra/libevent/CMakeLists.txt
---- percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt        2019-12-17 21:48:18.087000000 +0100
-+++ percona-server-5.7.28-31/extra/libevent/CMakeLists.txt     2019-12-17 21:54:31.973000000 +0100
-@@ -301,7 +301,6 @@
+diff -ur percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/arc4random.c percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/arc4random.c
+--- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/arc4random.c   2021-11-25 02:40:14.583485712 +0100
++++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/arc4random.c        2021-11-25 02:42:18.732780086 +0100
+@@ -60,9 +60,6 @@
+ #include <unistd.h>
+ #include <sys/param.h>
+ #include <sys/time.h>
+-#ifdef EVENT__HAVE_SYS_SYSCTL_H
+-#include <sys/sysctl.h>
+-#endif
+ #endif
+ #include <limits.h>
+ #include <stdlib.h>
+diff -ur percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt
+--- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt 2021-11-25 02:40:14.582485710 +0100
++++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt      2021-11-25 02:43:37.682967284 +0100
+@@ -436,7 +436,6 @@
  CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H)
  CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H)
  CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H)
@@ -9,46 +22,33 @@ diff -ur percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt percona-ser
  CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H)
  CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H)
  
-@@ -421,10 +420,6 @@
- endif()
+@@ -580,10 +579,6 @@
+ CHECK_SYMBOL_EXISTS("__FUNCTION__" "" EVENT__HAVE___FUNCTION__)
  
  CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH)
--CHECK_SYMBOL_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN)
--CHECK_SYMBOL_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND)
--CHECK_SYMBOL_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM)
--CHECK_SYMBOL_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID)
+-CHECK_CONST_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN)
+-CHECK_CONST_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND)
+-CHECK_CONST_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM)
+-CHECK_CONST_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID)
  CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD)
  
  CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK)
-diff -ur percona-server-5.7.28-31.orig/extra/libevent/arc4random.c percona-server-5.7.28-31/extra/libevent/arc4random.c
---- percona-server-5.7.28-31.orig/extra/libevent/arc4random.c  2019-12-17 21:48:18.100000000 +0100
-+++ percona-server-5.7.28-31/extra/libevent/arc4random.c       2019-12-17 21:52:02.967000000 +0100
-@@ -59,9 +59,6 @@
- #include <unistd.h>
- #include <sys/param.h>
- #include <sys/time.h>
--#ifdef EVENT__HAVE_SYS_SYSCTL_H
--#include <sys/sysctl.h>
--#endif
- #endif
- #include <limits.h>
- #include <stdlib.h>
-diff -ur percona-server-5.7.28-31.orig/extra/libevent/event-config.h.cmake percona-server-5.7.28-31/extra/libevent/event-config.h.cmake
---- percona-server-5.7.28-31.orig/extra/libevent/event-config.h.cmake  2019-12-17 21:48:18.108000000 +0100
-+++ percona-server-5.7.28-31/extra/libevent/event-config.h.cmake       2019-12-17 21:51:46.329000000 +0100
-@@ -355,9 +355,6 @@
+diff -ur percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake
+--- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake   2021-11-25 02:40:14.584485715 +0100
++++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/event-config.h.cmake        2021-11-25 02:43:55.547009642 +0100
+@@ -367,9 +367,6 @@
  /* Define to 1 if you have the <sys/stat.h> header file. */
- #cmakedefine EVENT__HAVE_SYS_STAT_H
+ #cmakedefine EVENT__HAVE_SYS_STAT_H 1
  
 -/* Define to 1 if you have the <sys/sysctl.h> header file. */
--#cmakedefine EVENT__HAVE_SYS_SYSCTL_H
+-#cmakedefine EVENT__HAVE_SYS_SYSCTL_H 1
 -
  /* Define to 1 if you have the <sys/timerfd.h> header file. */
- #cmakedefine EVENT__HAVE_SYS_TIMERFD_H */
+ #cmakedefine EVENT__HAVE_SYS_TIMERFD_H 1
  
-diff -ur percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c percona-server-5.7.28-31/mysys/my_gethwaddr.c
---- percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c 2019-12-17 21:48:35.390000000 +0100
-+++ percona-server-5.7.28-31/mysys/my_gethwaddr.c      2019-12-17 21:52:16.332000000 +0100
+diff -ur percona-server-5.7.35-38.orig/mysys/my_gethwaddr.c percona-server-5.7.35-38/mysys/my_gethwaddr.c
+--- percona-server-5.7.35-38.orig/mysys/my_gethwaddr.c 2021-11-25 02:40:16.802490974 +0100
++++ percona-server-5.7.35-38/mysys/my_gethwaddr.c      2021-11-25 02:41:02.815600077 +0100
 @@ -37,7 +37,6 @@
  #ifdef __FreeBSD__
  
@@ -57,21 +57,9 @@ diff -ur percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c percona-server-5.7.2
  #include <net/route.h>
  #include <net/if.h>
  #include <net/if_dl.h>
-diff -ur percona-server-5.7.28-31.orig/storage/rocksdb/third_party/zstd/programs/util.h percona-server-5.7.28-31/storage/rocksdb/third_party/zstd/programs/util.h
---- percona-server-5.7.28-31.orig/storage/rocksdb/third_party/zstd/programs/util.h     2019-12-17 21:48:46.381000000 +0100
-+++ percona-server-5.7.28-31/storage/rocksdb/third_party/zstd/programs/util.h  2019-12-17 21:52:21.624000000 +0100
-@@ -565,8 +565,6 @@
- 
- #elif defined(__APPLE__)
- 
--#include <sys/sysctl.h>
--
- /* Use apple-provided syscall
-  * see: man 3 sysctl */
- UTIL_STATIC int UTIL_countPhysicalCores(void)
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake percona-server-5.7.28-31/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake    2019-12-17 21:48:46.448000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2019-12-17 21:52:26.013000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake    2021-11-25 02:40:20.529499811 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2021-11-25 02:41:02.824600099 +0100
 @@ -39,7 +39,6 @@
  check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H)
  check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H)
@@ -80,22 +68,22 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/To
  check_include_files(sys/syslimits.h HAVE_SYS_SYSLIMITS_H)
  check_include_files(sys/time.h HAVE_SYS_TIME_H)
  check_include_files(unistd.h HAVE_UNISTD_H)
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/portability/portability.cc percona-server-5.7.28-31/storage/tokudb/PerconaFT/portability/portability.cc
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/portability/portability.cc  2019-12-17 21:48:46.875000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/portability/portability.cc       2019-12-17 21:52:31.280000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/portability/portability.cc percona-server-5.7.35-38/storage/tokudb/PerconaFT/portability/portability.cc
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/portability/portability.cc  2021-11-25 02:40:20.665500134 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/portability/portability.cc       2021-11-25 02:46:09.913328241 +0100
 @@ -60,9 +60,6 @@
  #if defined(HAVE_SYS_SYSCALL_H)
  # include <sys/syscall.h>
  #endif
--#if defined(HAVE_SYS_SYSCTL_H)
+-#if defined(HAVE_SYS_SYSCTL_H) && !defined(_SC_PHYS_PAGES)
 -# include <sys/sysctl.h>
 -#endif
  #if defined(HAVE_PTHREAD_NP_H)
  # include <pthread_np.h>
  #endif
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in      2019-12-17 21:48:47.681000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in   2019-12-17 21:52:35.576000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in      2021-11-25 02:40:21.001500930 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in   2021-11-25 02:42:31.834811153 +0100
 @@ -231,9 +231,6 @@
  /* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H
@@ -106,9 +94,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4
  /* Define to 1 if you have the <sys/time.h> header file. */
  #undef HAVE_SYS_TIME_H
  
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure        2019-12-17 21:48:47.683000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure     2019-12-17 21:53:41.227000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure        2021-11-25 02:40:21.017500968 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure     2021-11-25 02:42:31.837811159 +0100
 @@ -16181,7 +16181,7 @@
  
  
@@ -134,9 +122,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4
  int
  main(void)
  {
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac     2019-12-17 21:48:47.684000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac  2019-12-17 21:52:47.585000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac     2021-11-25 02:40:21.017500968 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac  2021-11-25 02:42:31.837811159 +0100
 @@ -476,7 +476,7 @@
        [AC_MSG_ERROR([Required header file(s) are missing.])])
  
@@ -146,9 +134,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4
        [], [], [
  #ifdef HAVE_SYS_PARAM_H
  #     include <sys/param.h>
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4        2019-12-17 21:48:47.579000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4     2019-12-17 21:53:59.770000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4        2021-11-25 02:40:20.936500776 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4     2021-11-25 02:42:31.838811162 +0100
 @@ -36,7 +36,6 @@
  #ifdef HAVE_SYS_PARAM_H
  #     include <sys/param.h>
@@ -157,9 +145,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4
  int
  main(void)
  {
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2019-12-17 21:48:47.579000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4      2019-12-17 21:54:05.009000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2021-11-25 02:40:20.936500776 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4      2021-11-25 02:42:31.838811162 +0100
 @@ -38,7 +38,6 @@
  #ifdef HAVE_SYS_PARAM_H
  #     include <sys/param.h>
@@ -168,9 +156,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4
  int
  main(void)
  {
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h    2019-12-17 21:48:47.584000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2019-12-17 21:53:53.793000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h    2021-11-25 02:40:20.948500805 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2021-11-25 02:42:31.838811162 +0100
 @@ -22,9 +22,6 @@
  #     ifdef HAVE_SYS_PARAM_H
  #             include <sys/param.h>
@@ -181,9 +169,9 @@ diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4
  #endif
  
  
-diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h
---- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h     2019-12-17 21:48:47.584000000 +0100
-+++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h  2019-12-17 21:53:47.514000000 +0100
+diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h
+--- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h     2021-11-25 02:40:20.948500805 +0100
++++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h  2021-11-25 02:42:31.838811162 +0100
 @@ -31,9 +31,6 @@
  #     ifdef HAVE_SYS_PARAM_H
  #             include <sys/param.h>
MySQL: a very fast and reliable SQL database engine