From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QuNor-00055p-J4 for garchives@archives.gentoo.org; Fri, 19 Aug 2011 12:05:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C7D621C2B9; Fri, 19 Aug 2011 12:04:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0C6F721C2CA for ; Fri, 19 Aug 2011 12:04:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E7611B4090 for ; Fri, 19 Aug 2011 12:04:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BD44080043 for ; Fri, 19 Aug 2011 12:04:41 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <4156b94bde50061a19477e8956a8bb0bd5be4941.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/ChangeLog dev-db/mariadb/Manifest dev-db/mariadb/mariadb-5.2.8.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 4156b94bde50061a19477e8956a8bb0bd5be4941 Date: Fri, 19 Aug 2011 12:04:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: adf12dd8d3a90d6e2d8d0ec4a28c2a5c commit: 4156b94bde50061a19477e8956a8bb0bd5be4941 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Fri Aug 19 12:04:11 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Fri Aug 19 12:04:11 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D4156b94b [dev-db/maria] Bumped to release 5.2.8. (Portage version: 2.2.0_alpha50/git/Linux x86_64, signed Manifest commit = with key BB0E6E98) --- dev-db/mariadb/ChangeLog | 6 ++ dev-db/mariadb/Manifest | 30 ++++--- dev-db/mariadb/mariadb-5.2.8.ebuild | 171 +++++++++++++++++++++++++++++= ++++++ 3 files changed, 193 insertions(+), 14 deletions(-) diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog index ee2868c..ffd423d 100644 --- a/dev-db/mariadb/ChangeLog +++ b/dev-db/mariadb/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*mariadb-5.2.8 (19 Aug 2011) + + 19 Aug 2011; Jorge Manuel B. S. Vicetto + +mariadb-5.2.8.ebuild: + [dev-db/maria] Bumped to release 5.2.8. + 19 Aug 2011; Jorge Manuel B. S. Vicetto mariadb-5.2.7.ebuild, mariadb-5.3.0_beta.ebuild: Added patch by Diego to fix the multiple install of files. diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 0e94f6d..64658f9 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -5,28 +5,30 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7= a6ecaa4e1e4c SHA1 babc799 AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1= 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4= faed7a749d113db285fd2b96d1d337d2b3a77ea4 DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a7210= 7029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f= 7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f6= 4362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387= d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3 +DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca= 58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e= 96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564= 559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d448= 8147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2= f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SH= A256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2f= b526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SH= A256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2= eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d= 0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550 EBUILD mariadb-5.2.7.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd458= 2958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6db= b4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612 +EBUILD mariadb-5.2.8.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd458= 2958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6db= b4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612 EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc= 8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421= a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa -MISC ChangeLog 3492 RMD160 384b8917da6f1c6f72a0cdcfc8deb9cc3495e56d SHA1= 61383793f9c34570730d188249a08c71aaa73fbf SHA256 0e3aa91adf0d46250f01eebe= 1a828240206f3fc164e752dadf1510ea66a7eaed +MISC ChangeLog 3657 RMD160 93916481f5026ceb42ecf83744cf37d43b22f8f6 SHA1= cb08374b233431de689f1be8863a62bc281e46f9 SHA256 8f5887826d4e5db6c96b8c5f= cd6ad567753f24ccd59ad9f9b2f384e79948d6ad MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 S= HA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb9= 4b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) =20 -iQIcBAEBAgAGBQJOTk/+AAoJEC8ZTXQF1qEPNNEQALcRsQs5Oxpwc+pY+zrUsT0X -15ZaNbCwkzksPxj2vziGJUcF59UJOcJBs7Agd3jUoS824aiGCSqTqj1MlQ3EoePb -wdFX60JaRFjxYrAGv/f4CtKwwUC8EJkKGsw6rpHdtTvZko+/mB66y7AtxL/b/J30 -wdUhGKqRCRRgZAtbTr222G8iNOgcxRKJBmPhehSUppf6Qe8RnWH32nKF8HdPQFhB -aifESIczSqQFZpHMXlFh8ofNtBjoDeHNUyQ/L1A/Q/m62hMs8B5zhCZs5mXHsMjv -T0jqSJ+g0KZj8J8VDbrsF4U2Cri+5LaUkPVososZd4cvdlEO8yW0ntJq23kicEXT -RVL58gKicwLx4iI7nK8fhQiIxdqiW61ggFKogkbU8km5HwZ0I/7ds0hpCUK2HCmr -aeosAT6oH7CEXsqE2lwYd0o5ou+8DN1AZBFE52ktUu+7hy+DF7XtgQR7yRfrfj63 -uv8LFVn2MgCqm1wu3SGAqctWZSDTzjpv8zrx9dxWLGiVrhCqAh8jFJLgV9YopahW -jhi/SmjNIKMHV63YKaXHJkWxX/lFIsKWwUGr1XklZqNS+K9v+ERLn/uM6nmDukXk -bLOKD14EU2eVkru9/e4P5oA8PoOLo5pBsKLQB58Ykf/iNJzUtxEAtAmw+1/pdJxd -qtdpDikKgAMBfljIuZSK -=3D0R8T +iQIcBAEBAgAGBQJOTlE7AAoJEC8ZTXQF1qEPiQYP/147kFbb7Sw/uwahk1FXVhWY +uJqICADyRVVWOlFwDDqxlBwO4B0cIBMp4GQHcyDAqXNUiPd/uYVyJ6OjfxGVBl1H +mNtdROnjpG89LwrgxzmrhzP6/XlEfoOffei/LjN2V4Wgbt+kc+MBryYELGAQ6D3v +eNIF1Pf8a+M0uOcG9C2RCKJpiHs9GOiyYdM0ijspbWeX/XKOTJABJKED/gKtveZP +uQGWBzsSwKCA2/7C6i9bYIc8si9PVCeAh0XxAqqofN+P3B9upIYVlQ2qu+ZWrzmr +C+BFeB1ZJ3Uf1bYJLsdUfMAYae1CP+7gd/d6Ze6qRj0WNNr38sWosfbUOn1Mitl1 +/BAmcvL68dryk+Tsgrs4Zzxu5K32DdIZvdUuuRXZOt58XXAMpj07QqeZE/U3udB5 +TzRreyYMc67RBXXz8mhYnKTgMUXEahsFkhE4UH97+Ej+LYsKxkaCumO8c9IptNgP +ViSasoSFylw4Hz9tMOw1tSGtYj1ox2CrWweED8dkOHAAQcVKAwyj3X6W2ZO9i/lW +vH4eSIgulpqjrGdbGOiJoP2SWaAka21GSTgigKZCuDLRmEwYfDDf5AhXjs3M4atk +IJegMRKD3dxdJp7dp9CwzMtq1XOnqzJcnFl9Ga/4seQoFnNccAp7hbyeWKV6bgZH +fcHkkkJ/QgKjMgbGzek5 +=3Dmb22 -----END PGP SIGNATURE----- diff --git a/dev-db/mariadb/mariadb-5.2.8.ebuild b/dev-db/mariadb/mariadb= -5.2.8.ebuild new file mode 100644 index 0000000..76cd16e --- /dev/null +++ b/dev-db/mariadb/mariadb-5.2.8.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +MY_EXTRAS_VER=3D"20110819-0415Z" +EAPI=3D"2" + +# Build system +BUILD=3D"autotools" + +inherit toolchain-funcs mysql-v2 +# only to make repoman happy. it is really set in the eclass +IUSE=3D"$IUSE" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS=3D"~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these= . +EPATCH_EXCLUDE=3D'' + +DEPEND=3D"|| ( >=3Dsys-devel/gcc-3.4.6 >=3Dsys-devel/gcc-apple-4.0 )" +RDEPEND=3D"${RDEPEND}" + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt +src_prepare() { + sed -i \ + -e '/^noinst_PROGRAMS/s/basic-t//g' \ + "${S}"/unittest/mytap/t/Makefile.am + mysql-v2_src_prepare +} + +# Official test instructions: +# USE=3D'berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES=3D'test userpriv -usersandbox' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +src_test() { + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" =3D=3D "localhost" ]] && die "Your machine must NOT be= named localhost" + + emake check || die "make check failed" + if ! use "minimal" ; then + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=3D-userpriv is no longer supported by upst= ream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + cd "${S}" + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + local retstatus_unit + local retstatus_ns + local retstatus_ps + local t + addpredict /this-dir-does-not-exist/t9.MYI + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD=3D"$((${RANDOM} % 100))" + + # The entire 5.0 series has pre-generated SSL certificates, they have + # mostly expired now. ${S}/mysql-tests/std-data/*.pem + # The certs really SHOULD be generated for the tests, so that they are + # not expiring like this. We cannot do so ourselves as the tests look + # closely as the cert path data, and we do not have the CA key to rege= n + # ourselves. Alternatively, upstream should generate them with at leas= t + # 50-year validity. + # + # Known expiry points: + # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 + # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 + # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 + # + # mysql-test/std_data/untrusted-cacert.pem is MEANT to be + # expired/invalid. + case ${PV} in + 5.1.*|5.4.*|5.5.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_k= ey \ + ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ + mysql-v2_disable_test \ + "$t" \ + "These OpenSSL tests break due to expired certificates" + done + ;; + esac + + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade, main.information_schema, + # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers= : + # fails due to USE=3D-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # main.not_partition: + # Failure reason unknown at this time, must resolve before package.mas= k + # removal FIXME + case ${PV} in + 5.1.*|5.2.*|5.4.*|5.5.*) + for t in main.mysql_client_test main.mysql_comments \ + main.mysql_upgrade \ + main.information_schema \ + main.not_partition funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql funcs_1.is_triggers; do + mysql-v2_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + + # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. + # These tests are picking up a 'connect-timeout' config from somewhere= , + # which is not valid, and since it does not have 'loose-' in front of + # it, it's causing a failure + case ${PV} in + 5.1.5*|5.4.*|5.5.*|6*) + for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do + mysql-v2_disable_test "$t" \ + "False positives in Gentoo: connect-timeout" + done + ;; + esac + + use profiling && use community \ + || mysql-v2_disable_test main.profiling \ + "Profiling test needs profiling support" + + if [ "${PN}" =3D=3D "mariadb" ]; then + for t in \ + parts.part_supported_sql_func_ndb \ + parts.partition_auto_increment_ndb ; do + mysql-v2_disable_test $t "ndb not supported in mariadb" + done + fi + + # create directories because mysqladmin might make out of order + mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} + + # We run the test protocols seperately + emake test-unit + retstatus_unit=3D$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + emake test-ns force=3D"--force --vardir=3D${S}/mysql-test/var-ns" + retstatus_ns=3D$? + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + + emake test-ps force=3D"--force --vardir=3D${S}/mysql-test/var-ps" + retstatus_ps=3D$? + [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + + # TODO: + # When upstream enables the pr and nr testsuites, we need those as wel= l. + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + failures=3D"" + [[ $retstatus_unit -eq 0 ]] || failures=3D"${failures} test-unit" + [[ $retstatus_ns -eq 0 ]] || failures=3D"${failures} test-ns" + [[ $retstatus_ps -eq 0 ]] || failures=3D"${failures} test-ps" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES= =3Dusersandbox" + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + else + einfo "Skipping server tests due to minimal build." + fi +}