From 99fff8f5c5a28118715462c17f8885860463323a Mon Sep 17 00:00:00 2001 From: Robert Coie Date: Wed, 5 Mar 2003 00:17:43 +0000 Subject: fix bug #16301 --- dev-db/mysql/ChangeLog | 9 +- dev-db/mysql/files/digest-mysql-3.23.54a-r1 | 1 + dev-db/mysql/mysql-3.23.54a-r1.ebuild | 200 ++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 dev-db/mysql/files/digest-mysql-3.23.54a-r1 create mode 100644 dev-db/mysql/mysql-3.23.54a-r1.ebuild (limited to 'dev-db') diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 6d28b66e5ca0..4c29970589f0 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.39 2003/03/01 23:38:34 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.40 2003/03/05 00:17:43 rac Exp $ + +*mysql-3.23.54a-r1 (04 Mar 2003) + + 04 Mar 2003; Robert Coie mysql-3.23.54a-r1.ebuild: + Add PDEPENDs on dev-perl/DBI and dev-perl/DBD-mysql, contingent on + USE="perl". If USE="-perl", take /usr/bin/mysql_setpermission out of + the installed files (bug #16301). *mysql-4.0.11a (01 Mar 2003) diff --git a/dev-db/mysql/files/digest-mysql-3.23.54a-r1 b/dev-db/mysql/files/digest-mysql-3.23.54a-r1 new file mode 100644 index 000000000000..811fccc8d6a3 --- /dev/null +++ b/dev-db/mysql/files/digest-mysql-3.23.54a-r1 @@ -0,0 +1 @@ +MD5 4b20909fea3717e42ce113ecb6193d74 mysql-3.23.54a.tar.gz 11397615 diff --git a/dev-db/mysql/mysql-3.23.54a-r1.ebuild b/dev-db/mysql/mysql-3.23.54a-r1.ebuild new file mode 100644 index 000000000000..fb08b6523580 --- /dev/null +++ b/dev-db/mysql/mysql-3.23.54a-r1.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.54a-r1.ebuild,v 1.1 2003/03/05 00:17:43 rac Exp $ + +# bug #11681; get b0rked code when using -march=k6 with this package. +inherit flag-o-matic +replace-flags "-march=k6-3" "-march=i586" +replace-flags "-march=k6-2" "-march=i586" +replace-flags "-march=k6" "-march=i586" + +SVER=${PV%.*} +#normal releases: +SDIR=MySQL-${SVER} +#for a pre-release: +#SDIR=MySQL-${SVER}-Pre + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." +HOMEPAGE="http://www.mysql.com/" +SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz + ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="static readline innodb berkdb tcpd ssl perl" +KEYWORDS="~x86 ~sparc ~alpha ~hppa" + +DEPEND="readline? ( >=sys-libs/readline-4.1 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + ssl? ( >=dev-libs/openssl-0.9.6d ) + >=sys-libs/zlib-1.1.3 + sys-devel/perl + sys-apps/procps" + +# HEY! +# the benchmark stuff in /usr/share/mysql/sql-bench and +# the /usr/bin/mysql_setpermission script need dev-perl/DBD-mysql. +# Can't add it here: circ depend. Emerge it either before or after +# mysql; easier before, then it pulls in mysql. + +# The above problem should be addressed by making dev-perl/DBD-mysql +# and dev-perl/DBI PDEPENDS here. However, in the case where people +# don't want perl things, this seems rather rude, so we shall make +# this PDEPEND only active if USE="perl" is enabled, and will remove +# /usr/bin/mysql_setpermission otherwise. Perhaps in the future, all +# bits that depend on perl could be removed, and the hard DEPEND on +# perl itself could be relaxed, if enough people express interest in +# this. + +PDEPEND="$DEPEND + perl? ( dev-perl/DBI dev-perl/DBD-mysql )" + +src_unpack() { + unpack ${A} || die + cd ${S} || die + # required for qmail-mysql + patch -p0 < ${FILESDIR}/mysql-3.23-nisam.h.diff || die + # zap startup script messages + patch -p1 < ${FILESDIR}/mysql-3.23.52-install-db-sh.diff || die + # zap binary distribution stuff + patch -p1 < ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff || die + # for correct hardcoded sysconf directory + patch -p1 < ${FILESDIR}/mysql-3.23-my-print-defaults.diff || die + #patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die +} + +src_compile() { + local myconf + # 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 + # same for alpha (see http://www.mysql.com/doc/en/BDB_portability.html) + # thanks to peter@icebear.net for noticing this. + if use sparc || use sparc64 || use alpha || use hppa + then + myconf="${myconf} --without-berkeley-db" + else + use berkdb && myconf="${myconf} --with-berkeley-db=./bdb" \ + || myconf="${myconf} --without-berkeley-db" + fi + use readline && myconf="${myconf} --with-readline" + use readline || myconf="${myconf} --without-readline" + use static && myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" + use static || myconf="${myconf} --enable-shared --enable-static" + use tcpd && myconf="${myconf} --with-libwrap" + use tcpd || myconf="${myconf} --without-libwrap" + use innodb && myconf="${myconf} --with-innodb" + use innodb || myconf="${myconf} --without-innodb" + use ssl && myconf="${myconf} --with-vio --with-openssl" + use ssl || myconf="${myconf} --without-openssl" + [ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug" + [ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug" + + # the compiler flags are as per their "official" spec ;-) + einfo "myconf is $myconf" + CFLAGS="${CFLAGS/-O?/} -O3" \ + CXXFLAGS="${CXXFLAGS/-O?/} -O3 -felide-constructors -fno-exceptions -fno-rtti" \ + econf \ + --libexecdir=/usr/sbin \ + --sysconfdir=/etc/mysql \ + --localstatedir=/var/lib/mysql \ + --with-raid \ + --with-low-memory \ + --enable-assembler \ + --with-charset=latin1 \ + --with-mysqld-user=mysql \ + --with-extra-charsets=all \ + --enable-thread-safe-client \ + --with-client-ldflags=-lstdc++ \ + --with-comment="Gentoo ${PF}.ebuild package" \ + --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ + ${myconf} || die "bad ./configure" + + make || die "compile problem" +} + +src_install() { + make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die + + # eeek, not sure whats going on here.. are these needed by anything? +# use innodb && insinto /usr/lib/mysql && doins ${WORKDIR}/../libs/* + + # move client libs, install a couple of missing headers + 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 + + # while my broom gently sweeps... + rm -f ${D}/usr/share/mysql/binary-configure + rm -f ${D}/usr/share/mysql/mysql.server + rm -f ${D}/usr/share/mysql/make_binary_distribution + rm -f ${D}/usr/share/mysql/mi_test_all* + rm -f ${D}/usr/share/mysql/mysql-log-rotate + rm -f ${D}/usr/share/mysql/mysql*.spec + rm -f ${D}/usr/share/mysql/my-*.cnf + + if ! use perl; then + rm -f ${D}/usr/bin/mysql_setpermission + fi + + dodoc README COPYING COPYING.LIB MIRRORS \ + Docs/{manual.ps,manual.txt} + dohtml -r Docs/* + docinto conf-samples + dodoc support-files/my-*.cnf + + insinto /etc/mysql + doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf + exeinto /etc/init.d + newexe ${FILESDIR}/mysql.init mysql +} + +pkg_config() { + if [ ! -d ${ROOT}/var/lib/mysql/mysql ] ; then + einfo "Press ENTER to create the mysql database and set proper" + einfo "permissions on it, or Control-C to abort now..." + read + ${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1 + else + einfo "Hmm, it appears as though you already have the mysql" + einfo "database in place. If you are having problems trying" + einfo "to start mysqld, perhaps you need to manually run" + einfo "/usr/bin/mysql_install_db and/or check your config" + einfo "file(s) and/or database(s) and/or logfile(s)." + fi +} + +pkg_preinst() { + if ! groupmod mysql; then + groupadd -g 60 mysql || die "problem adding group mysql" + fi + + if ! id mysql; then + useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql + assert "problem adding user mysql" + fi +} + +pkg_postinst() { + # empty dirs... + install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql + install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld + 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.{log,err} + chmod 0660 ${ROOT}/var/log/mysql/mysql.{log,err} + + # 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 +} -- cgit v1.2.3-65-gdbad