1 |
commit: 35ace67367d63a9eeb6116546192847b0e5ed909 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 10 04:22:15 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 10 04:22:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ace673 |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.1.33 |
9 |
|
10 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.1.33.ebuild | 243 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 244 insertions(+) |
15 |
|
16 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
17 |
index f37901a40be..76a22dea016 100644 |
18 |
--- a/dev-db/mariadb/Manifest |
19 |
+++ b/dev-db/mariadb/Manifest |
20 |
@@ -6,6 +6,7 @@ DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 38df67a1b26aab559e41f44b129f2e57388 |
21 |
DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd |
22 |
DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f SHA512 db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89 |
23 |
DIST mariadb-10.1.32.tar.gz 68001321 BLAKE2B 8ecdf12b10697576b3550d962c6090726f515e0f1f99f786e2b8882e1b81c053e9e43e423f83afd6955357ef85cd539db6fb1ff613d3c553f2f3801293c7ee07 SHA512 fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a |
24 |
+DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76 SHA512 1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e |
25 |
DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c SHA512 12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026 |
26 |
DIST mariadb-10.3.6.tar.gz 71064269 BLAKE2B 681150a26de95cc276276a9b8d0b2c6e4a842dac80f20c2e8b0caeec5823cb956feffb494d18b1f2832e220c392c437424813de7720fb83a5d5c1fca71a4aef9 SHA512 cf146752be5857e702a3c88f42c7b6be3117bd92ac304eb217f902c1ffe478dc3043d3cf6a9a9305b51babb3bafc2612a8e4f5dfa7731cfa53634014d86438d1 |
27 |
DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807 SHA512 eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c |
28 |
|
29 |
diff --git a/dev-db/mariadb/mariadb-10.1.33.ebuild b/dev-db/mariadb/mariadb-10.1.33.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..ce4d15d2d12 |
32 |
--- /dev/null |
33 |
+++ b/dev-db/mariadb/mariadb-10.1.33.ebuild |
34 |
@@ -0,0 +1,243 @@ |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI="6" |
39 |
+MY_EXTRAS_VER="20180308-1938Z" |
40 |
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
41 |
+WSREP_REVISION="25" |
42 |
+SUBSLOT="18" |
43 |
+MYSQL_PV_MAJOR="5.6" |
44 |
+ |
45 |
+JAVA_PKG_OPT_USE="jdbc" |
46 |
+ |
47 |
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
48 |
+ |
49 |
+HOMEPAGE="http://mariadb.org/" |
50 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
51 |
+ |
52 |
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml" |
53 |
+RESTRICT="!bindist? ( bindist )" |
54 |
+ |
55 |
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" |
56 |
+ |
57 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
58 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
59 |
+ |
60 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
61 |
+ |
62 |
+PATCHES=( |
63 |
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch |
64 |
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
65 |
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
66 |
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
67 |
+ "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch |
68 |
+ "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch |
69 |
+) |
70 |
+ |
71 |
+COMMON_DEPEND=" |
72 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
73 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
74 |
+ !bindist? ( |
75 |
+ sys-libs/binutils-libs:0= |
76 |
+ >=sys-libs/readline-4.1:0= |
77 |
+ ) |
78 |
+ server? ( |
79 |
+ backup? ( app-arch/libarchive:0= ) |
80 |
+ cracklib? ( sys-libs/cracklib:0= ) |
81 |
+ extraengine? ( |
82 |
+ odbc? ( dev-db/unixODBC:0= ) |
83 |
+ xml? ( dev-libs/libxml2:2= ) |
84 |
+ sys-libs/zlib[minizip] |
85 |
+ ) |
86 |
+ innodb-lz4? ( app-arch/lz4 ) |
87 |
+ innodb-lzo? ( dev-libs/lzo ) |
88 |
+ innodb-snappy? ( app-arch/snappy ) |
89 |
+ numa? ( sys-process/numactl ) |
90 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
91 |
+ pam? ( virtual/pam:0= ) |
92 |
+ systemd? ( sys-apps/systemd:= ) |
93 |
+ tokudb? ( app-arch/snappy ) |
94 |
+ ) |
95 |
+ >=dev-libs/libpcre-8.41-r1:3= |
96 |
+ openssl? ( !>=dev-libs/openssl-1.1.0 ) |
97 |
+" |
98 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
99 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
100 |
+ ${COMMON_DEPEND}" |
101 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
102 |
+ galera? ( |
103 |
+ sys-apps/iproute2 |
104 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
105 |
+ sst-rsync? ( sys-process/lsof ) |
106 |
+ sst-mariabackup? ( net-misc/socat[ssl] ) |
107 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
108 |
+ ) |
109 |
+ perl? ( !dev-db/mytop |
110 |
+ virtual/perl-Getopt-Long |
111 |
+ dev-perl/TermReadKey |
112 |
+ virtual/perl-Term-ANSIColor |
113 |
+ virtual/perl-Time-HiRes ) |
114 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
115 |
+" |
116 |
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
117 |
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
118 |
+ |
119 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
120 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
121 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
122 |
+ |
123 |
+pkg_setup() { |
124 |
+ java-pkg-opt-2_pkg_setup |
125 |
+ mysql-multilib-r1_pkg_setup |
126 |
+} |
127 |
+ |
128 |
+pkg_preinst() { |
129 |
+ java-pkg-opt-2_pkg_preinst |
130 |
+ mysql-multilib-r1_pkg_preinst |
131 |
+} |
132 |
+ |
133 |
+src_prepare() { |
134 |
+ java-pkg-opt-2_src_prepare |
135 |
+ mysql-multilib-r1_src_prepare |
136 |
+} |
137 |
+ |
138 |
+src_configure(){ |
139 |
+ # bug 508724 mariadb cannot use ld.gold |
140 |
+ tc-ld-disable-gold |
141 |
+ |
142 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
143 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
144 |
+ -DWITH_PCRE=system |
145 |
+ ) |
146 |
+ local MYSQL_CMAKE_EXTRA_DEFINES=( |
147 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
148 |
+ ) |
149 |
+ if use server ; then |
150 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
151 |
+ if ! use extraengine ; then |
152 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
153 |
+ -DPLUGIN_FEDERATED=NO |
154 |
+ -DPLUGIN_FEDERATEDX=NO ) |
155 |
+ fi |
156 |
+ |
157 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
158 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
159 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
160 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
161 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
162 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
163 |
+ -DPLUGIN_CASSANDRA=NO |
164 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
165 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
166 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
167 |
+ -DCONNECT_WITH_MYSQL=1 |
168 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
169 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
170 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
171 |
+ # Build failure and autodep wrt bug 639144 |
172 |
+ -DCONNECT_WITH_MONGO=OFF |
173 |
+ -DWITH_WSREP=$(usex galera) |
174 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
175 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
176 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
177 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
178 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
179 |
+ -DWITH_MARIABACKUP=$(usex backup ON OFF) |
180 |
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
181 |
+ -DWITH_NUMA=$(usex numa ON OFF) |
182 |
+ ) |
183 |
+ fi |
184 |
+ mysql-multilib-r1_src_configure |
185 |
+} |
186 |
+ |
187 |
+# Official test instructions: |
188 |
+# USE='extraengine perl server openssl static-libs' \ |
189 |
+# FEATURES='test userpriv -usersandbox' \ |
190 |
+# ebuild mariadb-X.X.XX.ebuild \ |
191 |
+# digest clean package |
192 |
+multilib_src_test() { |
193 |
+ |
194 |
+ if ! multilib_is_native_abi ; then |
195 |
+ einfo "Server tests not available on non-native abi". |
196 |
+ return 0; |
197 |
+ fi |
198 |
+ |
199 |
+ _disable_test() { |
200 |
+ local rawtestname reason |
201 |
+ rawtestname="${1}" ; shift |
202 |
+ reason="${@}" |
203 |
+ ewarn "test '${rawtestname}' disabled: '${reason}'" |
204 |
+ echo ${rawtestname} : ${reason} >> "${T}/disabled.def" |
205 |
+ } |
206 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
207 |
+ local retstatus_unit |
208 |
+ local retstatus_tests |
209 |
+ |
210 |
+ if ! use server ; then |
211 |
+ einfo "Skipping server tests due to minimal build." |
212 |
+ return 0 |
213 |
+ fi |
214 |
+ |
215 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
216 |
+ # localhost. Also causes weird failures. |
217 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
218 |
+ |
219 |
+ if [[ $UID -eq 0 ]]; then |
220 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
221 |
+ fi |
222 |
+ has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
223 |
+ |
224 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
225 |
+ |
226 |
+ # Run CTest (test-units) |
227 |
+ cmake-utils_src_test |
228 |
+ retstatus_unit=$? |
229 |
+ |
230 |
+ # Ensure that parallel runs don't die |
231 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
232 |
+ # Enable parallel testing, auto will try to detect number of cores |
233 |
+ # You may set this by hand. |
234 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
235 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
236 |
+ |
237 |
+ # create directories because mysqladmin might run out of order |
238 |
+ mkdir -p "${T}"/var-tests{,/log} |
239 |
+ |
240 |
+ # Run mysql tests |
241 |
+ pushd "${TESTDIR}" || die |
242 |
+ |
243 |
+ touch "${T}/disabled.def" |
244 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
245 |
+ # false positives: |
246 |
+ # |
247 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
248 |
+ # main.mysql_client_test_comp: |
249 |
+ # segfaults at random under Portage only, suspect resource limits. |
250 |
+ |
251 |
+ local t |
252 |
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
253 |
+ _disable_test "$t" "False positive due to varying policies" |
254 |
+ done |
255 |
+ |
256 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
257 |
+ main.mysql_client_test_comp ; do |
258 |
+ _disable_test "$t" "False positives in Gentoo" |
259 |
+ done |
260 |
+ |
261 |
+ # run mysql-test tests |
262 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def" |
263 |
+ retstatus_tests=$? |
264 |
+ |
265 |
+ popd || die |
266 |
+ |
267 |
+ # Cleanup is important for these testcases. |
268 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
269 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
270 |
+ |
271 |
+ local failures="" |
272 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
273 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
274 |
+ |
275 |
+ [[ -z "$failures" ]] || eerror "Test failures: $failures" |
276 |
+ einfo "Tests successfully completed" |
277 |
+} |