Roll out a temp version of 4.0.22-r1 for testing with bug 65587.
authorRobin H. Johnson <robbat2@gentoo.org>
Thu, 23 Dec 2004 17:36:16 +0000 (17:36 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Thu, 23 Dec 2004 17:36:16 +0000 (17:36 +0000)
dev-db/mysql/ChangeLog
dev-db/mysql/Manifest
dev-db/mysql/files/digest-mysql-4.0.22-r1 [new file with mode: 0644]
dev-db/mysql/mysql-4.0.22-r1.ebuild [new file with mode: 0644]

index 178a298cadc39d3552313b9016ce33b430dc2440..de5857159f9e1ac68915cb963b896e2e747a913e 100644 (file)
@@ -1,6 +1,12 @@
 # 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.150 2004/12/23 10:56:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.151 2004/12/23 17:36:16 robbat2 Exp $
+
+*mysql-4.0.22-r1 (23 Dec 2004)
+
+  23 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-4.0.22-r1.ebuild:
+  Roll out a temp version of 4.0.22-r1 for testing with bug 65587.
 
 *mysql-4.1.8 (23 Dec 2004)
 *mysql-4.0.23 (23 Dec 2004)
index 268cc85417c4a5dc4563375ed37e9aad26b2741f..1e39a7b46dca937b5119480345ce11de194fb8dc 100644 (file)
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 13b377458aedd7a42553fea8f5c45fbb mysql-3.23.57-r1.ebuild 6490
 MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535
+MD5 82d3e6943b48df0128798b8e4bba6fbf mysql-4.0.22-r1.ebuild 8851
 MD5 5e17dff032df6961c2fa804512cb3d4f mysql-4.1.7.ebuild 8381
 MD5 49ebe7c04e4e2971c911ee5e225561ad mysql-3.23.58.ebuild 6489
 MD5 86777976af049d016c3173938a4f4843 mysql-4.0.23.ebuild 8613
@@ -8,7 +12,7 @@ MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538
 MD5 d24e97ec0ef04280cb9176f6cc8fd9ac mysql-4.0.22.ebuild 8337
 MD5 a9990372dc3f4a3323810ad38c9e1752 mysql-3.23.58-r1.ebuild 6607
 MD5 5a368facb704f7494930fb693007b2b4 mysql-4.1.8.ebuild 8660
-MD5 5dc149ce4e4f62328531ca1d0a4db551 ChangeLog 22810
+MD5 78bfdbbf0d1dca0c5e398a3d73d159fd ChangeLog 22990
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
@@ -56,5 +60,14 @@ MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 46
 MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
 MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
 MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
+MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66
 MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
 MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
+
+iD8DBQFBywHdPpIsIjIzwiwRAqtwAJ9Yfk46hlm4DIufDq0YRGlqPvppdACgqVef
+wMrSBh8m/GXkTAjNRnP/Tg4=
+=wpZX
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/digest-mysql-4.0.22-r1 b/dev-db/mysql/files/digest-mysql-4.0.22-r1
new file mode 100644 (file)
index 0000000..e3e0885
--- /dev/null
@@ -0,0 +1 @@
+MD5 fab53259c3ba9f729a319bf271fc8587 mysql-4.0.22.tar.gz 14395535
diff --git a/dev-db/mysql/mysql-4.0.22-r1.ebuild b/dev-db/mysql/mysql-4.0.22-r1.ebuild
new file mode 100644 (file)
index 0000000..2d9db49
--- /dev/null
@@ -0,0 +1,279 @@
+# 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-4.0.22-r1.ebuild,v 1.1 2004/12/23 17:36:16 robbat2 Exp $
+
+inherit eutils gnuconfig
+#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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
+RESTRICT="nomirror"
+
+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/texinfo-4.7-r1
+       sys-apps/procps
+       >=sys-apps/sed-4"
+PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
+RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
+
+mysql_upgrade_warning() {
+       ewarn
+       ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
+       ewarn "must recompile the other packages on your system that link with"
+       ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
+       ewarn "of packages for your system, you may use 'revdep-rebuild' from"
+       ewarn "app-portage/gentoolkit."
+       ewarn
+       epause 5
+}
+
+
+mysql_get_datadir() {
+       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}'`
+               #DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
+               DATADIR=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+       fi
+       if [ -z "${DATADIR}" ]; then
+               DATADIR="/var/lib/mysql/"
+               einfo "Using default DATADIR"
+       fi
+       einfo "MySQL DATADIR is ${DATADIR}"
+       export DATADIR
+}
+
+pkg_setup() {
+       mysql_upgrade_warning   
+       mysql_get_datadir
+}
+
+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
+
+       #zap startup script messages
+       EPATCH_OPTS="-p1 -d ${S}" \
+       epatch ${FILESDIR}/${PN}-4.0.21-install-db-sh.diff
+       #zap binary distribution stuff
+       EPATCH_OPTS="-p1 -d ${S}" \
+       epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff
+       #required for qmail-mysql
+       EPATCH_OPTS="-p0 -d ${S}" \
+       epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff
+       #for correct hardcoded sysconf directory
+       EPATCH_OPTS="-p1 -d ${S}" \
+       epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff
+       # NPTL support
+       EPATCH_OPTS="-p1 -d ${S}" \
+       epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff
+
+       # 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
+       EPATCH_OPTS="-p1 -d ${S}" \
+       epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch
+
+       if use tcpd; then
+               EPATCH_OPTS="-p1 -d ${S}" \
+               epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff
+       fi
+
+       # security fix from http://lists.mysql.com/internals/15185
+       # gentoo bug #60744
+       #EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch
+       # Already included upstream in 4.0.21
+
+       cd ${S}
+       autoreconf --install --force
+       # Saving this for a rainy day, in case we need it again
+       #WANT_AUTOMAKE=1.7 automake
+       gnuconfig_update
+}
+
+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 alpha || use hppa || use mips
+       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/$(get_libdir)/mysql/libmysqlclient*.so* ${D}/usr/$(get_libdir)
+       dosym ../libmysqlclient.so /usr/$(get_libdir)/mysql/libmysqlclient.so
+       dosym ../libmysqlclient_r.so /usr/$(get_libdir)/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 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
+
+       insinto /etc/logrotate.d
+       newins ${FILESDIR}/logrotate.mysql mysql
+}
+
+pkg_config() {
+       mysql_get_datadir
+
+       if [ ! -d ${ROOT}/${DATADIR}/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
+               chown -R mysql:mysql ${ROOT}/${DATADIR}
+               chmod 0750 ${ROOT}/${DATADIR}
+               ewarn "For security reasons you should set your MySQL root"
+               ewarn "password as soon as possible."
+
+       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() {
+       enewgroup mysql 60 || die "problem adding group mysql"
+       enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+}
+
+pkg_postinst() {
+       mysql_get_datadir
+
+       #empty dirs...
+       [ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
+       [ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
+       [ -d "${ROOT}/var/log/mysql" ] || 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*
+       chmod 0660 ${ROOT}/var/log/mysql/mysql*
+       # secure some directories
+       chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR}
+
+       #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
+
+       mysql_upgrade_warning   
+}