chase latest

4 files changed, 227 insertions, 1 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index f93f673b3b81..179a42eaf4f3 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for home/mysql
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.23 2002/11/20 05:26:07 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.24 2002/11/29 11:00:00 woodchip Exp $
+
+*mysql-4.0.5_beta (29 Nov 2002)
+
+  29 Nov 2002; Donny Davies <woodchip@gentoo.org> : Chase latest.
+  Closes #11011, #11233.  The new initscript still needs to be synced with
+  the old one.
 
   03 Nov 2002; Nicholas Henke <roughneck@gentoo.org> mysql-3.23.52-r2.ebuild  :
   added ppc to keywords
diff --git a/dev-db/mysql/files/digest-mysql-4.0.5_beta b/dev-db/mysql/files/digest-mysql-4.0.5_beta
new file mode 100644
index 000000000000..163b15a4194e
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.5_beta
@@ -0,0 +1 @@
+MD5 704248e039d853078630eba97cf617ba mysql-4.0.5a-beta.tar.gz 11990584
diff --git a/dev-db/mysql/files/mysql-4.0.4-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0.4-install-db-sh.diff
new file mode 100644
index 000000000000..a5c23fd7607c
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.4-install-db-sh.diff
@@ -0,0 +1,39 @@
+--- mysql-4.0.4_beta/scripts/mysql_install_db.sh.orig	2002-11-20 12:59:08.000000000 -0500
++++ mysql-4.0.4_beta/scripts/mysql_install_db.sh	2002-11-20 13:00:11.000000000 -0500
+@@ -327,16 +327,11 @@
+ END_OF_DATA
+ then
+   echo ""
+-  if test "$IN_RPM" -eq 0
+-  then
+-    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
+-    echo "to the right place for your system"
+-    echo
+-  fi
+   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
+   echo "This is done with:"
+-  echo "$bindir/mysqladmin -u root password 'new-password'"
++  echo "/etc/init.d/mysql start (you have to start the server first!)"
+   echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
++  echo "$bindir/mysqladmin -u root password 'new-password'"
+   echo "See the manual for more instructions."
+   #
+   # Print message about upgrading unless we have created a new db table.
+@@ -348,15 +343,6 @@
+     echo "able to use the new GRANT command!"
+   fi
+   echo
+-  if test "$IN_RPM" -eq 0
+-  then
+-    echo "You can start the MySQL daemon with:"
+-    echo "cd @prefix@ ; $bindir/mysqld_safe &"
+-    echo
+-    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
+-    echo "cd sql-bench ; perl run-all-tests"
+-    echo
+-  fi
+   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+   echo
+   echo "The latest information about MySQL is available on the web at"
+
+
diff --git a/dev-db/mysql/mysql-4.0.5_beta.ebuild b/dev-db/mysql/mysql-4.0.5_beta.ebuild
new file mode 100644
index 000000000000..7d5e2057c8ca
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.5_beta.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.5_beta.ebuild,v 1.1 2002/11/29 11:00:00 woodchip Exp $
+
+#mysql-4.0.5a_beta.ebuild:
+# -->!!! Name error in 4.0.5a_beta: characters before _ must be numeric
+#this is cuckoo; fixme next release...
+NEWP=mysql-4.0.5a-beta
+
+IUSE="static readline innodb berkdb tcpd ssl"
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+HOMEPAGE="http://www.mysql.com/"
+
+SVER=${PV%.*}
+#normal releases:
+SDIR=MySQL-${SVER}
+#for a pre-release:
+#SDIR=MySQL-${SVER}-Pre
+
+S=${WORKDIR}/${NEWP}
+SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${NEWP}.tar.gz
+	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
+
+#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.
+
+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"
+KEYWORDS="~x86 ~sparc64 ~ppc"
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	#required for qmail-mysql
+	patch -p0 < ${FILESDIR}/mysql-4.0-nisam.h.diff || die
+	#zap startup script messages
+	patch -p1 < ${FILESDIR}/mysql-4.0.4-install-db-sh.diff || die
+	#zap binary distribution stuff
+	patch -p1 < ${FILESDIR}/mysql-4.0-mysqld-safe-sh.diff || die
+	#for correct hardcoded sysconf directory
+	patch -p1 < ${FILESDIR}/mysql-4.0-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
+	if use sparc || use sparc64; then
+		myconf="${myconf} --without-berkeley-db"
+	else
+		use berkdb && myconf="${myconf} --with-berkeley-db=./bdb"
+		use berkdb || 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"
+
+	emake || 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
+
+	dodoc README COPYING COPYING.LIB MIRRORS Docs/{manual.ps,manual.txt}
+	docinto conf-samples ; dodoc support-files/my-*.cnf
+	dohtml -r Docs/*
+
+	insinto /etc/mysql
+	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mysql-4.0.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
+}
+
+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
+}