1 |
commit: 14fae3c1272b4ff85c43c76aeb0bbef350ee1bf8 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 30 02:46:02 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 30 02:46:02 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fae3c1 |
7 |
|
8 |
dev-db/mariadb: Version bump for 10.1.21 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.1.21.ebuild | 207 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 208 insertions(+) |
15 |
|
16 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
17 |
index 6e38486..dc63b5c 100644 |
18 |
--- a/dev-db/mariadb/Manifest |
19 |
+++ b/dev-db/mariadb/Manifest |
20 |
@@ -2,6 +2,7 @@ DIST mariadb-10.0.28.tar.gz 63297461 SHA256 0a5033d56f1c5403df7fabd519ccbdc4da30 |
21 |
DIST mariadb-10.0.29.tar.gz 63385696 SHA256 f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c WHIRLPOOL ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b |
22 |
DIST mariadb-10.1.19.tar.gz 61222929 SHA256 5b9373f314e2d1727422fb3795bcf50c1c59005129b35b6cadafae5663251a81 SHA512 28fb7178b71ec287f91f06ec0939ec877097ed21ff96b013c139a9584ccffbc9fc8694707e0d3c44cd61da33b54311116f858d31931ba289cdb22776c872f285 WHIRLPOOL 8e24d87054ccabde4873a4faae5c9ce82aa5f84c1afd39c9152e9bff6aadc7bc73b5532e7944173fc9ea2ce1bd13d68122deb941718819c617d8b1daee974a3b |
23 |
DIST mariadb-10.1.20.tar.gz 61312731 SHA256 c24e83f24d674d9912319f9e9422f093c8ca6be1721a4380cbd74792b89ba0b9 SHA512 926067a30e54354f6482e28152694e747f4deb8b4ba6d054e089955b45f98f628ea8cca4cfbc12f6220fa6b8b6f2ba9fef7c23c09cb82b23f370acdd32a9e892 WHIRLPOOL ff7d3e180ab6e1a546d0e7c0517ec9138ce0dabf1768fe1270a018446c0a5727017ef94e2495295237d54ac21690c96ca7fce0d9f3f416584ce75b38470314b4 |
24 |
+DIST mariadb-10.1.21.tar.gz 61406584 SHA256 5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490 SHA512 241467ce7c04603261509e45b3c476632a11754f15dead67434bb8a0fbad6ebcf44c63ffeb7075574e54d14039b22702d48732c1fd8a498948d8b6fc54d54714 WHIRLPOOL 2d8acd6141272a552470fda6169e3c52b8516c82242d86965461b2a9be927db9ba7e0427ce88e95a88780da827aa3a406f3daddeec4b8abbaa1207ed25a4f7ff |
25 |
DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31 |
26 |
DIST mariadb-5.5.54.tar.gz 45765936 SHA256 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c SHA512 fe1ff7545989e542f777c201774eaeead906f864277bb1a98bcd06c50b97816a56cb70e83e6fd4517e8d8887ae237eb9cc75e27ab473a2e7a8f154882fc9e2a3 WHIRLPOOL 6f37cf5675eae31347c77d1444e17e70d35d91932251efb0f772de6d36f7b74c797d92be2fec99dc803b18f99ea8dc5a55170e76c91b72b20b74797e99092bfe |
27 |
DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 WHIRLPOOL d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f |
28 |
|
29 |
diff --git a/dev-db/mariadb/mariadb-10.1.21.ebuild b/dev-db/mariadb/mariadb-10.1.21.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000..79b9614 |
32 |
--- /dev/null |
33 |
+++ b/dev-db/mariadb/mariadb-10.1.21.ebuild |
34 |
@@ -0,0 +1,207 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+# $Id$ |
38 |
+ |
39 |
+EAPI="6" |
40 |
+MY_EXTRAS_VER="20160721-1526Z" |
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="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 |
+ cracklib? ( sys-libs/cracklib:0= ) |
80 |
+ extraengine? ( |
81 |
+ odbc? ( dev-db/unixODBC:0= ) |
82 |
+ xml? ( dev-libs/libxml2:2= ) |
83 |
+ ) |
84 |
+ innodb-lz4? ( app-arch/lz4 ) |
85 |
+ innodb-lzo? ( dev-libs/lzo ) |
86 |
+ innodb-snappy? ( app-arch/snappy ) |
87 |
+ oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
88 |
+ pam? ( virtual/pam:0= ) |
89 |
+ tokudb? ( app-arch/snappy ) |
90 |
+ ) |
91 |
+ >=dev-libs/libpcre-8.35:3= |
92 |
+" |
93 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
94 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
95 |
+ ${COMMON_DEPEND}" |
96 |
+RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
97 |
+ galera? ( |
98 |
+ sys-apps/iproute2 |
99 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
100 |
+ sst-rsync? ( sys-process/lsof ) |
101 |
+ sst-xtrabackup? ( net-misc/socat[ssl] ) |
102 |
+ ) |
103 |
+ perl? ( !dev-db/mytop |
104 |
+ virtual/perl-Getopt-Long |
105 |
+ dev-perl/TermReadKey |
106 |
+ virtual/perl-Term-ANSIColor |
107 |
+ virtual/perl-Time-HiRes ) |
108 |
+ server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
109 |
+" |
110 |
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
111 |
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
112 |
+ |
113 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
114 |
+ /usr/include/mysql/private/probes_mysql_nodtrace.h |
115 |
+ /usr/include/mysql/private/probes_mysql_dtrace.h ) |
116 |
+ |
117 |
+pkg_setup() { |
118 |
+ java-pkg-opt-2_pkg_setup |
119 |
+ mysql-multilib-r1_pkg_setup |
120 |
+} |
121 |
+ |
122 |
+pkg_preinst() { |
123 |
+ java-pkg-opt-2_pkg_preinst |
124 |
+ mysql-multilib-r1_pkg_preinst |
125 |
+} |
126 |
+ |
127 |
+src_prepare() { |
128 |
+ java-pkg-opt-2_src_prepare |
129 |
+ mysql-multilib-r1_src_prepare |
130 |
+} |
131 |
+ |
132 |
+src_configure(){ |
133 |
+ # bug 508724 mariadb cannot use ld.gold |
134 |
+ tc-ld-disable-gold |
135 |
+ |
136 |
+ local MYSQL_CMAKE_NATIVE_DEFINES=( |
137 |
+ -DWITH_JEMALLOC=$(usex jemalloc system) |
138 |
+ -DWITH_PCRE=system |
139 |
+ ) |
140 |
+ local MYSQL_CMAKE_EXTRA_DEFINES=( |
141 |
+ -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
142 |
+ ) |
143 |
+ if use server ; then |
144 |
+ # Federated{,X} must be treated special otherwise they will not be built as plugins |
145 |
+ if ! use extraengine ; then |
146 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
147 |
+ -DPLUGIN_FEDERATED=NO |
148 |
+ -DPLUGIN_FEDERATEDX=NO ) |
149 |
+ fi |
150 |
+ |
151 |
+ MYSQL_CMAKE_NATIVE_DEFINES+=( |
152 |
+ -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
153 |
+ -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
154 |
+ -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
155 |
+ -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
156 |
+ -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
157 |
+ -DPLUGIN_CASSANDRA=NO |
158 |
+ -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
159 |
+ -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
160 |
+ -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
161 |
+ -DCONNECT_WITH_MYSQL=1 |
162 |
+ -DCONNECT_WITH_LIBXML2=$(usex xml) |
163 |
+ -DCONNECT_WITH_ODBC=$(usex odbc) |
164 |
+ -DCONNECT_WITH_JDBC=$(usex jdbc) |
165 |
+ -DWITH_WSREP=$(usex galera) |
166 |
+ -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
167 |
+ -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
168 |
+ -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
169 |
+ -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
170 |
+ -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
171 |
+ ) |
172 |
+ fi |
173 |
+ mysql-multilib-r1_src_configure |
174 |
+} |
175 |
+ |
176 |
+# Official test instructions: |
177 |
+# USE='embedded extraengine perl server openssl static-libs' \ |
178 |
+# FEATURES='test userpriv -usersandbox' \ |
179 |
+# ebuild mariadb-X.X.XX.ebuild \ |
180 |
+# digest clean package |
181 |
+multilib_src_test() { |
182 |
+ |
183 |
+ if ! multilib_is_native_abi ; then |
184 |
+ einfo "Server tests not available on non-native abi". |
185 |
+ return 0; |
186 |
+ fi |
187 |
+ |
188 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
189 |
+ local retstatus_unit |
190 |
+ local retstatus_tests |
191 |
+ |
192 |
+ if ! use server ; then |
193 |
+ einfo "Skipping server tests due to minimal build." |
194 |
+ return 0 |
195 |
+ fi |
196 |
+ |
197 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
198 |
+ # localhost. Also causes weird failures. |
199 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
200 |
+ |
201 |
+ if [[ $UID -eq 0 ]]; then |
202 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
203 |
+ fi |
204 |
+ has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
205 |
+ |
206 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
207 |
+ |
208 |
+ # Run CTest (test-units) |
209 |
+ cmake-utils_src_test |
210 |
+ retstatus_unit=$? |
211 |
+ |
212 |
+ # Ensure that parallel runs don't die |
213 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
214 |
+ # Enable parallel testing, auto will try to detect number of cores |
215 |
+ # You may set this by hand. |
216 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
217 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
218 |
+ |
219 |
+ # create directories because mysqladmin might run out of order |
220 |
+ mkdir -p "${T}"/var-tests{,/log} |
221 |
+ |
222 |
+ # Run mysql tests |
223 |
+ pushd "${TESTDIR}" || die |
224 |
+ |
225 |
+ # run mysql-test tests |
226 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
227 |
+ retstatus_tests=$? |
228 |
+ |
229 |
+ popd || die |
230 |
+ |
231 |
+ # Cleanup is important for these testcases. |
232 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
233 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
234 |
+ |
235 |
+ local failures="" |
236 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
237 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
238 |
+ |
239 |
+ [[ -z "$failures" ]] || eerror "Test failures: $failures" |
240 |
+ einfo "Tests successfully completed" |
241 |
+} |