[Midnightbsd-cvs] mports: databases/mysql51-server: update ot mysql 5.1.30
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jan 13 02:22:19 EST 2009
Log Message:
-----------
update ot mysql 5.1.30
Modified Files:
--------------
mports/databases/mysql51-server:
Makefile (r1.11 -> r1.12)
distinfo (r1.7 -> r1.8)
mports/databases/mysql51-server/files:
mysql-server.sh.in (r1.3 -> r1.4)
patch-extra_yassl_Makefile.in (r1.2 -> r1.3)
patch-extra_yassl_taocrypt_Makefile.in (r1.2 -> r1.3)
patch-mysys_default.c (r1.4 -> r1.5)
Removed Files:
-------------
mports/databases/mysql51-server/files:
patch-client_mysql_upgrade.c
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L databases/mysql51-server/Makefile -L databases/mysql51-server/Makefile -u -r1.11 -r1.12
--- databases/mysql51-server/Makefile
+++ databases/mysql51-server/Makefile
@@ -7,13 +7,13 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.26
+PORTVERSION= 5.1.30
PORTREVISION= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
PKGNAMESUFFIX?= -server
-DISTNAME= ${PORTNAME}-${PORTVERSION}-rc
+DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
COMMENT= Multithreaded SQL database (server)
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/distinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -L databases/mysql51-server/distinfo -L databases/mysql51-server/distinfo -u -r1.7 -r1.8
--- databases/mysql51-server/distinfo
+++ databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.26-rc.tar.gz) = db4b30ef40493e0bfe9ca17dd8220cf5
-SHA256 (mysql-5.1.26-rc.tar.gz) = 3a782d85b1aa5b2a47e67e80021e022c06c9d429f8afbc6cde1333d0bcb97dc6
-SIZE (mysql-5.1.26-rc.tar.gz) = 28111441
+MD5 (mysql-5.1.30.tar.gz) = b658e58887a74dce65224ae0fc8ee06a
+SHA256 (mysql-5.1.30.tar.gz) = cca90f5209808829e5bc811c5c017a054a4f75188e939b1c1c8b270d0514f624
+SIZE (mysql-5.1.30.tar.gz) = 29050568
Index: patch-extra_yassl_Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-extra_yassl_Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/mysql51-server/files/patch-extra_yassl_Makefile.in -L databases/mysql51-server/files/patch-extra_yassl_Makefile.in -u -r1.2 -r1.3
--- databases/mysql51-server/files/patch-extra_yassl_Makefile.in
+++ databases/mysql51-server/files/patch-extra_yassl_Makefile.in
@@ -1,11 +1,11 @@
---- extra/yassl/Makefile.in.orig Thu Oct 26 14:02:58 2006
-+++ extra/yassl/Makefile.in Tue Nov 7 08:17:34 2006
-@@ -351,7 +351,7 @@
+--- extra/yassl/Makefile.in.orig 2008-10-11 23:58:20.000000000 +0200
++++ extra/yassl/Makefile.in 2008-10-31 08:14:13.000000000 +0100
+@@ -355,7 +355,7 @@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-SUBDIRS = taocrypt src testsuite
+SUBDIRS = taocrypt src
- EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \
- CMakeLists.txt
+ EXTRA_DIST = CMakeLists.txt
+ all: all-recursive
Index: patch-mysys_default.c
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-mysys_default.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -L databases/mysql51-server/files/patch-mysys_default.c -L databases/mysql51-server/files/patch-mysys_default.c -u -r1.4 -r1.5
--- databases/mysql51-server/files/patch-mysys_default.c
+++ databases/mysql51-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200
-+++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200
-@@ -623,7 +623,7 @@
+--- mysys/default.c.orig 2008-08-28 17:40:47.000000000 +0200
++++ mysys/default.c 2008-09-16 08:20:23.000000000 +0200
+@@ -638,7 +638,7 @@
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,14 @@
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
-@@ -1105,6 +1105,7 @@
- #ifdef DEFAULT_SYSCONFDIR
+@@ -1091,7 +1091,10 @@
+
+ #if defined(DEFAULT_SYSCONFDIR)
if (DEFAULT_SYSCONFDIR != "")
- ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
-+ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/");
++ {
+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++ }
+ #endif /* DEFAULT_SYSCONFDIR */
+
#endif
- ADD_COMMON_DIRECTORIES();
- ADD_DIRECTORY("~/");
Index: mysql-server.sh.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/mysql-server.sh.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -L databases/mysql51-server/files/mysql-server.sh.in -L databases/mysql51-server/files/mysql-server.sh.in -u -r1.3 -r1.4
--- databases/mysql51-server/files/mysql-server.sh.in
+++ databases/mysql51-server/files/mysql-server.sh.in
@@ -1,8 +1,6 @@
#!/bin/sh
#
# $MidnightBSD$
-# $FreeBSD: ports/databases/mysql51-server/files/mysql-server.sh.in,v 1.4 2007/05/20 08:31:37 ale Exp $
-#
# PROVIDE: mysql
# REQUIRE: LOGIN
@@ -37,9 +35,10 @@
mysql_limits_args="-e -U ${mysql_user}"
pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
command="%%PREFIX%%/bin/mysqld_safe"
-command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
+command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null 2>&1 &"
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}"
@@ -61,4 +60,14 @@
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"
Index: patch-extra_yassl_taocrypt_Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in -L databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in -u -r1.2 -r1.3
--- databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in
+++ databases/mysql51-server/files/patch-extra_yassl_taocrypt_Makefile.in
@@ -1,11 +1,11 @@
---- extra/yassl/taocrypt/Makefile.in.orig Thu Oct 26 14:02:59 2006
-+++ extra/yassl/taocrypt/Makefile.in Tue Nov 7 08:18:38 2006
-@@ -351,7 +351,7 @@
+--- extra/yassl/taocrypt/Makefile.in.orig 2008-10-11 23:58:20.000000000 +0200
++++ extra/yassl/taocrypt/Makefile.in 2008-10-31 08:15:56.000000000 +0100
+@@ -355,7 +355,7 @@
yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-SUBDIRS = src test benchmark
+SUBDIRS = src
- EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp)
+ EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
all: all-recursive
--- databases/mysql51-server/files/patch-client_mysql_upgrade.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- client/mysql_upgrade.c.orig 2008-01-29 22:42:00.000000000 +0100
-+++ client/mysql_upgrade.c 2008-02-14 08:29:52.000000000 +0100
-@@ -427,10 +427,6 @@
-
- verbose("Looking for '%s' in: %s", tool_name, tool_path);
-
-- /* Make sure the tool exists */
-- if (my_access(tool_path, F_OK) != 0)
-- die("Can't find '%s'", tool_path);
--
- /*
- Make sure it can be executed
- */
More information about the Midnightbsd-cvs
mailing list