diff options
author | Francesco Riosa <vivo@gentoo.org> | 2005-08-29 12:55:19 +0000 |
---|---|---|
committer | Francesco Riosa <vivo@gentoo.org> | 2005-08-29 12:55:19 +0000 |
commit | c356cc774640b7456e3d93a3d1b6361a920fea8e (patch) | |
tree | 399a317acbd9dd18cc4a638dee1f04be9038600c /dev-db | |
parent | version bump to newest upstream release -- this release fixes a _lot_ of bugs... (diff) | |
download | historical-c356cc774640b7456e3d93a3d1b6361a920fea8e.tar.gz historical-c356cc774640b7456e3d93a3d1b6361a920fea8e.tar.bz2 historical-c356cc774640b7456e3d93a3d1b6361a920fea8e.zip |
version bump; Added inheritance of eutils for mysql-5.0.* ; Replaced shell from "/bin/false" to "-1" as per bug #103421
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mysql/ChangeLog | 17 | ||||
-rw-r--r-- | dev-db/mysql/Manifest | 90 | ||||
-rw-r--r-- | dev-db/mysql/files/digest-mysql-4.1.14 | 1 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.0.22-r2.ebuild | 4 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.0.22.ebuild | 4 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.0.24.ebuild | 4 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.0.25-r2.ebuild | 4 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.1.13-r1.ebuild | 4 | ||||
-rw-r--r-- | dev-db/mysql/mysql-4.1.14.ebuild | 521 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.0.10_beta.ebuild | 6 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.0.9_beta-r2.ebuild | 6 |
11 files changed, 595 insertions, 66 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index d861a7cd0151..df69510b0f28 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.223 2005/08/19 19:29:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.224 2005/08/29 12:55:19 vivo Exp $ + +*mysql-4.1.14 (29 Aug 2005) + + 29 Aug 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.22.ebuild, + mysql-4.0.22-r2.ebuild, mysql-4.0.24.ebuild, mysql-4.0.25-r2.ebuild, + mysql-4.1.13-r1.ebuild, +mysql-4.1.14.ebuild, mysql-5.0.9_beta-r2.ebuild, + mysql-5.0.10_beta.ebuild: + Version bump + + 29 Aug 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.22.ebuild, + mysql-4.0.22-r2.ebuild, mysql-4.0.24.ebuild, mysql-4.0.25-r2.ebuild, + mysql-4.1.13-r1.ebuild, mysql-5.0.9_beta-r2.ebuild, + mysql-5.0.10_beta.ebuild: + Added inheritance of eutils for mysql-5.0.* + Replaced shell from "/bin/false" to "-1" as per bug #103421 19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> mysql-4.0.25-r2.ebuild: diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index c4d64337cd48..c5f07331f918 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,60 +1,52 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8268c892b7722d5bb7549a8198e8bb23 mysql-4.1.13-r1.ebuild 16285 -MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158 -MD5 4d7e9321374c1b16b872eaadaeb1fed7 mysql-4.0.22-r2.ebuild 9621 -MD5 639937535e13b0640e380c5ce1680809 mysql-4.0.25-r2.ebuild 13778 -MD5 18a1e97d010b0613e9e77fc4500b7011 mysql-5.0.10_beta.ebuild 16658 -MD5 7a2300e4b7c4f1c68d680ea6fa75aab1 mysql-4.0.24.ebuild 9835 -MD5 72f1eb68e70c1bccc2d4972a7e155412 mysql-4.0.22.ebuild 8776 +MD5 26109dc9429cc2fb578813e3dc04bc79 mysql-4.1.14.ebuild 16330 +MD5 d798b2f1ab735fcf347f892581801b8e mysql-5.0.9_beta-r2.ebuild 16659 +MD5 0dfa3f1c8accfc384b42caf169f8948c mysql-4.1.13-r1.ebuild 16277 +MD5 e398d112504a353aa7e7354fe023271f mysql-5.0.10_beta.ebuild 16657 +MD5 d168c71df57729ea0eeadab3c6a59f43 mysql-4.0.22.ebuild 8768 +MD5 c28056421db550a09a548ad1dff517f5 mysql-4.0.22-r2.ebuild 9613 MD5 82eebc79341497bc468d529ecac22ab1 mysql-3.23.58-r1.ebuild 7064 -MD5 e5bb4d4d31cb494ae819101f121d28ce ChangeLog 38527 -MD5 55dfc93b08b3ccdc42599173dc7a691f mysql-5.0.9_beta-r2.ebuild 16660 -MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307 -MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068 -MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603 -MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393 -MD5 a9f61fe89f1a43f6c5a8de100176d2dc files/701_all_test-myisam-geometry.patch 1239 -MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055 +MD5 240fc6da2d2c2d7dd224b147db251f80 mysql-4.0.24.ebuild 9827 +MD5 427ab3979159ae4d1aeb94d6799e4540 ChangeLog 39147 +MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158 +MD5 a9aa919f67cce1bdc4ac44da3d5d85ed mysql-4.0.25-r2.ebuild 13768 +MD5 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta-r2 70 +MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217 +MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295 +MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585 +MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13-r1 66 +MD5 2a38459933c8b182b2b7ee08ac4e4509 files/035_x86_asm-pic-fixes-r2.patch 8162 +MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67 -MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587 -MD5 c5fcb05dcc3f2d093efd55bd96af2423 files/035_x86_asm-pic-fixes-r1.patch 4093 +MD5 49aaf02181386f4a7d8c97c7e21f7d66 files/digest-mysql-5.0.10_beta 71 MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452 -MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662 -MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 -MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557 -MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318 +MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587 MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394 +MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66 MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24 66 +MD5 c3668d812a8ad7ed9a0a3fac57520115 files/digest-mysql-4.1.14 66 +MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452 MD5 9209843349ac5e9560f9ad7450c49769 files/703_all_test-rpl_rotate_logs.patch 802 -MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217 -MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123 -MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187 +MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 +MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055 +MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307 +MD5 46b0857fe11abf1015f0db6da26614ff files/010_all_my-print-defaults-r2.patch 907 MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440 -MD5 49aaf02181386f4a7d8c97c7e21f7d66 files/digest-mysql-5.0.10_beta 71 -MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585 -MD5 2a38459933c8b182b2b7ee08ac4e4509 files/035_x86_asm-pic-fixes-r2.patch 8162 +MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231 +MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366 MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240 -MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816 -MD5 46b0857fe11abf1015f0db6da26614ff files/010_all_my-print-defaults-r2.patch 907 -MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295 -MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465 -MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r2 66 -MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66 -MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271 +MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393 +MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318 +MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068 +MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557 MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218 -MD5 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta-r2 70 -MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366 -MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231 +MD5 a9f61fe89f1a43f6c5a8de100176d2dc files/701_all_test-myisam-geometry.patch 1239 MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905 +MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662 +MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123 +MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465 +MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603 +MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816 +MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66 -MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13-r1 66 -MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDB+MtgIKl8Uu19MoRAs+DAJ4yIFAGIQhuKY/qxAg2FGgp1N8oKwCffdEk -PizmlPLjE4IWDCxuQ63Z+iw= -=iyJK ------END PGP SIGNATURE----- +MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r2 66 +MD5 c5fcb05dcc3f2d093efd55bd96af2423 files/035_x86_asm-pic-fixes-r1.patch 4093 diff --git a/dev-db/mysql/files/digest-mysql-4.1.14 b/dev-db/mysql/files/digest-mysql-4.1.14 new file mode 100644 index 000000000000..d30c902ffc6e --- /dev/null +++ b/dev-db/mysql/files/digest-mysql-4.1.14 @@ -0,0 +1 @@ +MD5 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz 17074439 diff --git a/dev-db/mysql/mysql-4.0.22-r2.ebuild b/dev-db/mysql/mysql-4.0.22-r2.ebuild index 5060feb09064..8bf8846dfee2 100644 --- a/dev-db/mysql/mysql-4.0.22-r2.ebuild +++ b/dev-db/mysql/mysql-4.0.22-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.22 2005/07/26 17:14:23 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.23 2005/08/29 12:55:19 vivo Exp $ inherit eutils gnuconfig #to accomodate -laadeedah releases @@ -269,7 +269,7 @@ pkg_config() { pkg_preinst() { enewgroup mysql 60 || die "problem adding group mysql" - enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql" + enewuser mysql 60 -1 /var/lib/mysql mysql || die "problem adding user mysql" } pkg_postinst() { diff --git a/dev-db/mysql/mysql-4.0.22.ebuild b/dev-db/mysql/mysql-4.0.22.ebuild index 2c3679d8316d..c971827dfeef 100644 --- a/dev-db/mysql/mysql-4.0.22.ebuild +++ b/dev-db/mysql/mysql-4.0.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.21 2005/07/26 17:14:23 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.22 2005/08/29 12:55:19 vivo Exp $ inherit eutils gnuconfig #to accomodate -laadeedah releases @@ -243,7 +243,7 @@ pkg_config() { pkg_preinst() { enewgroup mysql 60 || die "problem adding group mysql" - enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql" + enewuser mysql 60 -1 /var/lib/mysql mysql || die "problem adding user mysql" } pkg_postinst() { diff --git a/dev-db/mysql/mysql-4.0.24.ebuild b/dev-db/mysql/mysql-4.0.24.ebuild index b91d98489cf3..63c07f11cbc2 100644 --- a/dev-db/mysql/mysql-4.0.24.ebuild +++ b/dev-db/mysql/mysql-4.0.24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24.ebuild,v 1.15 2005/07/26 17:14:23 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.24.ebuild,v 1.16 2005/08/29 12:55:19 vivo Exp $ inherit eutils gnuconfig #to accomodate -laadeedah releases @@ -277,7 +277,7 @@ pkg_config() { pkg_preinst() { enewgroup mysql 60 || die "problem adding group mysql" - enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql" + enewuser mysql 60 -1 /var/lib/mysql mysql || die "problem adding user mysql" } pkg_postinst() { diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild index 3568c87f0272..43c4426668d4 100644 --- a/dev-db/mysql/mysql-4.0.25-r2.ebuild +++ b/dev-db/mysql/mysql-4.0.25-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.11 2005/08/21 02:12:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.12 2005/08/29 12:55:19 vivo Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -239,7 +239,7 @@ src_install() { make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die enewgroup mysql 60 || die "problem adding group mysql" - enewuser mysql 60 /bin/false /dev/null mysql \ + enewuser mysql 60 -1 /dev/null mysql \ || die "problem adding user mysql" diropts "-m0750" diff --git a/dev-db/mysql/mysql-4.1.13-r1.ebuild b/dev-db/mysql/mysql-4.1.13-r1.ebuild index 482ac4c27dab..5c3901324fd6 100644 --- a/dev-db/mysql/mysql-4.1.13-r1.ebuild +++ b/dev-db/mysql/mysql-4.1.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.4 2005/08/18 00:47:43 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.5 2005/08/29 12:55:19 vivo Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -281,7 +281,7 @@ src_install() { make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die enewgroup mysql 60 || die "problem adding group mysql" - enewuser mysql 60 /bin/false /dev/null mysql \ + enewuser mysql 60 -1 /dev/null mysql \ || die "problem adding user mysql" diropts "-m0750" diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild new file mode 100644 index 000000000000..f6c3456a0c68 --- /dev/null +++ b/dev-db/mysql/mysql-4.1.14.ebuild @@ -0,0 +1,521 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.1 2005/08/29 12:55:19 vivo Exp $ + +inherit eutils gnuconfig flag-o-matic versionator + +SVER=${PV%.*} +PLV="" +NEWP="${PN}-${SVER}.$( get_version_component_range 3-3 )${PLV}" + +# shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/${PN}" + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +HOMEPAGE="http://www.mysql.com/" +SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64" +IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd cluster utf8 geometry extraengine big-tables" +RESTRICT="primaryuri" + +DEPEND="readline? ( >=sys-libs/readline-4.1 ) + bdb? ( sys-apps/ed ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 ) + ssl? ( >=dev-libs/openssl-0.9.6d ) + perl? ( dev-lang/perl ) + >=sys-libs/zlib-1.2.3 + >=sys-apps/texinfo-4.7-r1 + sys-process/procps + >=sys-apps/sed-4" +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )" +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" + +mysql_upgrade_error() { + mysql_get_datadir + ewarn "Sorry plain upgrade from version of MySQL before 4.1.4 is NOT supported." + ewarn "Be sure to read \"Upgrading from version 4.0 to 4.1\" section" + ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html" + ewarn "then unmerge previous version of MySQL with" + ewarn "#emerge -C dev-db/mysql" + ewarn "move your data out of \"${DATADIR}\"" + ewarn "#emerge =dev-db/${P}" + ewarn "reload data you dumped with \"mysqldump\" Because you have read " + ewarn "the documentation on how to upgrade" + ewarn "" + ewarn "You can also choose to preview some new MySQL 4.1 behaviour" + ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\"" + ewarn "into /etc/mysql/my.cnf (you need a recent MySQL version)" +} + +mysql_upgrade_warning() { + ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you" + ewarn "must recompile the other packages on your system that link with" + ewarn "libmysqlclient after the upgrade completes. To obtain such a list" + ewarn "of packages for your system, you may use 'revdep-rebuild' from" + ewarn "app-portage/gentoolkit." +} + +mysql_get_datadir() { + DATADIR="" + if [ -f '/etc/mysql/my.cnf' ] ; then + #DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'` + #DATADIR=`/usr/sbin/mysqld --help |grep '^datadir' | awk '{print $2}'` + #DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'` + DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1` + fi + if [ -z "${DATADIR}" ]; then + DATADIR="/var/lib/mysql/" + einfo "Using default DATADIR" + fi + einfo "MySQL DATADIR is ${DATADIR}" + + if [ -z "${PREVIOUS_DATADIR}" ] ; then + if [ -a "${DATADIR}" ] ; then + ewarn "Previous datadir found, it's YOUR job to change" + ewarn "ownership and have care of it" + PREVIOUS_DATADIR="yes" + export PREVIOUS_DATADIR + else + PREVIOUS_DATADIR="no" + export PREVIOUS_DATADIR + fi + fi + + export DATADIR +} + +pkg_setup() { + mysql_get_datadir + if ! useq minimal ; then + if has_version "<=dev-db/mysql-4.1.4" \ + && ! built_with_use dev-db/mysql minimal \ + && [ -d "${DATADIR}/mysql" ]; then + mysql_upgrade_error + die + fi + fi + mysql_upgrade_warning +} + +src_unpack() { + if use static && use ssl; then + local msg="MySQL does not support building statically with SSL support" + eerror "${msg}" + die "${msg}" + fi + + if useq cluster || useq geometry || useq extraengine && useq minimal; then + die "USEs cluster, geometry, extraengine conflicts with \"minimal\"" + fi + + unpack ${A} || die + + mv "${WORKDIR}/${NEWP}" "${S}" + cd "${S}" + + # for correct hardcoded sysconf directory + epatch "${FILESDIR}/${PN}-4.0-my-print-defaults.diff" + + # attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled + # i would really prefer to fix this at the Makefile.am level, but can't + # get the software to autoreconf as distributed - too many missing files + epatch "${FILESDIR}/${PN}-4.1.9-thrssl.patch" + + # FIXED upstrem in 4.1.14 + # PIC fixes + # bug #42968 + #epatch "${FILESDIR}/035_x86_asm-pic-fixes-r3.patch" + + if use tcpd; then + epatch "${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff" + fi + + # FIXED upstrem in 4.1.14 + # avoid error running src_test and not enabling geometry USE flag + #useq geometry || epatch "${FILESDIR}/${PN}-test-myisam-geometry.patch" + + for d in ${S} ${S}/innobase; do + cd ${d} + # WARNING, plain autoconf breaks it! + #autoconf + # must use this instead + WANT_AUTOCONF="2.59" autoreconf --force + # Fix the evil "libtool.m4 and ltmain.sh have a version mismatch!" + libtoolize --copy --force + # Saving this for a rainy day, in case we need it again + #WANT_AUTOMAKE=1.7 automake + gnuconfig_update + done + + ## Should be fixed in 4.1.12 + # upstream bug http://bugs.mysql.com/bug.php?id=7971 + # names conflict with stuff in 2.6.10 kernel headers + #sed -i.orig \ + # -e "s/\<set_bit\>/my__set_bit/g" \ + # -e "s/\<clear_bit\>/my__clear_bit/g" \ + # ${S}/client/mysqltest.c || die "Failed to fix bitops" + +} + +src_compile() { + local myconf + + # readline pair reads backwards on purpose, DONT change it around, Ok? + # this is because it refers to the building of a bundled readline + # versus the system copy + use readline && myconf="${myconf} --without-readline" + use readline || myconf="${myconf} --with-readline" + + use static \ + && myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \ + || myconf="${myconf} --enable-shared --enable-static" + + myconf="${myconf} `use_with tcpd libwrap`" + + use ssl \ + && myconf="${myconf} --with-vio --with-openssl" \ + || myconf="${myconf} --without-openssl" + + if use debug; then + myconf="${myconf} --with-debug=full" + else + myconf="${myconf} --without-debug" + use cluster && myconf="${myconf} --without-ndb-debug" + fi + + # benchmarking stuff needs perl + # and shouldn't be bothered with on minimal builds + if useq perl && ! useq minimal; then + myconf="${myconf} --with-bench" + else + myconf="${myconf} --without-bench" + fi + + # these are things we exclude from a minimal build + # note that the server actually does get built and installed + # but we then delete it before packaging. + local minimal_exclude_list="server embedded-server extra-tools innodb raid" + if ! useq minimal; then + for i in ${minimal_exclude_list}; do + myconf="${myconf} --with-${i}" + done + + if useq utf8; then + myconf="${myconf} --with-charset=utf8 --with-collation=utf8_general_ci" + else + myconf="${myconf} --with-charset=latin1 --with-collation=latin1_swedish_ci" + fi + + # lots of chars + myconf="${myconf} --with-extra-charsets=all" + + #The following fix is due to a bug with bdb on sparc's. See: + #http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 + # it comes down to non-64-bit safety problems + if useq sparc || useq alpha || useq hppa || useq mips || useq amd64 + then + myconf="${myconf} --without-berkeley-db" + else + use berkdb \ + && myconf="${myconf} --with-berkeley-db=./bdb" \ + || myconf="${myconf} --without-berkeley-db" + fi + myconf="${myconf} $(use_with geometry) $(use_with cluster ndbcluster)" + myconf="${myconf} $(use_with big-tables)" + else + for i in ${minimal_exclude_list}; do + myconf="${myconf} --without-${i}" + done + myconf="${myconf} --without-berkeley-db" + myconf="${myconf} --with-extra-charsets=none" + fi + + # documentation + myconf="${myconf} `use_with doc docs`" + + if useq extraengine; then + # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html + myconf="${myconf} --with-archive-storage-engine" + # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html + myconf="${myconf} --with-csv-storage-engine" + # http://dev.mysql.com/doc/mysql/en/federated-description.html + # http://dev.mysql.com/doc/mysql/en/federated-limitations.html + #if version_is_at_least "5.1.3" ; then + # einfo "before to use federated engine be sure to read" + # einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html" + # myconf="${myconf} --with-federated-storage-engine" + #fi + myconf="${myconf} --with-blackhole-storage-engine" + fi + + #glibc-2.3.2_pre fix; bug #16496 + append-flags "-DHAVE_ERRNO_AS_DEFINE=1" + + #the compiler flags are as per their "official" spec ;) + #CFLAGS="${CFLAGS/-O?/} -O3" \ + export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" + + econf \ + --libexecdir=/usr/sbin \ + --sysconfdir=/etc/mysql \ + --localstatedir=/var/lib/mysql \ + --with-low-memory \ + --enable-assembler \ + --enable-local-infile \ + --with-mysqld-user=mysql \ + --with-client-ldflags=-lstdc++ \ + --enable-thread-safe-client \ + --with-comment="Gentoo Linux ${PF}" \ + --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ + --with-zlib-dir=/usr \ + --with-lib-ccflags="-fPIC" \ + ${myconf} || die "bad ./configure" + + emake || die "compile problem" +} + +src_install() { + make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die + + enewgroup mysql 60 || die "problem adding group mysql" + enewuser mysql 60 -1 /dev/null mysql \ + || die "problem adding user mysql" + + diropts "-m0750" + if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then + dodir "${DATADIR}" + keepdir "${DATADIR}" + chown -R mysql:mysql "${D}/${DATADIR}" + fi + + dodir /var/log/mysql + + diropts "-m0755" + dodir /var/run/mysqld + + keepdir /var/run/mysqld /var/log/mysql + chown -R mysql:mysql \ + ${D}/var/run/mysqld \ + ${D}/var/log/mysql + + # move client libs, install a couple of missing headers + local lib=$(get_libdir) + mv ${D}/usr/${lib}/mysql/libmysqlclient*.so* ${D}/usr/${lib} + dosym ../libmysqlclient.so /usr/${lib}/mysql/libmysqlclient.so + dosym ../libmysqlclient_r.so /usr/${lib}/mysql/libmysqlclient_r.so + insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h} + + # convenience links + dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze + dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair + dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize + + # various junk + rm -f ${D}/usr/bin/make*distribution + rm -f ${D}/usr/share/mysql/make_*_distribution + rm -f ${D}/usr/share/mysql/mysql.server + rm -f ${D}/usr/share/mysql/binary-configure + rm -f ${D}/usr/share/mysql/mysql-log-rotate + rm -f ${D}/usr/share/mysql/{post,pre}install + rm -f ${D}/usr/share/mysql/mi_test* + rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk + rm -f ${D}/usr/share/mysql/*.plist # Apple gunk + rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere + + # All of these (ab)use Perl. + if ! use perl; then + rm -f ${D}/usr/bin/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission} + rm -f ${D}/usr/bin/mysqlhotcopy + rm -rf ${D}/usr/share/mysql/sql-bench + fi + + # clean up stuff for a minimal build + # this is anything server-specific + if useq minimal; then + rm -rf ${D}/usr/share/mysql/{mysql-test,sql-bench} + rm -f ${D}/usr/bin/{mysql_install_db,mysqlmanager*,mysql_secure_installation,mysql_fix_privilege_tables,mysqlhotcopy,mysql_convert_table_format,mysqld_multi,mysql_fix_extensions,mysql_zap,mysql_explain_log,mysql_tableinfo,mysqld_safe,myisam*,isam*,mysql_install,mysql_waitpid,mysqlbinlog,mysqltest,pack_isam} + rm -f ${D}/usr/sbin/mysqld + rm -f ${D}/usr/lib/mysql/lib{heap,merge,nisam,mysys,mystrings,mysqld,myisammrg,vio,dbug,myisam}.a + fi + + # config stuff + insinto /etc/mysql + doins scripts/mysqlaccess.conf + + newins "${FILESDIR}/my.cnf-4.1" my.cnf + + if ! use utf8; then + sed -i -e "s/utf8/latin1/" ${D}/etc/mysql/my.cnf + fi + + # minimal builds don't have the server + if ! useq minimal; then + exeinto /etc/init.d + newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate.mysql" mysql + fi + + # docs + dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE + # minimal builds don't have the server + if useq doc && ! useq minimal; then + dohtml Docs/*.html + dodoc Docs/manual.{txt,ps} + docinto conf-samples + dodoc support-files/my-*.cnf + fi +} + +src_test() { + cd ${S} + einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" + make check || die "make check failed" + if ! useq minimal; then + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + local retstatus + addpredict /this-dir-does-not-exist/t9.MYI + make test + retstatus=$? + + # to be sure ;) + pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null + pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null + pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null + pkill -9 -f ${S}/sql/mysqld 2>/dev/null + [[ $retstatus == 0 ]] || die "make test failed" + else + einfo "Skipping server tests due to minimal build." + fi +} + +pkg_config() { + mysql_get_datadir + + if built_with_use dev-db/mysql minimal; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ "$(pgrep mysqld)" != "" ]] ; then + die "Oops you already have a mysql daemon running!" + fi + + local pwd1="a" + local pwd2="b" + local maxtry=5 + + if [[ -d "${DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "Please rename it or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + einfo "Creating the mysql database and setting proper" + einfo "permissions on it..." + + einfo "Insert a password for the mysql 'root' user" + ewarn "the password will be visible on the screen" + + echo -n " >" && read -r pwd1 + einfo "Check the password" + echo -n " >" && read -r pwd2 + + if (( pwd1 != pwd2 )) ; then + die "Passwords are not the same" + fi + + ${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed" + + # MySQL 5.0 don't need this + chown -R mysql:mysql ${DATADIR} + chmod 0750 ${ROOT}/${DATADIR} + + local sqltmp="$(emktemp)" + local help_tables="${ROOT}/usr/share/mysql/fill_help_tables.sql" + # Filling timezones, see + # http://dev.mysql.com/doc/mysql/en/time-zone-support.html + ${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share/zoneinfo > "${sqltmp}" + + if [[ -r "${help_tables}" ]] ; then + cat "${help_tables}" >> "${sqltmp}" + fi + + local socket=${ROOT}/var/run/mysqld/mysqld.sock + local mysqld="${ROOT}/usr/sbin/mysqld \ + --skip-grant-tables \ + --basedir=${ROOT}/usr \ + --datadir=${ROOT}/var/lib/mysql \ + --skip-innodb \ + --skip-bdb \ + --skip-ndbcluster \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --socket=${socket} \ + --pid-file=${ROOT}/var/run/mysqld/mysqld.pid" + + $mysqld & + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] + do + maxtry=$(($maxtry-1)) + echo -n "." + sleep 1 + done + + # do this from memory we don't want clear text password in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" + ${ROOT}/usr/bin/mysql \ + --socket=${ROOT}/var/run/mysqld/mysqld.sock \ + -hlocalhost \ + -e "${sql}" + + einfo "Loading \"zoneinfo\" this step may require few seconds" + + ${ROOT}/usr/bin/mysql \ + --socket=${socket} \ + -hlocalhost \ + -uroot \ + -p"${pwd1}" \ + mysql < "${sqltmp}" + + kill $( cat ${ROOT}/var/run/mysqld/mysqld.pid ) + rm "${sqltmp}" + einfo "done" +} + +pkg_postinst() { + mysql_get_datadir + + if ! useq minimal; then + #empty dirs... + [[ "${PREVIOUS_DATADIR}" != "yes" ]] \ + && [ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql + [ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld + [ -d "${ROOT}/var/log/mysql" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql + + # secure the logfiles... does this bother anybody? + touch ${ROOT}/var/log/mysql/mysql.{log,err} + chown mysql:mysql ${ROOT}/var/log/mysql/mysql* + chmod 0660 ${ROOT}/var/log/mysql/mysql* + # secure some directories + chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR} + + # your friendly public service announcement... + einfo + einfo "You might want to run:" + einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\"" + einfo "if this is a new install." + einfo + if [[ "${PREVIOUS_DATADIR}" == "yes" ]] ; then + ewarn "Previous datadir found, it's YOUR job to change" + ewarn "ownership and have care of it" + fi + fi + + mysql_upgrade_warning + einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream." +} diff --git a/dev-db/mysql/mysql-5.0.10_beta.ebuild b/dev-db/mysql/mysql-5.0.10_beta.ebuild index 8cfa58a28758..8a595af20669 100644 --- a/dev-db/mysql/mysql-5.0.10_beta.ebuild +++ b/dev-db/mysql/mysql-5.0.10_beta.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.10_beta.ebuild,v 1.2 2005/08/18 00:47:43 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.10_beta.ebuild,v 1.3 2005/08/29 12:55:19 vivo Exp $ -inherit flag-o-matic versionator +inherit eutils flag-o-matic versionator SVER=${PV%.*} NEWP="${PN}-${PV}" @@ -295,7 +295,7 @@ src_install() { make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die enewgroup mysql 60 || die "problem adding group mysql" - enewuser mysql 60 /bin/false /dev/null mysql \ + enewuser mysql 60 -1 /dev/null mysql \ || die "problem adding user mysql" diropts "-m0750" diff --git a/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild b/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild index a27df00d18d2..57eac6ae4465 100644 --- a/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild +++ b/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild,v 1.4 2005/08/18 00:47:43 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild,v 1.5 2005/08/29 12:55:19 vivo Exp $ -inherit flag-o-matic versionator +inherit eutils flag-o-matic versionator SVER=${PV%.*} NEWP="${PN}-${PV}" @@ -295,7 +295,7 @@ src_install() { make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die enewgroup mysql 60 || die "problem adding group mysql" - enewuser mysql 60 /bin/false /dev/null mysql \ + enewuser mysql 60 -1 /dev/null mysql \ || die "problem adding user mysql" diropts "-m0750" |