version bump.

4 files changed, 198 insertions, 1 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 65330d15714c..f038fcedf505 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.110 2004/06/29 17:36:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.111 2004/07/05 00:04:05 robbat2 Exp $
+
+*mysql-3.23.58 (04 Jul 2004)
+
+  04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-3.23.58.ebuild:
+  version bump.
 
   29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysql-3.23.52-r1.ebuild,
   mysql-3.23.56.ebuild, mysql-3.23.57-r1.ebuild, mysql-3.23.57.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8ff1f4cb06c4..f31d4117978a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -5,6 +5,7 @@ MD5 4ef3ef3898ba2d07e8bde1f8bc4a9e2b mysql-4.0.14-r2.ebuild 7555
 MD5 d17e99dea8deb7f23510ab224f09f7a9 mysql-4.0.17.ebuild 7939
 MD5 74194a77362fc74a238f1e05a3506f5f mysql-4.0.12.ebuild 6751
 MD5 6204372a85124c9a0eaba94b47e3dd40 mysql-4.0.15-r1.ebuild 7678
+MD5 2193bc621b968832d3ae0c9766ca69e0 mysql-3.23.58.ebuild 6492
 MD5 fa83fdcb6761b293a7f658f0807cac0c mysql-4.0.19.ebuild 7917
 MD5 7edf29c2f472ff1f418526e6be2d7abb mysql-4.0.14.ebuild 6903
 MD5 f57faf79f4ad744991e5d6e76ca45edc mysql-3.23.52-r1.ebuild 5851
@@ -57,6 +58,7 @@ MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
 MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
 MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
 MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
+MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
 MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
 MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
 MD5 4c36e60ff941b21103df0acf1e6985b7 files/my.cnf-4.0.14-r1 2812
diff --git a/dev-db/mysql/files/digest-mysql-3.23.58 b/dev-db/mysql/files/digest-mysql-3.23.58
new file mode 100644
index 000000000000..36384becd475
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-3.23.58
@@ -0,0 +1 @@
+MD5 835a96c86132fbde0db36db60c5b34cd mysql-3.23.58.tar.gz 12039843
diff --git a/dev-db/mysql/mysql-3.23.58.ebuild b/dev-db/mysql/mysql-3.23.58.ebuild
new file mode 100644
index 000000000000..4e2938a0ec93
--- /dev/null
+++ b/dev-db/mysql/mysql-3.23.58.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58.ebuild,v 1.1 2004/07/05 00:04:05 robbat2 Exp $
+
+inherit flag-o-matic eutils
+
+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"
+KEYWORDS="~x86 ~sparc ~alpha ~hppa ~ppc"
+IUSE="berkdb debug innodb perl readline ssl static tcpd"
+
+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
+	dev-lang/perl
+	sys-apps/procps"
+PDEPEND="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
+	#epatch ${FILESDIR}/mysql-4.0.14-security-28394.patch
+}
+
+src_compile() {
+	# bug #11681; get b0rked code when using -march=k6 with this package.
+	replace-cpu-flags i586 k6 k6-2 k6-3
+
+	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 alpha || use hppa
+	then
+		myconf="${myconf} --without-berkeley-db"
+	else
+		use berkdb && myconf="${myconf} --with-berkeley-db=./bdb" \
+			|| myconf="${myconf} --without-berkeley-db"
+	fi
+	#readline pair reads backwards on purpose, DONT change it around, Ok?
+	use readline && myconf="${myconf} --without-readline"
+	use readline || myconf="${myconf} --with-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"
+	myconf="${myconf} `use_with debug`"
+
+	#glibc-2.3.2_pre fix; bug #16496
+	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
+	export CXXFLAGS="${CXXFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
+
+	# 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 \
+		--enable-local-infile \
+		--with-mysqld-user=mysql \
+		--with-extra-charsets=all \
+		--enable-thread-safe-client \
+		--with-client-ldflags=-lstdc++ \
+		--with-comment="Gentoo Linux ${PF}" \
+		--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
+
+	# various junk
+	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
+
+	#hmm what about all the very nice benchmark/test scripts
+	#in /usr/share/mysql/sql-bench
+	if ! use perl; then
+		rm -f ${D}/usr/bin/mysql_setpermission
+	fi
+
+	dodoc README 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
+}