1 |
commit: cf7af8df9924b43d65365c19625e7dfdf57d8a80 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 29 22:00:56 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 29 22:00:56 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cf7af8df |
7 |
|
8 |
dev-db/mariadb: Version bump; needs testing before moving to main tree |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
12 |
|
13 |
dev-db/mariadb/ChangeLog | 7 +- |
14 |
dev-db/mariadb/Manifest | 23 +--- |
15 |
dev-db/mariadb/mariadb-10.1.11.ebuild | 207 ++++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 214 insertions(+), 23 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
19 |
index 3e2a423..8bd89d6 100644 |
20 |
--- a/dev-db/mariadb/ChangeLog |
21 |
+++ b/dev-db/mariadb/ChangeLog |
22 |
@@ -1,7 +1,12 @@ |
23 |
# ChangeLog for dev-db/mariadb |
24 |
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
25 |
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 |
26 |
# $Id$ |
27 |
|
28 |
+*mariadb-10.1.11 (29 Jan 2016) |
29 |
+ |
30 |
+ 29 Jan 2016; Brian Evans <grknight@g.o> +mariadb-10.1.11.ebuild: |
31 |
+ dev-db/mariadb: Version bump; needs testing before moving to main tree |
32 |
+ |
33 |
29 Dec 2015; Brian Evans <grknight@g.o> mariadb-10.0.23.ebuild, |
34 |
mariadb-10.1.10.ebuild: |
35 |
dev-db/mariadb: Add missing build dependency wrt bug 570114 app-arch/snappy |
36 |
|
37 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
38 |
index 5a25000..1986fc8 100644 |
39 |
--- a/dev-db/mariadb/Manifest |
40 |
+++ b/dev-db/mariadb/Manifest |
41 |
@@ -1,8 +1,6 @@ |
42 |
------BEGIN PGP SIGNED MESSAGE----- |
43 |
-Hash: SHA256 |
44 |
- |
45 |
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e |
46 |
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 |
47 |
+DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 |
48 |
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff |
49 |
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607 |
50 |
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 |
51 |
@@ -10,22 +8,3 @@ DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba24999 |
52 |
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc |
53 |
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa |
54 |
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb |
55 |
------BEGIN PGP SIGNATURE----- |
56 |
-Version: GnuPG v2.1 |
57 |
- |
58 |
-iQJ8BAEBCABmBQJWgcrqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
59 |
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE |
60 |
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2/toP/3Mf3xrpYsehjI+TrunfEDZ4 |
61 |
-WxnIF5w5avbSfPIKcT4SanuPSdGekkwDJP4ZlNX3ayAHVHpLIPX/sCVVquhtz3ac |
62 |
-rHFI9yboGNAAcIp1uBUwyiDdKc66U1I2YZMxQqWazps+x01c+6F1JXT+oLWJxHfe |
63 |
-HsgQOSjCXN0kRk+Zy7FTg89zErYa+XsuqFG/H9lL86kkSVy5R2Q5co+0PlQ4CcOu |
64 |
-T7XA8H1McsohCdHYygMwZNEJF9BWy9DBoMsSNlmHHncrKZNxEQAJsDfTrtuy1MWw |
65 |
-C/OgDWgdG1OXsuUPmN6924Wpo1utwc08ctndFNV6JLO6WZPiXaJ6xUfKDR5qJ2sF |
66 |
-aDkAS5TrMWlYFr0RjcF9tgI38oNU5+g5CP6V+oNmAHD94yTL+P0CMx7+MztSBbSQ |
67 |
-Les8TX+WUw+dw1pswDhcpCDeP3L60/GJaXihEv1Yvn5gF3T+tShqJnaVrBnETeVs |
68 |
-yjS8mw1ncanu7nKN60CKteVHr0J5YxHVelATjEwIJTtzvrTLrruWCKNyWYKTtrhS |
69 |
-34hWg9DR/GyUUnCOtfZDPxnZa8aUEI5J5d9daVjebuP1DE2XD0aL2ruMcUczteLh |
70 |
-WiKNiDhEtoq+i0RPtsAdOIjDNZJCZ2HS0Dbrg97gEVmQgPdWPHTS3BtApS+0aT9z |
71 |
-nO6VuqxzC9g2qjVzCVj7 |
72 |
-=n2dR |
73 |
------END PGP SIGNATURE----- |
74 |
|
75 |
diff --git a/dev-db/mariadb/mariadb-10.1.11.ebuild b/dev-db/mariadb/mariadb-10.1.11.ebuild |
76 |
new file mode 100644 |
77 |
index 0000000..98f08c6 |
78 |
--- /dev/null |
79 |
+++ b/dev-db/mariadb/mariadb-10.1.11.ebuild |
80 |
@@ -0,0 +1,207 @@ |
81 |
+# Copyright 1999-2016 Gentoo Foundation |
82 |
+# Distributed under the terms of the GNU General Public License v2 |
83 |
+# $Id$ |
84 |
+ |
85 |
+EAPI="5" |
86 |
+MY_EXTRAS_VER="20151223-1501Z" |
87 |
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
88 |
+WSREP_REVISION="25" |
89 |
+SUBSLOT="18" |
90 |
+MYSQL_PV_MAJOR="5.6" |
91 |
+ |
92 |
+inherit toolchain-funcs mysql-multilib-r1 |
93 |
+ |
94 |
+HOMEPAGE="http://mariadb.org/" |
95 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
96 |
+ |
97 |
+# Now includes a kerberos plugin but the server pieces doesn't build MDEV-9494 |
98 |
+IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
99 |
+RESTRICT="!bindist? ( bindist )" |
100 |
+ |
101 |
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
102 |
+ |
103 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
104 |
+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" |
105 |
+ |
106 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
107 |
+#EPATCH_EXCLUDE='' |
108 |
+ |
109 |
+COMMON_DEPEND=" |
110 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
111 |
+ kerberos? ( virtual/krb5 ) |
112 |
+ systemd? ( sys-apps/systemd:= ) |
113 |
+ !bindist? ( >=sys-libs/readline-4.1:0= ) |
114 |
+ server? ( |
115 |
+ cracklib? ( sys-libs/cracklib:0= ) |
116 |
+ extraengine? ( |
117 |
+ odbc? ( dev-db/unixODBC:0= ) |
118 |
+ xml? ( dev-libs/libxml2:2= ) |
119 |
+ ) |
120 |
+ innodb-lz4? ( app-arch/lz4 ) |
121 |
+ innodb-lzo? ( dev-libs/lzo ) |
122 |
+ innodb-snappy? ( app-arch/snappy ) |
123 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
124 |
+ pam? ( virtual/pam:0= ) |
125 |
+ tokudb? ( app-arch/snappy ) |
126 |
+ ) |
127 |
+ >=dev-libs/libpcre-8.35:3= |
128 |
+" |
129 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
130 |
+ ${COMMON_DEPEND}" |
131 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
132 |
+ galera? ( |
133 |
+ sys-apps/iproute2 |
134 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
135 |
+ sst-rsync? ( sys-process/lsof ) |
136 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
137 |
+ ) |
138 |
+ perl? ( !dev-db/mytop |
139 |
+ virtual/perl-Getopt-Long |
140 |
+ dev-perl/TermReadKey |
141 |
+ virtual/perl-Term-ANSIColor |
142 |
+ virtual/perl-Time-HiRes ) |
143 |
+" |
144 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
145 |
+PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
146 |
+ |
147 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
148 |
+ |
149 |
+src_configure(){ |
150 |
+ # bug 508724 mariadb cannot use ld.gold |
151 |
+ tc-ld-disable-gold |
152 |
+ |
153 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
154 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
155 |
+ -DWITH_PCRE=system |
156 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
157 |
+ ) |
158 |
+ if use server ; then |
159 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
160 |
+ if ! use extraengine ; then |
161 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
162 |
+ -DPLUGIN_FEDERATED=NO |
163 |
+ -DPLUGIN_FEDERATEDX=NO ) |
164 |
+ fi |
165 |
+ |
166 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
167 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
168 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
169 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
170 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
171 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
172 |
+ -DPLUGIN_CASSANDRA=NO |
173 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
174 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
175 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
176 |
+ -DCONNECT_WITH_MYSQL=1 |
177 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
178 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
179 |
+ -DWITH_WSREP=$(usex galera) |
180 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
181 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo) |
182 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
183 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
184 |
+ -DPLUGIN_AUTH_GSSAPI=NO |
185 |
+ ) |
186 |
+# Disable until upstream fixes it |
187 |
+# -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
188 |
+ fi |
189 |
+ mysql-multilib-r1_src_configure |
190 |
+} |
191 |
+ |
192 |
+# Official test instructions: |
193 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
194 |
+# FEATURES='test userpriv -usersandbox' \ |
195 |
+# ebuild mariadb-X.X.XX.ebuild \ |
196 |
+# digest clean package |
197 |
+multilib_src_test() { |
198 |
+ |
199 |
+ if ! multilib_is_native_abi ; then |
200 |
+ einfo "Server tests not available on non-native abi". |
201 |
+ return 0; |
202 |
+ fi |
203 |
+ |
204 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
205 |
+ local retstatus_unit |
206 |
+ local retstatus_tests |
207 |
+ |
208 |
+ if use server ; then |
209 |
+ |
210 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
211 |
+ # localhost. Also causes weird failures. |
212 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
213 |
+ |
214 |
+ if [[ $UID -eq 0 ]]; then |
215 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
216 |
+ fi |
217 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
218 |
+ |
219 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
220 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
221 |
+ |
222 |
+ # Run CTest (test-units) |
223 |
+ cmake-utils_src_test |
224 |
+ retstatus_unit=$? |
225 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
226 |
+ |
227 |
+ # Ensure that parallel runs don't die |
228 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
229 |
+ # Enable parallel testing, auto will try to detect number of cores |
230 |
+ # You may set this by hand. |
231 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
232 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
233 |
+ |
234 |
+ # create directories because mysqladmin might run out of order |
235 |
+ mkdir -p "${T}"/var-tests{,/log} |
236 |
+ |
237 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
238 |
+ # false positives: |
239 |
+ # |
240 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
241 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
242 |
+ # funcs_1.is_columns_mysql main.bootstrap |
243 |
+ # fails due to USE=-latin1 / utf8 default |
244 |
+ # |
245 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
246 |
+ # main.mysql_client_test_comp: |
247 |
+ # segfaults at random under Portage only, suspect resource limits. |
248 |
+ # |
249 |
+ # plugins.cracklib_password_check |
250 |
+ # Can randomly fail due to cracklib return message |
251 |
+ |
252 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
253 |
+ main.mysql_client_test_comp main.bootstrap \ |
254 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
255 |
+ main.mysqld--help plugins.cracklib_password_check \ |
256 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
257 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
258 |
+ done |
259 |
+ |
260 |
+ # Run mysql tests |
261 |
+ pushd "${TESTDIR}" || die |
262 |
+ |
263 |
+ # run mysql-test tests |
264 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
265 |
+ |
266 |
+ retstatus_tests=$? |
267 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
268 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
269 |
+ |
270 |
+ popd || die |
271 |
+ |
272 |
+ # Cleanup is important for these testcases. |
273 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
274 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
275 |
+ |
276 |
+ failures="" |
277 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
278 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
279 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
280 |
+ |
281 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
282 |
+ einfo "Tests successfully completed" |
283 |
+ |
284 |
+ else |
285 |
+ einfo "Skipping server tests due to minimal build." |
286 |
+ fi |
287 |
+} |