1 |
commit: 4069266cb51fea8336ca7b6bdcc5247798f12571 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 30 04:24:32 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 30 04:24:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4069266c |
7 |
|
8 |
dev-db/mariadb: Version bump to 10.1.13 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 |
12 |
|
13 |
dev-db/mariadb/ChangeLog | 5 + |
14 |
dev-db/mariadb/Manifest | 25 ++-- |
15 |
dev-db/mariadb/mariadb-10.1.13.ebuild | 213 ++++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 234 insertions(+), 9 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
19 |
index 2d51626..483ef82 100644 |
20 |
--- a/dev-db/mariadb/ChangeLog |
21 |
+++ b/dev-db/mariadb/ChangeLog |
22 |
@@ -2,6 +2,11 @@ |
23 |
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Id$ |
25 |
|
26 |
+*mariadb-10.1.13 (30 Mar 2016) |
27 |
+ |
28 |
+ 30 Mar 2016; Brian Evans <grknight@g.o> +mariadb-10.1.13.ebuild: |
29 |
+ dev-db/mariadb: Version bump to 10.1.13 |
30 |
+ |
31 |
07 Mar 2016; Brian Evans <grknight@g.o> mariadb-10.1.12.ebuild: |
32 |
dev-db/mariadb: Copy multilib kerberos fixes from portage tree |
33 |
|
34 |
|
35 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
36 |
index a37c638..3109191 100644 |
37 |
--- a/dev-db/mariadb/Manifest |
38 |
+++ b/dev-db/mariadb/Manifest |
39 |
@@ -5,6 +5,7 @@ DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38f |
40 |
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 |
41 |
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 |
42 |
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d |
43 |
+DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d |
44 |
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff |
45 |
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607 |
46 |
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 |
47 |
@@ -16,13 +17,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d |
48 |
-----BEGIN PGP SIGNATURE----- |
49 |
Version: GnuPG v2.0 |
50 |
|
51 |
-iQF8BAEBCABmBQJW0RfUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
52 |
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0 |
53 |
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44d9/wH/1eKMOkl1uXzmxIM4cno3Dlk |
54 |
-jlBzF3Y5nTcEdGDNdJzqg9mxBo9nyKIk3u2MYSA15f3ZPUGRkZP9c1b46IQaKUWm |
55 |
-zwByawY1zbMFWJoPM0CWzvBu524EEhgIPm5qA3IApuN/wj+YkSd8A2Kh9BxM4boI |
56 |
-i3TbCogpxS6QHRIcaA9eyxyFYYm0g1ZG2gBSgT5qyOfTaADGlu6xG69yPswvXXPE |
57 |
-8zDlvCgf+8oiSIRQL32ppBg/ebFbcSfFU1wI5y65fK/TIKWsHG8zczRPIDjuQqFT |
58 |
-TVMYAENVjw1Z2ZXdxJUutg5O08xDsEAaV89GmdSzdcDudb0latHp+xWrnVq9bII= |
59 |
-=kz8S |
60 |
+iQJ8BAEBCABmBQJW+1UAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
61 |
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE |
62 |
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2+RYP/153AnR7BoN/WfvbShRwnP6B |
63 |
+WjUGVDpkzaVoAg2zczGTufc6y2bsnwS3bXLU3g+ag2QsOjh9Op+58wMo9x5J3rtj |
64 |
+1TncEAE0CFFGrZRNFmdrX80qsjl+9ujnU/7CeIWpdjnJx9ZNSyOf0isiLthZPYXD |
65 |
+ijC8hdxxQyhXPvmCwNGzdvxgmHMq95I50nxDvrb6ijaoNnJ58h9miay9Z9dTaug5 |
66 |
+dCpcMI2w/KjUh7HNBgXxAUpbBG54HEq5aILiKZfbDF5IUOnz6aOEPKBqsCxaF1l0 |
67 |
+5FYWpd9HaonkP54IE9SMbpJlbWGNzSnZMSZZfjtkLFgfvYk164j8IO8LseYq78zl |
68 |
+QGM2z/ZhmTEGjnGiJ85qLrEaAUZ7kWcJmFP0OU96GUFii3x0JMT1f3wXuAAZGqcV |
69 |
+JynXuuIKPKlGx/68CI/LVZrnefF53FQ+6A7d6GY84tOewhmRlaa/o0456hmt4X7N |
70 |
+E+sZSErHARolgdhzTmEaCfb7OzTZBBUcWfnf2gVvLZG3x65pcFs1Cn4NRoaTsm4A |
71 |
+airGS/e+1FArTRrUwA3jAOLNC5zPjgQV3knzDAfhtpndqi8X+1gsNEPrcstVT7q0 |
72 |
+wnnHHilF845GFmPlzLCU6yEBbW7SLYdGt1qCKOQP9AKafngkPFxxBSY0owkqqQBW |
73 |
+y3nUXykFmgfhKpqS2ihk |
74 |
+=LNym |
75 |
-----END PGP SIGNATURE----- |
76 |
|
77 |
diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild |
78 |
new file mode 100644 |
79 |
index 0000000..198a9b2 |
80 |
--- /dev/null |
81 |
+++ b/dev-db/mariadb/mariadb-10.1.13.ebuild |
82 |
@@ -0,0 +1,213 @@ |
83 |
+# Copyright 1999-2016 Gentoo Foundation |
84 |
+# Distributed under the terms of the GNU General Public License v2 |
85 |
+# $Id$ |
86 |
+ |
87 |
+EAPI="6" |
88 |
+MY_EXTRAS_VER="20160131-0252Z" |
89 |
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
90 |
+WSREP_REVISION="25" |
91 |
+SUBSLOT="18" |
92 |
+MYSQL_PV_MAJOR="5.6" |
93 |
+ |
94 |
+inherit toolchain-funcs mysql-multilib-r1 |
95 |
+ |
96 |
+HOMEPAGE="http://mariadb.org/" |
97 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
98 |
+ |
99 |
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
100 |
+RESTRICT="!bindist? ( bindist )" |
101 |
+ |
102 |
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
103 |
+ |
104 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
105 |
+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" |
106 |
+ |
107 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
108 |
+ |
109 |
+PATCHES=( |
110 |
+ "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch |
111 |
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch |
112 |
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
113 |
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
114 |
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch |
115 |
+) |
116 |
+ |
117 |
+COMMON_DEPEND=" |
118 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
119 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
120 |
+ systemd? ( sys-apps/systemd:= ) |
121 |
+ !bindist? ( >=sys-libs/readline-4.1:0= ) |
122 |
+ server? ( |
123 |
+ cracklib? ( sys-libs/cracklib:0= ) |
124 |
+ extraengine? ( |
125 |
+ odbc? ( dev-db/unixODBC:0= ) |
126 |
+ xml? ( dev-libs/libxml2:2= ) |
127 |
+ ) |
128 |
+ innodb-lz4? ( app-arch/lz4 ) |
129 |
+ innodb-lzo? ( dev-libs/lzo ) |
130 |
+ innodb-snappy? ( app-arch/snappy ) |
131 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
132 |
+ pam? ( virtual/pam:0= ) |
133 |
+ tokudb? ( app-arch/snappy ) |
134 |
+ ) |
135 |
+ >=dev-libs/libpcre-8.35:3= |
136 |
+" |
137 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
138 |
+ ${COMMON_DEPEND}" |
139 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
140 |
+ galera? ( |
141 |
+ sys-apps/iproute2 |
142 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
143 |
+ sst-rsync? ( sys-process/lsof ) |
144 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
145 |
+ ) |
146 |
+ perl? ( !dev-db/mytop |
147 |
+ virtual/perl-Getopt-Long |
148 |
+ dev-perl/TermReadKey |
149 |
+ virtual/perl-Term-ANSIColor |
150 |
+ virtual/perl-Time-HiRes ) |
151 |
+" |
152 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
153 |
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
154 |
+ |
155 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
156 |
+ |
157 |
+src_configure(){ |
158 |
+ # bug 508724 mariadb cannot use ld.gold |
159 |
+ tc-ld-disable-gold |
160 |
+ |
161 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
162 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
163 |
+ -DWITH_PCRE=system |
164 |
+ ) |
165 |
+ local MYSQL_CMAKE_EXTRA_DEFINES=( |
166 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
167 |
+ ) |
168 |
+ if use server ; then |
169 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
170 |
+ if ! use extraengine ; then |
171 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
172 |
+ -DPLUGIN_FEDERATED=NO |
173 |
+ -DPLUGIN_FEDERATEDX=NO ) |
174 |
+ fi |
175 |
+ |
176 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
177 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
178 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
179 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
180 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
181 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
182 |
+ -DPLUGIN_CASSANDRA=NO |
183 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
184 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
185 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
186 |
+ -DCONNECT_WITH_MYSQL=1 |
187 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
188 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
189 |
+ -DWITH_WSREP=$(usex galera) |
190 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
191 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo) |
192 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
193 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
194 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
195 |
+ ) |
196 |
+ fi |
197 |
+ mysql-multilib-r1_src_configure |
198 |
+} |
199 |
+ |
200 |
+# Official test instructions: |
201 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
202 |
+# FEATURES='test userpriv -usersandbox' \ |
203 |
+# ebuild mariadb-X.X.XX.ebuild \ |
204 |
+# digest clean package |
205 |
+multilib_src_test() { |
206 |
+ |
207 |
+ if ! multilib_is_native_abi ; then |
208 |
+ einfo "Server tests not available on non-native abi". |
209 |
+ return 0; |
210 |
+ fi |
211 |
+ |
212 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
213 |
+ local retstatus_unit |
214 |
+ local retstatus_tests |
215 |
+ |
216 |
+ if use server ; then |
217 |
+ |
218 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
219 |
+ # localhost. Also causes weird failures. |
220 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
221 |
+ |
222 |
+ if [[ $UID -eq 0 ]]; then |
223 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
224 |
+ fi |
225 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
226 |
+ |
227 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
228 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
229 |
+ |
230 |
+ # Run CTest (test-units) |
231 |
+ cmake-utils_src_test |
232 |
+ retstatus_unit=$? |
233 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
234 |
+ |
235 |
+ # Ensure that parallel runs don't die |
236 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
237 |
+ # Enable parallel testing, auto will try to detect number of cores |
238 |
+ # You may set this by hand. |
239 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
240 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
241 |
+ |
242 |
+ # create directories because mysqladmin might run out of order |
243 |
+ mkdir -p "${T}"/var-tests{,/log} |
244 |
+ |
245 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
246 |
+ # false positives: |
247 |
+ # |
248 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
249 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
250 |
+ # funcs_1.is_columns_mysql main.bootstrap |
251 |
+ # fails due to USE=-latin1 / utf8 default |
252 |
+ # |
253 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
254 |
+ # main.mysql_client_test_comp: |
255 |
+ # segfaults at random under Portage only, suspect resource limits. |
256 |
+ # |
257 |
+ # plugins.cracklib_password_check |
258 |
+ # Can randomly fail due to cracklib return message |
259 |
+ |
260 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
261 |
+ main.mysql_client_test_comp main.bootstrap \ |
262 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
263 |
+ main.mysqld--help plugins.cracklib_password_check \ |
264 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
265 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
266 |
+ done |
267 |
+ |
268 |
+ # Run mysql tests |
269 |
+ pushd "${TESTDIR}" || die |
270 |
+ |
271 |
+ # run mysql-test tests |
272 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
273 |
+ |
274 |
+ retstatus_tests=$? |
275 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
276 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
277 |
+ |
278 |
+ popd || die |
279 |
+ |
280 |
+ # Cleanup is important for these testcases. |
281 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
282 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
283 |
+ |
284 |
+ failures="" |
285 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
286 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
287 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
288 |
+ |
289 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
290 |
+ einfo "Tests successfully completed" |
291 |
+ |
292 |
+ else |
293 |
+ einfo "Skipping server tests due to minimal build." |
294 |
+ fi |
295 |
+} |