1 |
commit: 92c9149c1d311b02371b26ed9a49fdc4834b0c0a |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 15 17:31:37 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 15 17:31:37 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c9149c |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.1.29 |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.5 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.1.29.ebuild | 229 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 230 insertions(+) |
15 |
|
16 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
17 |
index e6d24d5842d..984fc64caf4 100644 |
18 |
--- a/dev-db/mariadb/Manifest |
19 |
+++ b/dev-db/mariadb/Manifest |
20 |
@@ -4,6 +4,7 @@ DIST mariadb-10.0.33.tar.gz 69211872 SHA256 e3e3d583c51761aee2fcd0e51bfa7d592c12 |
21 |
DIST mariadb-10.1.24.tar.gz 61780687 SHA256 b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 WHIRLPOOL 91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122 |
22 |
DIST mariadb-10.1.26.tar.gz 61887132 SHA256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b WHIRLPOOL 8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21 |
23 |
DIST mariadb-10.1.28.tar.gz 67559689 SHA256 292dc8fff420c4bdaf3a2c3381ec3c99292965db2b09de0d7fec414c00032bbd SHA512 ca10d28f6b966719c7488c2b4ba928b65cbe9dc32ccf2a28d29c4d0c2d46ea1c59c3e339230017b317132dcd216925a71769dfba80a7d6321079c74ac41926d8 WHIRLPOOL d8ff24346a9e8ada4a9ec0ea8fd7657ff4972d43347afb7a9d7725293437ba70e0035c365738084b1e4828344861f000bd963260176524da2188c2c3a1389f67 |
24 |
+DIST mariadb-10.1.29.tar.gz 67885370 SHA256 73bbd5602f52ab5aa4d83f465134871b6c87bda25371d098f6da5a3d98517ed4 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd WHIRLPOOL dc8818f6a176166a52c4ff7268e917843f4a7f96f36d5df33e81fb0d84bb15cb39383ad5012304ba31d03f7302cbb41769357aca0d67e1703248e70e1ba28b45 |
25 |
DIST mariadb-10.2.10.tar.gz 72388999 SHA256 5c7b83c4d2f7501ef9f187d8c97688a24fd3e53dc43bb388f8e1cead61a92fc2 SHA512 39c198009f8b19f4a08226ef9842b50e24636580b67c1c92d59c61cce3aa1edbd466e253c281dfcdfc58ab573ae9a59aaacb0ce3e8b82222043ddd849fc3e239 WHIRLPOOL b64e99254764556d6de947e254a45c5c2743d9e825ee109354b3101641048b3509dd26471abdb6f7b90f3a208ac7d2d13ad70cbb966e05ac49b26ef2ecb12e6e |
26 |
DIST mariadb-5.5.58.tar.gz 45784323 SHA256 26fdf8784a51e5d6f7624c0f4528433a6188065dd1bf92ef69e27db6b0a41002 SHA512 c5c8b52c613a1a3f30de2cd1d8e390f8110b0891af78ee2a24ef2c4b7b8c5f2e140970ca89865e8277e7486dbfd0ad01c1fdbf8791c67a9793392247d68fec63 WHIRLPOOL b507f3aaaced5da716de1a131dc4e69ace6f2ccd2ac58614d3d722b46b0b271ab0a452aef03b78d499b961f39a057ece5169f5af6fcce2e840aecd77ebf9295e |
27 |
DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d WHIRLPOOL becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927 |
28 |
|
29 |
diff --git a/dev-db/mariadb/mariadb-10.1.29.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..0464ff44aa7 |
32 |
--- /dev/null |
33 |
+++ b/dev-db/mariadb/mariadb-10.1.29.ebuild |
34 |
@@ -0,0 +1,229 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI="6" |
39 |
+MY_EXTRAS_VER="20170926-1321Z" |
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 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 ~sparc-fbsd ~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 |
+) |
69 |
+ |
70 |
+COMMON_DEPEND=" |
71 |
+ mroonga? ( app-text/groonga-normalizer-mysql ) |
72 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
73 |
+ !bindist? ( |
74 |
+ sys-libs/binutils-libs:0= |
75 |
+ >=sys-libs/readline-4.1:0= |
76 |
+ ) |
77 |
+ server? ( |
78 |
+ backup? ( app-arch/libarchive:0= ) |
79 |
+ cracklib? ( sys-libs/cracklib:0= ) |
80 |
+ extraengine? ( |
81 |
+ odbc? ( dev-db/unixODBC:0= ) |
82 |
+ xml? ( dev-libs/libxml2:2= ) |
83 |
+ sys-libs/zlib[minizip] |
84 |
+ ) |
85 |
+ innodb-lz4? ( app-arch/lz4 ) |
86 |
+ innodb-lzo? ( dev-libs/lzo ) |
87 |
+ innodb-snappy? ( app-arch/snappy ) |
88 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
89 |
+ pam? ( virtual/pam:0= ) |
90 |
+ systemd? ( sys-apps/systemd:= ) |
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-mariabackup? ( net-misc/socat[ssl] ) |
104 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
105 |
+ ) |
106 |
+ perl? ( !dev-db/mytop |
107 |
+ virtual/perl-Getopt-Long |
108 |
+ dev-perl/TermReadKey |
109 |
+ virtual/perl-Term-ANSIColor |
110 |
+ virtual/perl-Time-HiRes ) |
111 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
112 |
+" |
113 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
114 |
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
115 |
+ |
116 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
117 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
118 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
119 |
+ |
120 |
+pkg_setup() { |
121 |
+ java-pkg-opt-2_pkg_setup |
122 |
+ mysql-multilib-r1_pkg_setup |
123 |
+} |
124 |
+ |
125 |
+pkg_preinst() { |
126 |
+ java-pkg-opt-2_pkg_preinst |
127 |
+ mysql-multilib-r1_pkg_preinst |
128 |
+} |
129 |
+ |
130 |
+src_prepare() { |
131 |
+ java-pkg-opt-2_src_prepare |
132 |
+ mysql-multilib-r1_src_prepare |
133 |
+} |
134 |
+ |
135 |
+src_configure(){ |
136 |
+ # bug 508724 mariadb cannot use ld.gold |
137 |
+ tc-ld-disable-gold |
138 |
+ |
139 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
140 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
141 |
+ -DWITH_PCRE=system |
142 |
+ ) |
143 |
+ local MYSQL_CMAKE_EXTRA_DEFINES=( |
144 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
145 |
+ ) |
146 |
+ if use server ; then |
147 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
148 |
+ if ! use extraengine ; then |
149 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
150 |
+ -DPLUGIN_FEDERATED=NO |
151 |
+ -DPLUGIN_FEDERATEDX=NO ) |
152 |
+ fi |
153 |
+ |
154 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
155 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
156 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
157 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
158 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
159 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
160 |
+ -DPLUGIN_CASSANDRA=NO |
161 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
162 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
163 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
164 |
+ -DCONNECT_WITH_MYSQL=1 |
165 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
166 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
167 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
168 |
+ -DWITH_WSREP=$(usex galera) |
169 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
170 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
171 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
172 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
173 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
174 |
+ -DWITH_MARIABACKUP=$(usex backup ON OFF) |
175 |
+ -DWITH_LIBARCHIVE=$(usex backup ON OFF) |
176 |
+ ) |
177 |
+ fi |
178 |
+ mysql-multilib-r1_src_configure |
179 |
+} |
180 |
+ |
181 |
+# Official test instructions: |
182 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
183 |
+# FEATURES='test userpriv -usersandbox' \ |
184 |
+# ebuild mariadb-X.X.XX.ebuild \ |
185 |
+# digest clean package |
186 |
+multilib_src_test() { |
187 |
+ |
188 |
+ if ! multilib_is_native_abi ; then |
189 |
+ einfo "Server tests not available on non-native abi". |
190 |
+ return 0; |
191 |
+ fi |
192 |
+ |
193 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
194 |
+ local retstatus_unit |
195 |
+ local retstatus_tests |
196 |
+ |
197 |
+ if ! use server ; then |
198 |
+ einfo "Skipping server tests due to minimal build." |
199 |
+ return 0 |
200 |
+ fi |
201 |
+ |
202 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
203 |
+ # localhost. Also causes weird failures. |
204 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
205 |
+ |
206 |
+ if [[ $UID -eq 0 ]]; then |
207 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
208 |
+ fi |
209 |
+ has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
210 |
+ |
211 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
212 |
+ |
213 |
+ # Run CTest (test-units) |
214 |
+ cmake-utils_src_test |
215 |
+ retstatus_unit=$? |
216 |
+ |
217 |
+ # Ensure that parallel runs don't die |
218 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
219 |
+ # Enable parallel testing, auto will try to detect number of cores |
220 |
+ # You may set this by hand. |
221 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
222 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
223 |
+ |
224 |
+ # create directories because mysqladmin might run out of order |
225 |
+ mkdir -p "${T}"/var-tests{,/log} |
226 |
+ |
227 |
+ # Run mysql tests |
228 |
+ pushd "${TESTDIR}" || die |
229 |
+ |
230 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
231 |
+ # false positives: |
232 |
+ # |
233 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
234 |
+ # main.mysql_client_test_comp: |
235 |
+ # segfaults at random under Portage only, suspect resource limits. |
236 |
+ |
237 |
+ local t |
238 |
+ for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
239 |
+ mysql-multilib-r1_disable_test "$t" "False positive due to varying policies" |
240 |
+ done |
241 |
+ |
242 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
243 |
+ main.mysql_client_test_comp ; do |
244 |
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
245 |
+ done |
246 |
+ |
247 |
+ # run mysql-test tests |
248 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
249 |
+ retstatus_tests=$? |
250 |
+ |
251 |
+ popd || die |
252 |
+ |
253 |
+ # Cleanup is important for these testcases. |
254 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
255 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
256 |
+ |
257 |
+ local failures="" |
258 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
259 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
260 |
+ |
261 |
+ [[ -z "$failures" ]] || eerror "Test failures: $failures" |
262 |
+ einfo "Tests successfully completed" |
263 |
+} |