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