1 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
2 --- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/arc4random.c 2021-11-25 02:40:14.583485712 +0100
3 +++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/arc4random.c 2021-11-25 02:42:18.732780086 +0100
8 -#ifdef EVENT__HAVE_SYS_SYSCTL_H
9 -#include <sys/sysctl.h>
14 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
15 --- percona-server-5.7.35-38.orig/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt 2021-11-25 02:40:14.582485710 +0100
16 +++ percona-server-5.7.35-38/extra/libevent/libevent-2.1.11-stable/CMakeLists.txt 2021-11-25 02:43:37.682967284 +0100
18 CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H)
19 CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H)
20 CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H)
21 -CHECK_INCLUDE_FILE(sys/sysctl.h EVENT__HAVE_SYS_SYSCTL_H)
22 CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H)
23 CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H)
26 CHECK_SYMBOL_EXISTS("__FUNCTION__" "" EVENT__HAVE___FUNCTION__)
28 CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH)
29 -CHECK_CONST_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN)
30 -CHECK_CONST_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND)
31 -CHECK_CONST_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM)
32 -CHECK_CONST_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID)
33 CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD)
35 CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK)
36 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
37 --- 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
38 +++ 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
40 /* Define to 1 if you have the <sys/stat.h> header file. */
41 #cmakedefine EVENT__HAVE_SYS_STAT_H 1
43 -/* Define to 1 if you have the <sys/sysctl.h> header file. */
44 -#cmakedefine EVENT__HAVE_SYS_SYSCTL_H 1
46 /* Define to 1 if you have the <sys/timerfd.h> header file. */
47 #cmakedefine EVENT__HAVE_SYS_TIMERFD_H 1
49 diff -ur percona-server-5.7.35-38.orig/mysys/my_gethwaddr.c percona-server-5.7.35-38/mysys/my_gethwaddr.c
50 --- percona-server-5.7.35-38.orig/mysys/my_gethwaddr.c 2021-11-25 02:40:16.802490974 +0100
51 +++ percona-server-5.7.35-38/mysys/my_gethwaddr.c 2021-11-25 02:41:02.815600077 +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.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake
61 --- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2021-11-25 02:40:20.529499811 +0100
62 +++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2021-11-25 02:41:02.824600099 +0100
64 check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H)
65 check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H)
66 check_include_files(sys/syscall.h HAVE_SYS_SYSCALL_H)
67 -check_include_files(sys/sysctl.h HAVE_SYS_SYSCTL_H)
68 check_include_files(sys/syslimits.h HAVE_SYS_SYSLIMITS_H)
69 check_include_files(sys/time.h HAVE_SYS_TIME_H)
70 check_include_files(unistd.h HAVE_UNISTD_H)
71 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
72 --- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/portability/portability.cc 2021-11-25 02:40:20.665500134 +0100
73 +++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/portability/portability.cc 2021-11-25 02:46:09.913328241 +0100
75 #if defined(HAVE_SYS_SYSCALL_H)
76 # include <sys/syscall.h>
78 -#if defined(HAVE_SYS_SYSCTL_H) && !defined(_SC_PHYS_PAGES)
79 -# include <sys/sysctl.h>
81 #if defined(HAVE_PTHREAD_NP_H)
82 # include <pthread_np.h>
84 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
85 --- 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
86 +++ 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
88 /* Define to 1 if you have the <sys/stat.h> header file. */
89 #undef HAVE_SYS_STAT_H
91 -/* Define to 1 if you have the <sys/sysctl.h> header file. */
92 -#undef HAVE_SYS_SYSCTL_H
94 /* Define to 1 if you have the <sys/time.h> header file. */
95 #undef HAVE_SYS_TIME_H
97 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
98 --- 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
99 +++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2021-11-25 02:42:31.837811159 +0100
100 @@ -16181,7 +16181,7 @@
104 -for ac_header in sys/param.h sys/sysctl.h byteswap.h
105 +for ac_header in sys/param.h byteswap.h
107 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
108 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
109 @@ -19545,7 +19545,6 @@
110 #ifdef HAVE_SYS_PARAM_H
111 # include <sys/param.h>
113 -#include <sys/sysctl.h>
117 @@ -19723,7 +19722,6 @@
118 #ifdef HAVE_SYS_PARAM_H
119 # include <sys/param.h>
121 -#include <sys/sysctl.h>
125 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
126 --- 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
127 +++ 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
129 [AC_MSG_ERROR([Required header file(s) are missing.])])
131 # If any of these headers are missing, things should still work correctly:
132 -AC_CHECK_HEADERS([sys/param.h sys/sysctl.h byteswap.h],
133 +AC_CHECK_HEADERS([sys/param.h byteswap.h],
135 #ifdef HAVE_SYS_PARAM_H
136 # include <sys/param.h>
137 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
138 --- 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
139 +++ 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
141 #ifdef HAVE_SYS_PARAM_H
142 # include <sys/param.h>
144 -#include <sys/sysctl.h>
148 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
149 --- 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
150 +++ 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
152 #ifdef HAVE_SYS_PARAM_H
153 # include <sys/param.h>
155 -#include <sys/sysctl.h>
159 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
160 --- 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
161 +++ 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
163 # ifdef HAVE_SYS_PARAM_H
164 # include <sys/param.h>
166 -# ifdef HAVE_SYS_SYSCTL_H
167 -# include <sys/sysctl.h>
172 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
173 --- 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
174 +++ 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
176 # ifdef HAVE_SYS_PARAM_H
177 # include <sys/param.h>
179 -# ifdef HAVE_SYS_SYSCTL_H
180 -# include <sys/sysctl.h>
183 #elif defined(HAVE_PHYSMEM_SYSINFO)
184 # include <sys/sysinfo.h>