diff options
Diffstat (limited to 'dev-db/mysql/mysql-4.0.22.ebuild')
| -rw-r--r-- | dev-db/mysql/mysql-4.0.22.ebuild | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/dev-db/mysql/mysql-4.0.22.ebuild b/dev-db/mysql/mysql-4.0.22.ebuild index c971827dfeef..eb84d84817d6 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.22 2005/08/29 12:55:19 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.23 2005/09/20 15:29:32 vivo Exp $ inherit eutils gnuconfig #to accomodate -laadeedah releases @@ -16,7 +16,8 @@ S=${WORKDIR}/${NEWP} DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" HOMEPAGE="http://www.mysql.com/" -SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz" +SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz + mirror://gentoo/mysql-extras-20050920.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -59,36 +60,38 @@ src_unpack() { fi unpack ${A} || die + local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras" + #zap startup script messages EPATCH_OPTS="-p1 -d ${S}" \ - epatch ${FILESDIR}/${PN}-4.0.21-install-db-sh.diff + epatch ${MY_PATCH_SOURCE}/${PN}-4.0.21-install-db-sh.diff || die #zap binary distribution stuff EPATCH_OPTS="-p1 -d ${S}" \ - epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff + epatch ${MY_PATCH_SOURCE}/${PN}-4.0.18-mysqld-safe-sh.diff || die #required for qmail-mysql EPATCH_OPTS="-p0 -d ${S}" \ - epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff + epatch ${MY_PATCH_SOURCE}/${PN}-4.0-nisam.h.diff || die #for correct hardcoded sysconf directory EPATCH_OPTS="-p1 -d ${S}" \ - epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff + epatch ${MY_PATCH_SOURCE}/${PN}-4.0-my-print-defaults.diff || die # NPTL support EPATCH_OPTS="-p1 -d ${S}" \ - epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff + epatch ${MY_PATCH_SOURCE}/${PN}-4.0.18-gentoo-nptl.diff || die # 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_OPTS="-p1 -d ${S}" \ - epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch + epatch ${MY_PATCH_SOURCE}/${PN}-4.0.21-thrssl.patch || die if use tcpd; then EPATCH_OPTS="-p1 -d ${S}" \ - epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff + epatch ${MY_PATCH_SOURCE}/${PN}-4.0.14-r1-tcpd-vars-fix.diff || die fi # security fix from http://lists.mysql.com/internals/15185 # gentoo bug #60744 - #EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch + #EPATCH_OPTS="-p1 -d ${S}" epatch ${MY_PATCH_SOURCE}/${PN}-4.0-mysqlhotcopy-security.patch # Already included upstream in 4.0.21 cd ${S} |