1 |
commit: 5e5e2c3a269eef67fab3574f3f14942f309124af |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 30 20:25:06 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 30 20:25:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e5e2c3a |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.1.13 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.1.13.ebuild | 213 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 214 insertions(+) |
15 |
|
16 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
17 |
index 0e4119a..5c27f5c 100644 |
18 |
--- a/dev-db/mariadb/Manifest |
19 |
+++ b/dev-db/mariadb/Manifest |
20 |
@@ -3,6 +3,7 @@ DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38f |
21 |
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 |
22 |
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 |
23 |
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d |
24 |
+DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d |
25 |
DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a |
26 |
DIST mariadb-5.5.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b |
27 |
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa |
28 |
|
29 |
diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild |
30 |
new file mode 100644 |
31 |
index 0000000..198a9b2 |
32 |
--- /dev/null |
33 |
+++ b/dev-db/mariadb/mariadb-10.1.13.ebuild |
34 |
@@ -0,0 +1,213 @@ |
35 |
+# Copyright 1999-2016 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+# $Id$ |
38 |
+ |
39 |
+EAPI="6" |
40 |
+MY_EXTRAS_VER="20160131-0252Z" |
41 |
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
42 |
+WSREP_REVISION="25" |
43 |
+SUBSLOT="18" |
44 |
+MYSQL_PV_MAJOR="5.6" |
45 |
+ |
46 |
+inherit toolchain-funcs mysql-multilib-r1 |
47 |
+ |
48 |
+HOMEPAGE="http://mariadb.org/" |
49 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
50 |
+ |
51 |
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
52 |
+RESTRICT="!bindist? ( bindist )" |
53 |
+ |
54 |
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
55 |
+ |
56 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
57 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
58 |
+ |
59 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
60 |
+ |
61 |
+PATCHES=( |
62 |
+ "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch |
63 |
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.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.7-without-clientlibs-tools.patch |
67 |
+) |
68 |
+ |
69 |
+COMMON_DEPEND=" |
70 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
71 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
72 |
+ systemd? ( sys-apps/systemd:= ) |
73 |
+ !bindist? ( >=sys-libs/readline-4.1:0= ) |
74 |
+ server? ( |
75 |
+ cracklib? ( sys-libs/cracklib:0= ) |
76 |
+ extraengine? ( |
77 |
+ odbc? ( dev-db/unixODBC:0= ) |
78 |
+ xml? ( dev-libs/libxml2:2= ) |
79 |
+ ) |
80 |
+ innodb-lz4? ( app-arch/lz4 ) |
81 |
+ innodb-lzo? ( dev-libs/lzo ) |
82 |
+ innodb-snappy? ( app-arch/snappy ) |
83 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
84 |
+ pam? ( virtual/pam:0= ) |
85 |
+ tokudb? ( app-arch/snappy ) |
86 |
+ ) |
87 |
+ >=dev-libs/libpcre-8.35:3= |
88 |
+" |
89 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
90 |
+ ${COMMON_DEPEND}" |
91 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
92 |
+ galera? ( |
93 |
+ sys-apps/iproute2 |
94 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
95 |
+ sst-rsync? ( sys-process/lsof ) |
96 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
97 |
+ ) |
98 |
+ perl? ( !dev-db/mytop |
99 |
+ virtual/perl-Getopt-Long |
100 |
+ dev-perl/TermReadKey |
101 |
+ virtual/perl-Term-ANSIColor |
102 |
+ virtual/perl-Time-HiRes ) |
103 |
+" |
104 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
105 |
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
106 |
+ |
107 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
108 |
+ |
109 |
+src_configure(){ |
110 |
+ # bug 508724 mariadb cannot use ld.gold |
111 |
+ tc-ld-disable-gold |
112 |
+ |
113 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
114 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
115 |
+ -DWITH_PCRE=system |
116 |
+ ) |
117 |
+ local MYSQL_CMAKE_EXTRA_DEFINES=( |
118 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
119 |
+ ) |
120 |
+ if use server ; then |
121 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
122 |
+ if ! use extraengine ; then |
123 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
124 |
+ -DPLUGIN_FEDERATED=NO |
125 |
+ -DPLUGIN_FEDERATEDX=NO ) |
126 |
+ fi |
127 |
+ |
128 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
129 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
130 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
131 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
132 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
133 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
134 |
+ -DPLUGIN_CASSANDRA=NO |
135 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
136 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
137 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
138 |
+ -DCONNECT_WITH_MYSQL=1 |
139 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
140 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
141 |
+ -DWITH_WSREP=$(usex galera) |
142 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
143 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo) |
144 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
145 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
146 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
147 |
+ ) |
148 |
+ fi |
149 |
+ mysql-multilib-r1_src_configure |
150 |
+} |
151 |
+ |
152 |
+# Official test instructions: |
153 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
154 |
+# FEATURES='test userpriv -usersandbox' \ |
155 |
+# ebuild mariadb-X.X.XX.ebuild \ |
156 |
+# digest clean package |
157 |
+multilib_src_test() { |
158 |
+ |
159 |
+ if ! multilib_is_native_abi ; then |
160 |
+ einfo "Server tests not available on non-native abi". |
161 |
+ return 0; |
162 |
+ fi |
163 |
+ |
164 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
165 |
+ local retstatus_unit |
166 |
+ local retstatus_tests |
167 |
+ |
168 |
+ if use server ; then |
169 |
+ |
170 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
171 |
+ # localhost. Also causes weird failures. |
172 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
173 |
+ |
174 |
+ if [[ $UID -eq 0 ]]; then |
175 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
176 |
+ fi |
177 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
178 |
+ |
179 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
180 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
181 |
+ |
182 |
+ # Run CTest (test-units) |
183 |
+ cmake-utils_src_test |
184 |
+ retstatus_unit=$? |
185 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
186 |
+ |
187 |
+ # Ensure that parallel runs don't die |
188 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
189 |
+ # Enable parallel testing, auto will try to detect number of cores |
190 |
+ # You may set this by hand. |
191 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
192 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
193 |
+ |
194 |
+ # create directories because mysqladmin might run out of order |
195 |
+ mkdir -p "${T}"/var-tests{,/log} |
196 |
+ |
197 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
198 |
+ # false positives: |
199 |
+ # |
200 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
201 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
202 |
+ # funcs_1.is_columns_mysql main.bootstrap |
203 |
+ # fails due to USE=-latin1 / utf8 default |
204 |
+ # |
205 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
206 |
+ # main.mysql_client_test_comp: |
207 |
+ # segfaults at random under Portage only, suspect resource limits. |
208 |
+ # |
209 |
+ # plugins.cracklib_password_check |
210 |
+ # Can randomly fail due to cracklib return message |
211 |
+ |
212 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
213 |
+ main.mysql_client_test_comp main.bootstrap \ |
214 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
215 |
+ main.mysqld--help plugins.cracklib_password_check \ |
216 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
217 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
218 |
+ done |
219 |
+ |
220 |
+ # Run mysql tests |
221 |
+ pushd "${TESTDIR}" || die |
222 |
+ |
223 |
+ # run mysql-test tests |
224 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
225 |
+ |
226 |
+ retstatus_tests=$? |
227 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
228 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
229 |
+ |
230 |
+ popd || die |
231 |
+ |
232 |
+ # Cleanup is important for these testcases. |
233 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
234 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
235 |
+ |
236 |
+ failures="" |
237 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
238 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
239 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
240 |
+ |
241 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
242 |
+ einfo "Tests successfully completed" |
243 |
+ |
244 |
+ else |
245 |
+ einfo "Skipping server tests due to minimal build." |
246 |
+ fi |
247 |
+} |