1 diff -ur percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt percona-server-5.7.28-31/extra/libevent/CMakeLists.txt
2 --- percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt 2019-12-17 21:48:18.087000000 +0100
3 +++ percona-server-5.7.28-31/extra/libevent/CMakeLists.txt 2019-12-17 21:54:31.973000000 +0100
5 CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H)
6 CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H)
7 CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H)
8 -CHECK_INCLUDE_FILE(sys/sysctl.h EVENT__HAVE_SYS_SYSCTL_H)
9 CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H)
10 CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H)
15 CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH)
16 -CHECK_SYMBOL_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN)
17 -CHECK_SYMBOL_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND)
18 -CHECK_SYMBOL_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM)
19 -CHECK_SYMBOL_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID)
20 CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD)
22 CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK)
23 diff -ur percona-server-5.7.28-31.orig/extra/libevent/arc4random.c percona-server-5.7.28-31/extra/libevent/arc4random.c
24 --- percona-server-5.7.28-31.orig/extra/libevent/arc4random.c 2019-12-17 21:48:18.100000000 +0100
25 +++ percona-server-5.7.28-31/extra/libevent/arc4random.c 2019-12-17 21:52:02.967000000 +0100
28 #include <sys/param.h>
30 -#ifdef EVENT__HAVE_SYS_SYSCTL_H
31 -#include <sys/sysctl.h>
36 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
37 --- percona-server-5.7.28-31.orig/extra/libevent/event-config.h.cmake 2019-12-17 21:48:18.108000000 +0100
38 +++ percona-server-5.7.28-31/extra/libevent/event-config.h.cmake 2019-12-17 21:51:46.329000000 +0100
40 /* Define to 1 if you have the <sys/stat.h> header file. */
41 #cmakedefine EVENT__HAVE_SYS_STAT_H
43 -/* Define to 1 if you have the <sys/sysctl.h> header file. */
44 -#cmakedefine EVENT__HAVE_SYS_SYSCTL_H
46 /* Define to 1 if you have the <sys/timerfd.h> header file. */
47 #cmakedefine EVENT__HAVE_SYS_TIMERFD_H */
49 diff -ur percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c percona-server-5.7.28-31/mysys/my_gethwaddr.c
50 --- percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c 2019-12-17 21:48:35.390000000 +0100
51 +++ percona-server-5.7.28-31/mysys/my_gethwaddr.c 2019-12-17 21:52:16.332000000 +0100
55 #include <net/ethernet.h>
56 -#include <sys/sysctl.h>
57 #include <net/route.h>
59 #include <net/if_dl.h>
60 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
61 --- percona-server-5.7.28-31.orig/storage/rocksdb/third_party/zstd/programs/util.h 2019-12-17 21:48:46.381000000 +0100
62 +++ percona-server-5.7.28-31/storage/rocksdb/third_party/zstd/programs/util.h 2019-12-17 21:52:21.624000000 +0100
65 #elif defined(__APPLE__)
67 -#include <sys/sysctl.h>
69 /* Use apple-provided syscall
70 * see: man 3 sysctl */
71 UTIL_STATIC int UTIL_countPhysicalCores(void)
72 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
73 --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2019-12-17 21:48:46.448000000 +0100
74 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2019-12-17 21:52:26.013000000 +0100
76 check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H)
77 check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H)
78 check_include_files(sys/syscall.h HAVE_SYS_SYSCALL_H)
79 -check_include_files(sys/sysctl.h HAVE_SYS_SYSCTL_H)
80 check_include_files(sys/syslimits.h HAVE_SYS_SYSLIMITS_H)
81 check_include_files(sys/time.h HAVE_SYS_TIME_H)
82 check_include_files(unistd.h HAVE_UNISTD_H)
83 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
84 --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/portability/portability.cc 2019-12-17 21:48:46.875000000 +0100
85 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/portability/portability.cc 2019-12-17 21:52:31.280000000 +0100
87 #if defined(HAVE_SYS_SYSCALL_H)
88 # include <sys/syscall.h>
90 -#if defined(HAVE_SYS_SYSCTL_H)
91 -# include <sys/sysctl.h>
93 #if defined(HAVE_PTHREAD_NP_H)
94 # include <pthread_np.h>
96 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
97 --- 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
98 +++ 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
100 /* Define to 1 if you have the <sys/stat.h> header file. */
101 #undef HAVE_SYS_STAT_H
103 -/* Define to 1 if you have the <sys/sysctl.h> header file. */
104 -#undef HAVE_SYS_SYSCTL_H
106 /* Define to 1 if you have the <sys/time.h> header file. */
107 #undef HAVE_SYS_TIME_H
109 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
110 --- 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
111 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2019-12-17 21:53:41.227000000 +0100
112 @@ -16181,7 +16181,7 @@
116 -for ac_header in sys/param.h sys/sysctl.h byteswap.h
117 +for ac_header in sys/param.h byteswap.h
119 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
120 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
121 @@ -19545,7 +19545,6 @@
122 #ifdef HAVE_SYS_PARAM_H
123 # include <sys/param.h>
125 -#include <sys/sysctl.h>
129 @@ -19723,7 +19722,6 @@
130 #ifdef HAVE_SYS_PARAM_H
131 # include <sys/param.h>
133 -#include <sys/sysctl.h>
137 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
138 --- 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
139 +++ 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
141 [AC_MSG_ERROR([Required header file(s) are missing.])])
143 # If any of these headers are missing, things should still work correctly:
144 -AC_CHECK_HEADERS([sys/param.h sys/sysctl.h byteswap.h],
145 +AC_CHECK_HEADERS([sys/param.h byteswap.h],
147 #ifdef HAVE_SYS_PARAM_H
148 # include <sys/param.h>
149 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
150 --- 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
151 +++ 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
153 #ifdef HAVE_SYS_PARAM_H
154 # include <sys/param.h>
156 -#include <sys/sysctl.h>
160 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
161 --- 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
162 +++ 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
164 #ifdef HAVE_SYS_PARAM_H
165 # include <sys/param.h>
167 -#include <sys/sysctl.h>
171 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
172 --- 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
173 +++ 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
175 # ifdef HAVE_SYS_PARAM_H
176 # include <sys/param.h>
178 -# ifdef HAVE_SYS_SYSCTL_H
179 -# include <sys/sysctl.h>
184 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
185 --- 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
186 +++ 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
188 # ifdef HAVE_SYS_PARAM_H
189 # include <sys/param.h>
191 -# ifdef HAVE_SYS_SYSCTL_H
192 -# include <sys/sysctl.h>
195 #elif defined(HAVE_PHYSMEM_SYSINFO)
196 # include <sys/sysinfo.h>