Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-galera/
Date: Sat, 10 Feb 2018 03:27:49
Message-Id: 1518233255.944053161547f5e85b8afe6815d4e7ba48f8073f.grknight@gentoo
1 commit: 944053161547f5e85b8afe6815d4e7ba48f8073f
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 10 03:27:35 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 10 03:27:35 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94405316
7
8 dev-db/mariadb-galera: Drop old vulnerable version
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-db/mariadb-galera/Manifest | 2 -
13 .../mariadb-galera/mariadb-galera-10.0.32.ebuild | 181 ---------------------
14 2 files changed, 183 deletions(-)
15
16 diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
17 index af0a4ea7812..c74b3336a5f 100644
18 --- a/dev-db/mariadb-galera/Manifest
19 +++ b/dev-db/mariadb-galera/Manifest
20 @@ -1,4 +1,2 @@
21 -DIST mariadb-galera-10.0.32.tar.gz 63961466 BLAKE2B 98e98364e32cd6196b40c112f805d57b014d5cbb7d2d266f7730ba5a5f91e86f9c9902ac97e5ff1bfe3b421e3a0ced0204d24edc1ebdfd7fcf715255282ca836 SHA512 3f17c4baaa06a51e037c96bc9a44fb612d6e492f9212664a7b9b7a70be49e7657626cd10b89ec312d4062ddf44bbc1d2ca6b044269af0507669e86bdc683fabb
22 DIST mariadb-galera-10.0.34.tar.gz 69661677 BLAKE2B a905e24c217843e04d35393af9eee06e2e42d6b6d4f7202645a795dd17ee60394b19228332dca9f0d078748f5d02893ad3f367c8c449147811abf78e502b7997 SHA512 e0226e6032d5ff0080a97ea486726a44d8e1b977b93c8d07b517be70098df4149d119d325ebcba6c6affa95a586c94ec8f99a5e5a74a7d2314311748029dc7ab
23 -DIST mysql-extras-20160629-1442Z.tar.bz2 299152 BLAKE2B 171733eba8579b222b20ccabfc93aec666c60ea8498be3daec030e4217fde0e6112a2bcef48996c44817a6c6e8f7e9b255fe96e02553b042d3d9630a0a5a17ba SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715
24 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
25
26 diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.32.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.32.ebuild
27 deleted file mode 100644
28 index 61a1c209dde..00000000000
29 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.32.ebuild
30 +++ /dev/null
31 @@ -1,181 +0,0 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="6"
36 -MY_EXTRAS_VER="20160629-1442Z"
37 -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
38 -WSREP_REVISION="25"
39 -SUBSLOT="18"
40 -MYSQL_PV_MAJOR="5.6"
41 -
42 -SERVER_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz"
43 -MY_SOURCEDIR="${PN%%-galera}-${PV}"
44 -JAVA_PKG_OPT_USE="jdbc"
45 -
46 -inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
47 -
48 -HOMEPAGE="http://mariadb.org/"
49 -DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
50 -
51 -IUSE="bindist jdbc odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb xml"
52 -RESTRICT="!bindist? ( bindist )"
53 -
54 -REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
55 -
56 -# REMEMBER: also update eclass/mysql*.eclass before committing!
57 -KEYWORDS="~amd64 ~x86"
58 -
59 -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
60 -PATCHES=(
61 - "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
62 - "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch"
63 - "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
64 - "${MY_PATCH_DIR}/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch"
65 -)
66 -COMMON_DEPEND="
67 - !bindist? ( >=sys-libs/readline-4.1:0= )
68 - server? (
69 - extraengine? (
70 - odbc? ( dev-db/unixODBC:0= )
71 - xml? ( dev-libs/libxml2:2= )
72 - )
73 - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
74 - pam? ( virtual/pam:0= )
75 - tokudb? ( app-arch/snappy )
76 - )
77 - >=dev-libs/libpcre-8.35:3=
78 -"
79 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
80 - server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
81 - ${COMMON_DEPEND}"
82 -RDEPEND="${RDEPEND} ${COMMON_DEPEND}
83 - sys-apps/iproute2
84 - =sys-cluster/galera-${WSREP_REVISION}*
85 - sst-rsync? ( sys-process/lsof )
86 - sst-xtrabackup? ( net-misc/socat[ssl] )
87 - perl? ( !dev-db/mytop
88 - virtual/perl-Getopt-Long
89 - dev-perl/TermReadKey
90 - virtual/perl-Term-ANSIColor
91 - virtual/perl-Time-HiRes )
92 - server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
93 -"
94 -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
95 -PDEPEND="sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) )"
96 -
97 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
98 -
99 -pkg_setup() {
100 - java-pkg-opt-2_pkg_setup
101 - mysql-multilib-r1_pkg_setup
102 -}
103 -
104 -pkg_preinst() {
105 - java-pkg-opt-2_pkg_preinst
106 - mysql-multilib-r1_pkg_preinst
107 -}
108 -
109 -src_prepare() {
110 - java-pkg-opt-2_src_prepare
111 - mysql-multilib-r1_src_prepare
112 -}
113 -
114 -src_configure(){
115 - # bug 508724 mariadb cannot use ld.gold
116 - tc-ld-disable-gold
117 - local MYSQL_CMAKE_NATIVE_DEFINES=(
118 - -DWITH_JEMALLOC=$(usex jemalloc system)
119 - -DWITH_PCRE=system
120 - )
121 - if use server ; then
122 - # Federated{,X} must be treated special otherwise they will not be built as plugins
123 - if ! use extraengine ; then
124 - MYSQL_CMAKE_NATIVE_DEFINES+=(
125 - -DWITHOUT_FEDERATED=1
126 - -DWITHOUT_FEDERATEDX=1 )
127 - fi
128 -
129 - MYSQL_CMAKE_NATIVE_DEFINES+=(
130 - $(mysql-cmake_use_plugin oqgraph OQGRAPH)
131 - $(mysql-cmake_use_plugin sphinx SPHINX)
132 - $(mysql-cmake_use_plugin tokudb TOKUDB)
133 - $(mysql-cmake_use_plugin pam AUTH_PAM)
134 - -DWITHOUT_CASSANDRA=0
135 - $(mysql-cmake_use_plugin extraengine SEQUENCE)
136 - $(mysql-cmake_use_plugin extraengine SPIDER)
137 - $(mysql-cmake_use_plugin extraengine CONNECT)
138 - -DCONNECT_WITH_MYSQL=1
139 - -DCONNECT_WITH_LIBXML2=$(usex xml)
140 - -DCONNECT_WITH_ODBC=$(usex odbc)
141 - -DCONNECT_WITH_JDBC=$(usex jdbc)
142 - -DWITHOUT_MROONGA=1
143 - )
144 - fi
145 - mysql-multilib-r1_src_configure
146 -}
147 -
148 -# Official test instructions:
149 -# USE='embedded extraengine perl server openssl static-libs' \
150 -# FEATURES='test userpriv -usersandbox' \
151 -# ebuild mariadb-X.X.XX.ebuild \
152 -# digest clean package
153 -multilib_src_test() {
154 -
155 - if ! multilib_is_native_abi ; then
156 - einfo "Server tests not available on non-native abi".
157 - return 0;
158 - fi
159 -
160 - local TESTDIR="${BUILD_DIR}/mysql-test"
161 - local retstatus_unit
162 - local retstatus_tests
163 -
164 - if ! use server ; then
165 - einfo "Skipping server tests due to minimal build."
166 - fi
167 -
168 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
169 - # localhost. Also causes weird failures.
170 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
171 -
172 - if [[ $UID -eq 0 ]]; then
173 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
174 - fi
175 - has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
176 -
177 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
178 -
179 - # Run CTest (test-units)
180 - cmake-utils_src_test
181 - retstatus_unit=$?
182 -
183 - # Ensure that parallel runs don't die
184 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
185 - # Enable parallel testing, auto will try to detect number of cores
186 - # You may set this by hand.
187 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
188 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
189 -
190 - # create directories because mysqladmin might run out of order
191 - mkdir -p "${T}"/var-tests{,/log}
192 -
193 - # Run mysql tests
194 - pushd "${TESTDIR}" || die
195 -
196 - # run mysql-test tests
197 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
198 - retstatus_tests=$?
199 -
200 - popd || die
201 -
202 - # Cleanup is important for these testcases.
203 - pkill -9 -f "${S}/ndb" 2>/dev/null
204 - pkill -9 -f "${S}/sql" 2>/dev/null
205 -
206 - local failures=""
207 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
208 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
209 -
210 - [[ -z "$failures" ]] || die "Test failures: $failures"
211 - einfo "Tests successfully completed"
212 -}