attempt to make libmysqlclient_r.so link with -lssl when needed

5 files changed, 254 insertions, 5 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 6a3edf2134cc..aa800b12d933 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # 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.52 2003/06/11 23:07:52 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.53 2003/06/12 21:21:21 rac Exp $
+
+*mysql-4.0.13-r3 (12 Jun 2003)
+
+  12 Jun 2003; <rac@gentoo.org> mysql-4.0.13-r3.ebuild,
+  files/mysql-4.0.13-thrssl.patch:
+  Attempt to make libmysqlclient_r.so link with -lssl
 
 *mysql-4.0.13-r2 (11 Jun 2003)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e02f6d6d7bc6..63ba19c0332e 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,13 +1,11 @@
 MD5 873cd30ebb693aa7732628e8d0e83789 mysql-3.23.56.ebuild 6624
 MD5 d95bde38182c7cf31940632ea48d3536 mysql-4.0.12.ebuild 6863
-MD5 0d7df465e5bdc0f6dd456b94ffe234da mysql-4.0.13-r3.ebuild~ 6739
 MD5 8bd70e5ba5708e31ffc18c0d3fcce1fa mysql-3.23.52-r1.ebuild 5952
 MD5 0819a9eff62aada70d80a774ffa440b1 mysql-4.0.13-r2.ebuild 6504
-MD5 d4d14056e9d91fbe3410feadd8b01466 mysql-4.0.13-r2.ebuild~ 6770
 MD5 19a3358517a96512485e9303036706ad mysql-4.0.13.ebuild 6683
 MD5 19b75b0d4e2168fa0a84b8bb814e1601 mysql-4.0.13-r1.ebuild 6517
-MD5 0fe4585f51541e6749a3a35af0878687 ChangeLog 8669
-MD5 2e46cf9136746dd0768e2af250a7a25b mysql-4.0.13-r3.ebuild 6740
+MD5 118ef8b5af720b5fc45fe356743fee98 ChangeLog 8847
+MD5 af6209532e1ced8a5b2b7010a8c1f0b0 mysql-4.0.13-r3.ebuild 6924
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
 MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
@@ -32,3 +30,4 @@ MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
 MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r1 66
 MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r2 66
 MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r3 66
+MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
diff --git a/dev-db/mysql/files/digest-mysql-4.0.13-r3 b/dev-db/mysql/files/digest-mysql-4.0.13-r3
new file mode 100644
index 000000000000..414dd6203f34
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.13-r3
@@ -0,0 +1 @@
+MD5 4bad6dae73f53c16bfcf41c704681059 mysql-4.0.13.tar.gz 12511177
diff --git a/dev-db/mysql/files/mysql-4.0.13-thrssl.patch b/dev-db/mysql/files/mysql-4.0.13-thrssl.patch
new file mode 100644
index 000000000000..bc998e2b0761
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.13-thrssl.patch
@@ -0,0 +1,20 @@
+--- libmysql_r/Makefile.in.orig 2003-06-12 14:01:40.000000000 -0700
++++ libmysql_r/Makefile.in      2003-06-12 14:02:18.000000000 -0700
+@@ -209,7 +209,7 @@
+ CHARSET_OBJS = @CHARSET_OBJS@
+ 
+ target = libmysqlclient_r.la
+-target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
++target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ -DMYSQL_CLIENT
+ 
+ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \
+                -I$(srcdir)/.. -I$(top_srcdir) -I.. $(openssl_includes)
+@@ -320,7 +320,7 @@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @CLIENT_LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/conf_to_src.Po $(DEPDIR)/errmsg.Plo \
+ @AMDEP_TRUE@   $(DEPDIR)/get_password.Plo $(DEPDIR)/libmysql.Plo \
diff --git a/dev-db/mysql/mysql-4.0.13-r3.ebuild b/dev-db/mysql/mysql-4.0.13-r3.ebuild
new file mode 100644
index 000000000000..40e0b7fd1aa8
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.13-r3.ebuild
@@ -0,0 +1,223 @@
+# 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.13-r3.ebuild,v 1.1 2003/06/12 21:21:21 rac Exp $
+
+#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="~x86 ~sparc ~ppc arm"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static readline innodb berkdb tcpd ssl perl"
+
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( dev-lang/perl )
+	>=sys-libs/zlib-1.1.3
+	sys-apps/procps
+	>=sys-apps/sed-4
+	app-admin/gentoolkit"
+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 the: ${FILESDIR}/rebuilder.sh"
+	ewarn "script."
+	ewarn
+	sleep 5
+}
+
+pkg_setup() {
+	warning
+}
+
+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
+
+	# 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}/${P}-thrssl.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 || 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" \
+		|| 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"
+
+	[ -n "${DEBUGBUILD}" ] \
+		&& myconf="${myconf} --with-debug" \
+		|| myconf="${myconf} --without-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"
+
+	# this could well cause problems - trying to update libmysql_r Makefile
+	autoreconf
+
+	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
+
+	dodoc README COPYING COPYING.LIB MIRRORS Docs/manual.*
+	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
+
+	warning
+}