Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/
Date: Sat, 07 Jul 2012 23:55:28
Message-Id: 1341705307.2958ceaece100aedd97a3249a3408364d040aea4.jmbsvicetto@gentoo
1 commit: 2958ceaece100aedd97a3249a3408364d040aea4
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 7 23:55:07 2012 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 7 23:55:07 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2958ceae
7
8 [dev-db/mysql-5.5.25a] Version bump.
9
10 ---
11 dev-db/mysql/ChangeLog | 5 ++
12 dev-db/mysql/Manifest | 24 +------
13 dev-db/mysql/mysql-5.5.25a.ebuild | 129 +++++++++++++++++++++++++++++++++++++
14 3 files changed, 137 insertions(+), 21 deletions(-)
15
16 diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
17 index 93c6d16..b3757f1 100644
18 --- a/dev-db/mysql/ChangeLog
19 +++ b/dev-db/mysql/ChangeLog
20 @@ -2,6 +2,11 @@
21 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
22 # $Header: $
23
24 +*mysql-5.5.25a (07 Jul 2012)
25 +
26 + 07 Jul 2012; <atlantis@g.o> +mysql-5.5.25a.ebuild:
27 + [dev-db/mysql-5.5.25a] Version bump.
28 +
29 22 May 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
30 mysql-5.0.92.ebuild, mysql-5.0.96.ebuild:
31 Move EAPI assignment to the top.
32
33 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
34 index 4009cfb..aa269b1 100644
35 --- a/dev-db/mysql/Manifest
36 +++ b/dev-db/mysql/Manifest
37 @@ -1,6 +1,3 @@
38 ------BEGIN PGP SIGNED MESSAGE-----
39 -Hash: SHA1
40 -
41 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
42 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
43 AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
44 @@ -14,6 +11,7 @@ DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285a
45 DIST mysql-5.5.20.tar.gz 24305842 RMD160 2bdecbe6f61497f3d8c9255610d713f6f4e1164b SHA1 d5066327c41ac5a338ca0bb748e50bc4e1902442 SHA256 d07a84152ad3131ca63c20068be6192b0d212462e6cfedd092a1e9fc2b30540e
46 DIST mysql-5.5.21.tar.gz 24341768 RMD160 d31c1be22ac80f1c95e8f28c41ec1c82cba995cd SHA1 682e9f82566fa9dc25b0f32d979f102445a52f38 SHA256 2471fedc42bafb8210f7ff132172f6f57933f9727cc61d98197a91cfbfdf78cd
47 DIST mysql-5.5.22.tar.gz 24475686 RMD160 1404660a07a9eac4f6a4f25d7e8836edcaaee70e SHA1 31d232dd72279ae69cd192a5355a8599b55944c7 SHA256 f3333ffbe13e586471225fcb521f6ce511fa4374010901813ac35e0f5909dcdd
48 +DIST mysql-5.5.25a.tar.gz 24660795 RMD160 bbdd89629b5214e474c2cbd9ec50f320dcd1c767 SHA1 85dfea413a7d5d2733a40f9dd79cf2320302979f SHA256 d199fd9a3e0865226b9b2d5a870314c23a06afe7fac37e385708119e78168fda
49 DIST mysql-5.6.2-m5.tar.gz 26137314 RMD160 e333a001e087b9fdf179c4e9f6a1927f2bd0fc6d SHA1 6b82c973b2c203909357e7100741b6030426fa67 SHA256 84b4f83b3eeff43fb9a282c03a252ee3ace1cea43ddebdfeb0ea940a687e427f
50 DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d9793b944d4447c21cae SHA1 4d03151f26af1ad522e1f0f0ed5eddebd665fc5c SHA256 2b0e1ce0bf5a2bcb543e631f27bf1d6bcb15da0a966112dfe64b2591945cd605
51 DIST mysql-extras-20111118-2347Z.tar.bz2 1780751 RMD160 590ad649c6221d461f96466d83a3c15b1a80a3a9 SHA1 495fd4f43364fd86aed746cfb6f870d35c9c4987 SHA256 db380436ad13231245c02c2e36d4a1d5b3d27fa39c19e844507736a8ba69b6f5
52 @@ -28,23 +26,7 @@ EBUILD mysql-5.5.19.ebuild 4234 RMD160 24933ce6a8d4e778ae1c06eac4804068714b610f
53 EBUILD mysql-5.5.20.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
54 EBUILD mysql-5.5.21.ebuild 4234 RMD160 81a54015551e03cd18b99f3681955b191340d5b5 SHA1 9391d3cd4215fda934674cc4174c2bb52b5c6116 SHA256 a48e3a462de8effa3a8bfc2e8bdc80045de54027379056c15c79def8e62737c3
55 EBUILD mysql-5.5.22.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
56 +EBUILD mysql-5.5.25a.ebuild 4234 RMD160 1c839260104afb85ea60a731802aaa9eff56f33c SHA1 bf8a2e7566399b13204d121f6bf87c7d8510d1a2 SHA256 f07d9403b4267b6d5a379a141771e237baf027e99d2cbb600e10167b2e58d634
57 EBUILD mysql-5.6.2_alpha_pre5.ebuild 3851 RMD160 acdea00ab14deb95ba74704627d7bf3c86cb7dc8 SHA1 a18ab55f074e23da30e505b10fd66ce97b80fcfb SHA256 f308eceb7cc0b3126fc532ffa8304464276a21adef738fcd92a62cf4d4ed38dd
58 -MISC ChangeLog 9160 RMD160 cb9b0050f4dc7016ccbb73267a257cfd77e16612 SHA1 ebc23cd6260f59db8da6e575b00068f0b03e700f SHA256 2587b6bd9ed3a2adeff8ec3349fdab5f45a75460092c765a4e124ad3b2e2a9e0
59 +MISC ChangeLog 9290 RMD160 008fe55938a3640c1a2ce711939e3d5575fb58d8 SHA1 9752e15cf249e0c00bb084cac4bb01eff105b8ad SHA256 f50ffa783955a8c44b531ad6db834032f5050789efeeba019afdc3a603c5810e
60 MISC metadata.xml 1252 RMD160 bb7f7acf92051eba2261f50021af2edd12bd87f4 SHA1 84a869403a9a1f201f369680e48284bf069fa3f4 SHA256 2859b3010d1f2b59600ba9c41c79f0ff53f9bcc8d0ef282d552a768a076c1503
61 ------BEGIN PGP SIGNATURE-----
62 -Version: GnuPG v2.0.19 (GNU/Linux)
63 -
64 -iQIcBAEBAgAGBQJPu3smAAoJEC8ZTXQF1qEPSWQQALaWhcvGEs8EPnRvysbc7ID3
65 -yttqF65YLyQv+4xFA16k6tsWsxOqifW8HwGLKQ5uOK2gz2ajVgtSzJRUrbHff7SG
66 -ebTpAEjTZ8qyrwSKvh4tFrpseCvvutxOnZ08SeXNAorUyKePuJc7R120kNhtaVvU
67 -ebmEDeaWPsjiaTXiwSiqT/YIQ/fDJLERzAaL2yqaxJpyy0OwbyEIgZiqFxZS0Ptw
68 -DaUWTliFDHkY6w5MduMoxD/GsFbNFp6CVpJsmFi9HI6Tf2NTuG20pMFOTCzg4Oma
69 -mFE4ORqSAlt+sy6StQzkIqYn3FyrqpmGlaR4AvOguTQcpu42HRGwQ0e9KGFzNsFX
70 -Wjw8TWNZq8ktUMC9krap6H0HACh9jMjohE7cQBLL4i1yx/IbUaZBLiXZye/NvC2Q
71 -Vpu5Gy5UYWw7DD3oxwODxdFG/ITbaXwAHB9ljK3i203QY6kIzEL3kDkD6dvYcwi0
72 -fPrtYg6/tQ69ChW0X0J4LUmRnPUNoU4s23E2IOWCaY4LPtwjzwCHNf42wvIvqoaX
73 -fkrKiqQSl3TAMtKH0FjRFVEEoW2NdOS5Eer1tWTZakt659a6V6BFX71d7ppf3Nbt
74 -fFIgm4RqH7M7ftvqg503N6x+LifATDwVeCFokMY1p0sDDe49TEkz+wJyJ9dAt2hF
75 -ALVxxNIuZPvKjiKD+cvm
76 -=pX5h
77 ------END PGP SIGNATURE-----
78
79 diff --git a/dev-db/mysql/mysql-5.5.25a.ebuild b/dev-db/mysql/mysql-5.5.25a.ebuild
80 new file mode 100644
81 index 0000000..1dad757
82 --- /dev/null
83 +++ b/dev-db/mysql/mysql-5.5.25a.ebuild
84 @@ -0,0 +1,129 @@
85 +# Copyright 1999-2012 Gentoo Foundation
86 +# Distributed under the terms of the GNU General Public License v2
87 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.14.ebuild,v 1.2 2011/07/14 03:58:44 jmbsvicetto Exp $
88 +
89 +EAPI="4"
90 +
91 +MY_EXTRAS_VER="20120401-2131Z"
92 +MY_PV="${PV//_alpha_pre/-m}"
93 +MY_PV="${MY_PV//_/-}"
94 +
95 +# Build type
96 +BUILD="cmake"
97 +
98 +inherit toolchain-funcs mysql-v2
99 +# only to make repoman happy. it is really set in the eclass
100 +IUSE="$IUSE"
101 +
102 +# Define the mysql-extras source
103 +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
104 +
105 +# REMEMBER: also update eclass/mysql*.eclass before committing!
106 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
107 +
108 +# When MY_EXTRAS is bumped, the index should be revised to exclude these.
109 +EPATCH_EXCLUDE=''
110 +
111 +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
112 +RDEPEND="${RDEPEND}"
113 +
114 +# Please do not add a naive src_unpack to this ebuild
115 +# If you want to add a single patch, copy the ebuild to an overlay
116 +# and create your own mysql-extras tarball, looking at 000_index.txt
117 +
118 +# Official test instructions:
119 +# USE='berkdb -cluster embedded extraengine perl ssl community' \
120 +# FEATURES='test userpriv -usersandbox' \
121 +# ebuild mysql-X.X.XX.ebuild \
122 +# digest clean package
123 +src_test() {
124 +
125 + local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
126 + local retstatus_unit
127 + local retstatus_tests
128 +
129 + # Bug #213475 - MySQL _will_ object strenously if your machine is named
130 + # localhost. Also causes weird failures.
131 + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
132 +
133 + if ! use "minimal" ; then
134 +
135 + if [[ $UID -eq 0 ]]; then
136 + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
137 + fi
138 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
139 +
140 + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
141 + addpredict /this-dir-does-not-exist/t9.MYI
142 +
143 + # Run CTest (test-units)
144 + cmake-utils_src_test
145 + retstatus_unit=$?
146 + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
147 +
148 + # Ensure that parallel runs don't die
149 + export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
150 +
151 + # create directories because mysqladmin might right out of order
152 + mkdir -p "${S}"/mysql-test/var-{tests}{,/log}
153 +
154 + # These are failing in MySQL 5.5 for now and are believed to be
155 + # false positives:
156 + #
157 + # main.information_schema, binlog.binlog_statement_insert_delayed,
158 + # main.mysqld--help-notwin
159 + # fails due to USE=-latin1 / utf8 default
160 + #
161 + # main.mysql_client_test:
162 + # segfaults at random under Portage only, suspect resource limits.
163 + #
164 + # sys_vars.plugin_dir_basic
165 + # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
166 + # instead of MYSQL_LIBDIR/plugin
167 + #
168 + # main.flush_read_lock_kill
169 + # fails because of unknown system variable 'DEBUG_SYNC'
170 + #
171 + # main.openssl_1
172 + # error message changing
173 + # -mysqltest: Could not open connection 'default': 2026 SSL connection
174 + # error: ASN: bad other signature confirmation
175 + # +mysqltest: Could not open connection 'default': 2026 SSL connection
176 + # error: error:00000001:lib(0):func(0):reason(1)
177 + #
178 +
179 + for t in main.mysql_client_test \
180 + binlog.binlog_statement_insert_delayed main.information_schema \
181 + main.mysqld--help-notwin main.flush_read_lock_kill \
182 + sys_vars.plugin_dir_basic main.openssl_1 ; do
183 + mysql-v2_disable_test "$t" "False positives in Gentoo"
184 + done
185 +
186 + # Run mysql tests
187 + pushd "${TESTDIR}"
188 +
189 + # run mysql-test tests
190 + perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
191 + retstatus_tests=$?
192 + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
193 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
194 +
195 + popd
196 +
197 + # Cleanup is important for these testcases.
198 + pkill -9 -f "${S}/ndb" 2>/dev/null
199 + pkill -9 -f "${S}/sql" 2>/dev/null
200 +
201 + failures=""
202 + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
203 + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
204 + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
205 +
206 + [[ -z "$failures" ]] || die "Test failures: $failures"
207 + einfo "Tests successfully completed"
208 +
209 + else
210 +
211 + einfo "Skipping server tests due to minimal build."
212 + fi
213 +}