bump revision and add docs patch from bug #31995

4 files changed, 252 insertions, 3 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index a2cb881669c4..7208d3db5aed 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # 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.75 2003/10/19 22:41:33 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.76 2003/10/26 21:23:29 robbat2 Exp $
+
+*mysql-4.0.15-r1 (26 Oct 2003)
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.15-r1.ebuild:
+  bump revision and add docs patch from bug #31995
 
   20 Oct 2003; Christian Birchinger <joker@gentoo.org> mysql-4.0.14-r2.ebuild:
   Added sparc stable keyword
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1415d82547fe..e51ce9237747 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,13 +2,13 @@ MD5 59bc60d84a04496aec5097ff309ae47c mysql-3.23.57-r1.ebuild 6605
 MD5 230f1fb1b0fedce4997ec435d06675e7 mysql-3.23.56.ebuild 6547
 MD5 379060f10a9dd16b731bb2b82f20e406 mysql-4.0.14-r2.ebuild 7560
 MD5 f0681b3b5b41cd507265d567e1440d91 mysql-4.0.12.ebuild 6773
-MD5 4c91513f5691002a38d2e9d8ca203e3b mysql-4.0.15-r1.ebuild 7682
+MD5 39e3c7ff2e2cdadd676978486e20178e mysql-4.0.15-r1.ebuild 7686
 MD5 4f99ec86879e1aaa642eeb33007d4d76 mysql-4.0.14.ebuild 6909
 MD5 b1716c908bb6b91f9d95929d8882d362 mysql-3.23.52-r1.ebuild 5872
 MD5 cac184b213bfcbbea7e7f17cf787e538 mysql-4.0.14-r1.ebuild 7407
 MD5 6b519e83d68043614f6631e7b098d87c mysql-4.0.13-r4.ebuild 7282
 MD5 a3702a4c1f2b7118dcd12c8157f07009 mysql-3.23.57.ebuild 6550
-MD5 e66e821477442c4bb3dc8ed4c22b6aeb ChangeLog 12365
+MD5 7866014a1102981ef38b908f26e5a2b8 ChangeLog 12367
 MD5 aa1da099f1b75fed40b7e185626f7ad8 mysql-4.0.15.ebuild 7568
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
diff --git a/dev-db/mysql/files/digest-mysql-4.0.15-r1 b/dev-db/mysql/files/digest-mysql-4.0.15-r1
new file mode 100644
index 000000000000..022a6c3697b3
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.15-r1
@@ -0,0 +1 @@
+MD5 a6ce917730e8778ef7c9e1f7b5053b2d mysql-4.0.15.tar.gz 12771603
diff --git a/dev-db/mysql/mysql-4.0.15-r1.ebuild b/dev-db/mysql/mysql-4.0.15-r1.ebuild
new file mode 100644
index 000000000000..95a8875391e9
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.15-r1.ebuild
@@ -0,0 +1,243 @@
+# 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-4.0.15-r1.ebuild,v 1.1 2003/10/26 21:23:29 robbat2 Exp $
+
+inherit eutils
+#to accomodate -laadeedah releases
+NEWP=${P}
+
+SVER=${PV%.*}
+#normal releases:
+SDIR=MySQL-${SVER}
+#for a pre-release:
+#SDIR=MySQL-${SVER}-Pre
+
+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"
+
+KEYWORDS="ia64 ~x86 ~sparc ~ppc ~arm ~amd64 ~hppa"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static readline innodb berkdb tcpd ssl perl debug"
+
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( dev-lang/perl )
+	>=sys-libs/zlib-1.1.3
+	sys-apps/procps
+	>=sys-apps/sed-4"
+PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
+
+warning() {
+	ewarn
+	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
+	ewarn "packages on your system that link with libmysqlclient after the"
+	ewarn "upgrade completes.  To obtain such a list of packages for your"
+	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
+	ewarn
+	sleep 5
+}
+
+pkg_setup() {
+	warning
+}
+
+src_unpack() {
+	if use static && use ssl; then
+		local msg="MySQL does not support building statically with SSL support"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+	unpack ${A} || die
+	cd ${S} || die
+	#required for qmail-mysql
+	patch -p0 < ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
+	#zap startup script messages
+	patch -p1 < ${FILESDIR}/${PN}-4.0.4-install-db-sh.diff || die
+	#zap binary distribution stuff
+	patch -p1 < ${FILESDIR}/${PN}-4.0.14-mysqld-safe-sh.diff || die
+	#for correct hardcoded sysconf directory
+	patch -p1 < ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
+	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || 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
+	# Robert Coie <rac@gentoo.org> 2003.06.12
+	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
+
+	if use tcpd; then
+		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r1-tcpd-vars-fix.diff || die
+	fi
+	# fix buffer overflow in mysql4 prior to 4.0.15 bug #28394
+	[ "$PV" == "4.0.14" ] &&
+		 epatch ${FILESDIR}/mysql-${PV}-security-28394.patch
+}
+
+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 || 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?
+	# this is because it refers to the building of a bundled readline
+	# versus the system copy
+	use readline && myconf="${myconf} --without-readline"
+	use readline || myconf="${myconf} --with-readline"
+
+	use static \
+		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
+		|| myconf="${myconf} --enable-shared --enable-static"
+
+	myconf="${myconf} `use_with tcpd libwrap`"
+	myconf="${myconf} `use_with innodb`"
+
+	use ssl \
+		&& myconf="${myconf} --with-vio --with-openssl" \
+		|| 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"
+
+	#bug fix for #15099, should make this api backward compatible
+	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
+
+	#the compiler flags are as per their "official" spec ;)
+	#CFLAGS="${CFLAGS/-O?/} -O3" \
+	CXXFLAGS="${CXXFLAGS} -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 \
+		--with-embedded-server \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
+
+	#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/mysql.server
+	rm -f ${D}/usr/share/mysql/binary-configure
+	rm -f ${D}/usr/share/mysql/make_binary_distribution
+	rm -f ${D}/usr/share/mysql/mysql-log-rotate
+	rm -f ${D}/usr/share/mysql/{post,pre}install
+	rm -f ${D}/usr/share/mysql/mi_test*
+	rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
+	rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
+	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
+
+	# All of these (ab)use Perl.
+	if ! use perl; then
+		rm -f ${D}/usr/bin/mysql_setpermission
+		rm -rf ${D}/usr/share/mysql/sql-bench
+	fi
+
+	dohtml Docs/*.html
+	rm -f Docs/*.html
+	dodoc README COPYING COPYING.LIB Docs/manual.*
+	docinto conf-samples
+	dodoc support-files/my-*.cnf
+
+	insinto /etc/mysql
+	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
+	doins scripts/mysqlaccess.conf
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mysql-4.0.15.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
+		# changing ownership of newly created databases to mysql.mysql
+		local DATADIR=""
+		if [ -f '/etc/mysql/my.cnf' ] ; then
+			#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+			DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
+		fi
+		if [ -z "${DATADIR}" ]; then
+			DATADIR="/var/lib/mysql/"
+		fi
+		chown -R mysql:mysql ${DATADIR}
+	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
+
+	warning
+}