[Midnightbsd-cvs] mports [15856] trunk/databases/mysql51-server: mysql 5.1.73
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Feb 18 07:43:46 EST 2014
Revision: 15856
http://svnweb.midnightbsd.org/mports/?rev=15856
Author: laffer1
Date: 2014-02-18 07:43:45 -0500 (Tue, 18 Feb 2014)
Log Message:
-----------
mysql 5.1.73
Modified Paths:
--------------
trunk/databases/mysql51-server/Makefile
trunk/databases/mysql51-server/distinfo
trunk/databases/mysql51-server/files/patch-configure
trunk/databases/mysql51-server/files/patch-include_my_tcpd.h
Added Paths:
-----------
trunk/databases/mysql51-server/files/mysql-server.in
trunk/databases/mysql51-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
Removed Paths:
-------------
trunk/databases/mysql51-server/files/mysql-server.sh.in
Modified: trunk/databases/mysql51-server/Makefile
===================================================================
--- trunk/databases/mysql51-server/Makefile 2014-02-18 12:41:40 UTC (rev 15855)
+++ trunk/databases/mysql51-server/Makefile 2014-02-18 12:43:45 UTC (rev 15856)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME?= mysql
-PORTVERSION= 5.1.68
+PORTVERSION= 5.1.73
PORTREVISION= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -10,13 +10,13 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Multithreaded SQL database (server)
+
LICENSE= gpl2
SLAVEDIRS= databases/mysql51-client databases/mysql51-scripts
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
-MAKE_JOBS_SAFE= yes
-CONFIGURE_TARGET=${MACHINE_ARCH}-portbld-freebsd7.0
+CONFIGURE_TARGET=${MACHINE_ARCH}-portbld-freebsd9.1
CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
--without-readline \
Modified: trunk/databases/mysql51-server/distinfo
===================================================================
--- trunk/databases/mysql51-server/distinfo 2014-02-18 12:41:40 UTC (rev 15855)
+++ trunk/databases/mysql51-server/distinfo 2014-02-18 12:43:45 UTC (rev 15856)
@@ -1,3 +1,2 @@
-SHA256 (mysql-5.1.68.tar.gz) = 25f02868dded24a46aeda7863008bcd9639c08fb5a31a137e19534629c65b517
-RMD160 (mysql-5.1.68.tar.gz) = 4e1a4a0c38e3f3c84e3ef014e196b9add864eb82
-SIZE (mysql-5.1.68.tar.gz) = 24655564
+SHA256 (mysql-5.1.73.tar.gz) = 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5
+SIZE (mysql-5.1.73.tar.gz) = 24023347
Added: trunk/databases/mysql51-server/files/mysql-server.in
===================================================================
--- trunk/databases/mysql51-server/files/mysql-server.in (rev 0)
+++ trunk/databases/mysql51-server/files/mysql-server.in 2014-02-18 12:43:45 UTC (rev 15856)
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# $FreeBSD: head/databases/mysql51-server/files/mysql-server.in 340872 2014-01-24 00:14:07Z mat $
+#
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+# mysql_limits (bool): Set to "NO" by default.
+# Set it to yes to run `limits -e -U mysql`
+# just before mysql starts.
+# mysql_dbdir (str): Default to "/var/db/mysql"
+# Base database directory.
+# mysql_pidfile (str): Custum PID file path and name.
+# Default to "${mysql_dbdir}/${hostname}.pid".
+# mysql_args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="mysql"
+rcvar=mysql_enable
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+: ${mysql_limits="NO"}
+: ${mysql_dbdir="/var/db/mysql"}
+
+mysql_user="mysql"
+mysql_limits_args="-e -U ${mysql_user}"
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db_args="--ldata=${mysql_dbdir}"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
+}
+
+mysql_prestart()
+{
+ if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ if checkyesno mysql_limits; then
+ eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+ else
+ return 0
+ fi
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
Deleted: trunk/databases/mysql51-server/files/mysql-server.sh.in
===================================================================
--- trunk/databases/mysql51-server/files/mysql-server.sh.in 2014-02-18 12:41:40 UTC (rev 15855)
+++ trunk/databases/mysql51-server/files/mysql-server.sh.in 2014-02-18 12:43:45 UTC (rev 15856)
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/databases/mysql51-server/files/mysql-server.sh.in,v 1.10 2010/12/20 08:57:57 ale Exp $
-#
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_limits (bool): Set to "NO" by default.
-# Set it to yes to run `limits -e -U mysql`
-# just before mysql starts.
-# mysql_dbdir (str): Default to "/var/db/mysql"
-# Base database directory.
-# mysql_pidfile (str): Custum PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-
-mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--ldata=${mysql_dbdir}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
- [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- if checkyesno mysql_limits; then
- eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
- else
- return 0
- fi
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
Modified: trunk/databases/mysql51-server/files/patch-configure
===================================================================
--- trunk/databases/mysql51-server/files/patch-configure 2014-02-18 12:41:40 UTC (rev 15855)
+++ trunk/databases/mysql51-server/files/patch-configure 2014-02-18 12:43:45 UTC (rev 15856)
@@ -1,6 +1,15 @@
---- configure.orig Sat May 26 12:22:14 2007
-+++ configure Fri Jun 1 07:53:46 2007
-@@ -26935,8 +26933,8 @@
+--- configure.orig 2013-11-04 18:55:16.000000000 +0000
++++ configure 2014-02-11 13:34:06.586185156 +0000
+@@ -22206,7 +22206,7 @@
+ int
+ main ()
+ {
+-return gethostbyname_r ();
++return incompatible_gethostbyname_r ();
+ ;
+ return 0;
+ }
+@@ -24768,8 +24768,8 @@
# Some system specific hacks
#
Added: trunk/databases/mysql51-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
===================================================================
--- trunk/databases/mysql51-server/files/patch-extra_yassl_taocrypt_include_misc.hpp (rev 0)
+++ trunk/databases/mysql51-server/files/patch-extra_yassl_taocrypt_include_misc.hpp 2014-02-18 12:43:45 UTC (rev 15856)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/include/misc.hpp.orig
++++ extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+
+
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+ #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+
Modified: trunk/databases/mysql51-server/files/patch-include_my_tcpd.h
===================================================================
--- trunk/databases/mysql51-server/files/patch-include_my_tcpd.h 2014-02-18 12:41:40 UTC (rev 15855)
+++ trunk/databases/mysql51-server/files/patch-include_my_tcpd.h 2014-02-18 12:43:45 UTC (rev 15856)
@@ -1,7 +1,7 @@
--- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005
+++ include/my_tcpd.h Sun Jan 9 13:41:42 2005
@@ -6,6 +6,25 @@
- * $FreeBSD: ports/databases/mysql51-server/files/patch-include_my_tcpd.h,v 1.1 2006/11/07 16:37:59 ale Exp $
+ * $FreeBSD: head/databases/mysql51-server/files/patch-include_my_tcpd.h 340725 2014-01-22 17:40:44Z mat $
*/
+#ifndef _TCPWRAPPERS_TCPD_H
More information about the Midnightbsd-cvs
mailing list