bugs #2686, #3210, #3084

3 files changed, 189 insertions, 1 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 216cb0419dec..36ff425b23ae 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.3 2002/05/04 01:58:36 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.4 2002/06/09 03:08:16 woodchip Exp $
+
+*mysql-3.23.50 (8 Jun 2002)
+
+  8 Jun 2002; Donny Davies <woodchip@gentoo.org> :
+
+  This release is still in their -Pre directory but includes many bugfixes.
+  Should fix #2686, #3210, #3084.  Synced up more with AB's spec file.
+  Clean up ebuild a little.
 
 *mysql-3.23.49-r1 (3 May 2002)
 
diff --git a/dev-db/mysql/files/digest-mysql-3.23.50 b/dev-db/mysql/files/digest-mysql-3.23.50
new file mode 100644
index 000000000000..7058c30d5994
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-3.23.50
@@ -0,0 +1 @@
+MD5 43393eae1c59f7fc7a500043fe45f4a8 mysql-3.23.50.tar.gz 11872052
diff --git a/dev-db/mysql/mysql-3.23.50.ebuild b/dev-db/mysql/mysql-3.23.50.ebuild
new file mode 100644
index 000000000000..cea82309495c
--- /dev/null
+++ b/dev-db/mysql/mysql-3.23.50.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.50.ebuild,v 1.1 2002/06/09 03:08:16 woodchip Exp $
+
+SVER=${PV%.*}
+#for normal releases:
+#SDIR=MySQL-${SVER}
+#but 3.23.50 is still pre-release, so:
+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"
+S=${WORKDIR}/${P}
+DEPEND="virtual/glibc
+	readline? ( >=sys-libs/readline-4.1 )
+	berkdb? ( =sys-libs/db-3* =sys-libs/db-1* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=sys-libs/zlib-1.1.3
+	sys-devel/perl
+	sys-apps/procps"
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	# for -ldb-3.2 instead of -ldb, because gentoo has -ldb1 instead
+	patch -p1 < ${FILESDIR}/mysql-3.23-db-3.2.3.diff || 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-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
+	aclocal || die
+	automake || die
+	autoconf || die
+}
+
+src_compile() {
+	local myconf
+	# means use the system readline
+	use readline && myconf="${myconf} --without-readline"
+	use berkdb && myconf="${myconf} --with-berkeley-db --with-berkeley-db-includes=/usr/include/db3 --with-berkeley-db-libs=/usr/lib"
+	use berkdb || myconf="${myconf} --without-berkeley-db"
+	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"
+	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
+	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
+
+	# CXX must be g++ because gcc|c++ does not find /usr/lib/gcc-lib/libstc+++.so.
+	# the compiler flags are needed to address stability issues.
+	CC=gcc \
+	CFLAGS="${CFLAGS/-O?/} -O2" \
+	CXX=g++ \
+	CXXFLAGS="${CXXFLAGS/-O?/} -O2 -felide-constructors -fno-exceptions -fno-rtti" \
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		--exec-prefix=/usr \
+		--datadir=/usr/share \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/mysql \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--includedir=/usr/include \
+		--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="${PF}.ebuild package" \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	make || die "compile problem"
+}
+
+src_install() {
+	dodir /var/lib/mysql /var/run/mysqld /var/log/mysql
+	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
+	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
+
+	dodoc README COPYING COPYING.LIB MIRRORS Docs/{manual.ps,manual.txt}
+	docinto conf-samples ; dodoc support-files/my-*.cnf
+	docinto html ; dodoc Docs/*.html
+
+	insinto /etc/mysql
+	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
+	exeinto /etc/init.d ; newexe ${FILESDIR}/mysql.rc6 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
+
+	# ensure permissions on these just in case...
+	chown -R mysql ${ROOT}/var/lib/mysql ${ROOT}/var/run/mysqld
+}
+
+pkg_postinst() {
+	# /etc/passwd: mysql:x:60:60:mysql:/var/lib/mysql:/dev/null
+	# /etc/group:  mysql:x:60:
+	# creating mysql group if he isn't already there
+	if ! grep -q ^mysql: /etc/group ; then
+		#echo Adding system group: mysql.
+		groupadd -g 60 mysql || die "problem adding group mysql"
+	fi
+
+	# creating mysql user if he isn't already there
+	if ! grep -q ^mysql: /etc/passwd ; then
+		#echo Adding system user: mysql.
+		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		assert "problem adding user mysql"
+	fi
+
+	# modifying him if he was already there
+	usermod -c "mysql" mysql || die "usermod problem"
+	usermod -d "/var/lib/mysql" mysql || die "usermod problem"
+	usermod -g "mysql" mysql || die "usermod problem"
+	usermod -s "/dev/null" mysql || die "usermod problem"
+
+	# ensure sane permissions on existing databases and /var/run/mysqld
+	chown mysql.mysql ${ROOT}/var/lib/mysql ${ROOT}/var/run/mysqld
+	find ${ROOT}/var/lib/mysql -not \( -group root -or -group mysql \) -exec chgrp mysql {} \;
+
+	# get these proper and ready to go
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql.mysql ${ROOT}/var/log/mysql/mysql.{log,err}
+	chmod 0600 ${ROOT}/var/log/mysql/mysql.{log,err}
+
+	einfo
+	einfo "You might want to run:"
+	einfo "\"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "if this is a new install."
+	einfo
+}