1 |
commit: 0223b9a4fdf38aa13e574f585f3ce64080d8d320 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 3 20:23:55 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 3 20:23:55 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0223b9a4 |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.1.23 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.1.23.ebuild | 227 ++++++++++++++++++++++++++++++++++ |
14 |
dev-db/mariadb/metadata.xml | 1 + |
15 |
3 files changed, 229 insertions(+) |
16 |
|
17 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
18 |
index c7bf31e87b0..9fea3a507ba 100644 |
19 |
--- a/dev-db/mariadb/Manifest |
20 |
+++ b/dev-db/mariadb/Manifest |
21 |
@@ -1,6 +1,7 @@ |
22 |
DIST mariadb-10.0.29.tar.gz 63385696 SHA256 f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c WHIRLPOOL ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b |
23 |
DIST mariadb-10.0.30.tar.gz 63433598 SHA256 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 WHIRLPOOL d109efc6599f457b0a270c62f32115bc0753a5357e88f40023944668c2cfece70f01050fe4773f2bb97ae58c76da15b22031a281aeebaf0512a64bc9ff3f4c37 |
24 |
DIST mariadb-10.1.22.tar.gz 61542321 SHA256 bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce SHA512 cf02044b7531f83618eeb42bbddce7b761c6530d22fc69701b3efe7461a1e932510cee923aa59044dcf0bbb5a9edf7bc76d3568f300b648f4983848f5975f7b2 WHIRLPOOL b0637e3a267ef70a527f7b15da634158f6dd873c3f3f88f81d60855784325ced0557e76e8be71e24d0927cec4c081e4cbf816f0c465d8cc9d9ef0576572ab44e |
25 |
+DIST mariadb-10.1.23.tar.gz 61772244 SHA256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf SHA512 338d016251038ef03d78744d93a2e21db6517e44f911512aaa3f34b52ddf6b2fc255783f8cacd63a7f89bc56eb728321c658b11f06718c83baf22109907149c6 WHIRLPOOL 2f1ae9e3dab858998cff8578b7ec8d1c0949a908a9872dc48c997ae2b233eba629d65594bf67ae145d911bb6bd8dcf3dab2778d3a0fbe74d8855805326ccee12 |
26 |
DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31 |
27 |
DIST mariadb-5.5.54.tar.gz 45765936 SHA256 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c SHA512 fe1ff7545989e542f777c201774eaeead906f864277bb1a98bcd06c50b97816a56cb70e83e6fd4517e8d8887ae237eb9cc75e27ab473a2e7a8f154882fc9e2a3 WHIRLPOOL 6f37cf5675eae31347c77d1444e17e70d35d91932251efb0f772de6d36f7b74c797d92be2fec99dc803b18f99ea8dc5a55170e76c91b72b20b74797e99092bfe |
28 |
DIST mariadb-5.5.55.tar.gz 45757922 SHA256 cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86 SHA512 6fe725c997600009a7bb3dd0e78a4a94c370a07760c26cb124eee68aa81f859be159618cab782595e33aefecaf0401a6a1229f9acd847b8e2425cee069a2bc4e WHIRLPOOL 6984b35add26a65844f036e11f9db1fc2663300b23c8d60510bda789753189a339da8dbf463699eeb2a145d05a803fac92a3ba729c6866139f7867b8eb69cfc7 |
29 |
|
30 |
diff --git a/dev-db/mariadb/mariadb-10.1.23.ebuild b/dev-db/mariadb/mariadb-10.1.23.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..62d35d11d98 |
33 |
--- /dev/null |
34 |
+++ b/dev-db/mariadb/mariadb-10.1.23.ebuild |
35 |
@@ -0,0 +1,227 @@ |
36 |
+# Copyright 1999-2017 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI="6" |
40 |
+MY_EXTRAS_VER="20170316-1355Z" |
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 |
+JAVA_PKG_OPT_USE="jdbc" |
47 |
+ |
48 |
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
49 |
+ |
50 |
+HOMEPAGE="http://mariadb.org/" |
51 |
+DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
52 |
+ |
53 |
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
54 |
+RESTRICT="!bindist? ( bindist )" |
55 |
+ |
56 |
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
57 |
+ |
58 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
59 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
60 |
+ |
61 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
62 |
+ |
63 |
+PATCHES=( |
64 |
+ "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch |
65 |
+ "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
66 |
+ "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
67 |
+ "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
68 |
+) |
69 |
+ |
70 |
+COMMON_DEPEND=" |
71 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
72 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
73 |
+ systemd? ( sys-apps/systemd:= ) |
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 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
90 |
+ pam? ( virtual/pam:0= ) |
91 |
+ tokudb? ( app-arch/snappy ) |
92 |
+ ) |
93 |
+ >=dev-libs/libpcre-8.35:3= |
94 |
+" |
95 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
96 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
97 |
+ ${COMMON_DEPEND}" |
98 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
99 |
+ galera? ( |
100 |
+ sys-apps/iproute2 |
101 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
102 |
+ sst-rsync? ( sys-process/lsof ) |
103 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
104 |
+ ) |
105 |
+ perl? ( !dev-db/mytop |
106 |
+ virtual/perl-Getopt-Long |
107 |
+ dev-perl/TermReadKey |
108 |
+ virtual/perl-Term-ANSIColor |
109 |
+ virtual/perl-Time-HiRes ) |
110 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
111 |
+" |
112 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
113 |
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
114 |
+ |
115 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
116 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
117 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
118 |
+ |
119 |
+pkg_setup() { |
120 |
+ java-pkg-opt-2_pkg_setup |
121 |
+ mysql-multilib-r1_pkg_setup |
122 |
+} |
123 |
+ |
124 |
+pkg_preinst() { |
125 |
+ java-pkg-opt-2_pkg_preinst |
126 |
+ mysql-multilib-r1_pkg_preinst |
127 |
+} |
128 |
+ |
129 |
+src_prepare() { |
130 |
+ java-pkg-opt-2_src_prepare |
131 |
+ mysql-multilib-r1_src_prepare |
132 |
+} |
133 |
+ |
134 |
+src_configure(){ |
135 |
+ # bug 508724 mariadb cannot use ld.gold |
136 |
+ tc-ld-disable-gold |
137 |
+ |
138 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
139 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
140 |
+ -DWITH_PCRE=system |
141 |
+ ) |
142 |
+ local MYSQL_CMAKE_EXTRA_DEFINES=( |
143 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
144 |
+ ) |
145 |
+ if use server ; then |
146 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
147 |
+ if ! use extraengine ; then |
148 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
149 |
+ -DPLUGIN_FEDERATED=NO |
150 |
+ -DPLUGIN_FEDERATEDX=NO ) |
151 |
+ fi |
152 |
+ |
153 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
154 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
155 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
156 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
157 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
158 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
159 |
+ -DPLUGIN_CASSANDRA=NO |
160 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
161 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
162 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
163 |
+ -DCONNECT_WITH_MYSQL=1 |
164 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
165 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
166 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
167 |
+ -DWITH_WSREP=$(usex galera) |
168 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
169 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
170 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
171 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
172 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
173 |
+ -DWITH_MARIABACKUP=$(usex backup ON OFF) |
174 |
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
175 |
+ ) |
176 |
+ fi |
177 |
+ mysql-multilib-r1_src_configure |
178 |
+} |
179 |
+ |
180 |
+# Official test instructions: |
181 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
182 |
+# FEATURES='test userpriv -usersandbox' \ |
183 |
+# ebuild mariadb-X.X.XX.ebuild \ |
184 |
+# digest clean package |
185 |
+multilib_src_test() { |
186 |
+ |
187 |
+ if ! multilib_is_native_abi ; then |
188 |
+ einfo "Server tests not available on non-native abi". |
189 |
+ return 0; |
190 |
+ fi |
191 |
+ |
192 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
193 |
+ local retstatus_unit |
194 |
+ local retstatus_tests |
195 |
+ |
196 |
+ if ! use server ; then |
197 |
+ einfo "Skipping server tests due to minimal build." |
198 |
+ return 0 |
199 |
+ fi |
200 |
+ |
201 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
202 |
+ # localhost. Also causes weird failures. |
203 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
204 |
+ |
205 |
+ if [[ $UID -eq 0 ]]; then |
206 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
207 |
+ fi |
208 |
+ has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
209 |
+ |
210 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
211 |
+ |
212 |
+ # Run CTest (test-units) |
213 |
+ cmake-utils_src_test |
214 |
+ retstatus_unit=$? |
215 |
+ |
216 |
+ # Ensure that parallel runs don't die |
217 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
218 |
+ # Enable parallel testing, auto will try to detect number of cores |
219 |
+ # You may set this by hand. |
220 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
221 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
222 |
+ |
223 |
+ # create directories because mysqladmin might run out of order |
224 |
+ mkdir -p "${T}"/var-tests{,/log} |
225 |
+ |
226 |
+ # Run mysql tests |
227 |
+ pushd "${TESTDIR}" || die |
228 |
+ |
229 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
230 |
+ # false positives: |
231 |
+ # |
232 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
233 |
+ # main.mysql_client_test_comp: |
234 |
+ # segfaults at random under Portage only, suspect resource limits. |
235 |
+ |
236 |
+ local t |
237 |
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
238 |
+ mysql-multilib-r1_disable_test "$t" "False positive due to varying policies" |
239 |
+ done |
240 |
+ |
241 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
242 |
+ main.mysql_client_test_comp ; do |
243 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
244 |
+ done |
245 |
+ |
246 |
+ # run mysql-test tests |
247 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
248 |
+ retstatus_tests=$? |
249 |
+ |
250 |
+ popd || die |
251 |
+ |
252 |
+ # Cleanup is important for these testcases. |
253 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
254 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
255 |
+ |
256 |
+ local failures="" |
257 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
258 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
259 |
+ |
260 |
+ [[ -z "$failures" ]] || eerror "Test failures: $failures" |
261 |
+ einfo "Tests successfully completed" |
262 |
+} |
263 |
|
264 |
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml |
265 |
index dfd13c97258..55d72a8c2f1 100644 |
266 |
--- a/dev-db/mariadb/metadata.xml |
267 |
+++ b/dev-db/mariadb/metadata.xml |
268 |
@@ -11,6 +11,7 @@ dev-db/mysql |
269 |
dev-db/mariadb |
270 |
--> |
271 |
<use> |
272 |
+ <flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag> |
273 |
<flag name="cluster">Add support for NDB clustering (deprecated)</flag> |
274 |
<flag name="community">Enables the community features from upstream.</flag> |
275 |
<flag name="embedded">Build embedded server (libmysqld)</flag> |