summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2008-06-07 08:33:50 +0000
committerale <ale@FreeBSD.org>2008-06-07 08:33:50 +0000
commitf84266ebd1c229ad6796ddf0491985f090df859e (patch)
tree2371572d3419908acf17fa6b8dba54bdd0ad629c
parentc820e0c201c71897ca8324ee66c095a02868f943 (diff)
downloadFreeBSD-ports-f84266ebd1c229ad6796ddf0491985f090df859e.zip
FreeBSD-ports-f84266ebd1c229ad6796ddf0491985f090df859e.tar.gz
Update to 5.1.25-rc release.
Fix startup script to wait until server is completely up. [1] PR: ports/122063 [1] Submitted by: Christopher Sean Hilton <chris@vindaloo.com> [1]
Diffstat
-rw-r--r--databases/mysql51-server/Makefile4
-rw-r--r--databases/mysql51-server/distinfo6
-rw-r--r--databases/mysql51-server/files/mysql-server.sh.in11
-rw-r--r--databases/mysql54-server/Makefile4
-rw-r--r--databases/mysql54-server/distinfo6
-rw-r--r--databases/mysql54-server/files/mysql-server.sh.in11
-rw-r--r--databases/mysql55-server/Makefile4
-rw-r--r--databases/mysql55-server/distinfo6
-rw-r--r--databases/mysql55-server/files/mysql-server.sh.in11
-rw-r--r--databases/mysql60-server/Makefile4
-rw-r--r--databases/mysql60-server/distinfo6
-rw-r--r--databases/mysql60-server/files/mysql-server.sh.in11
-rw-r--r--databases/percona55-server/Makefile4
-rw-r--r--databases/percona55-server/distinfo6
-rw-r--r--databases/percona55-server/files/mysql-server.sh.in11
15 files changed, 80 insertions, 25 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 3ac2ff9..f5bb6ed 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.24
-PORTREVISION?= 1
+PORTVERSION= 5.1.25
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 1b7a101..aa9214a 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a
-SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560
-SIZE (mysql-5.1.24-rc.tar.gz) = 27501156
+MD5 (mysql-5.1.25-rc.tar.gz) = 3d9e8bf4f02b983d13be4ba3d33ae6ed
+SHA256 (mysql-5.1.25-rc.tar.gz) = 6441b509f29c84e63ad8dd75491caa3823496e3f5e30809e23705315e581eec0
+SIZE (mysql-5.1.25-rc.tar.gz) = 27985830
diff --git a/databases/mysql51-server/files/mysql-server.sh.in b/databases/mysql51-server/files/mysql-server.sh.in
index 2caa4dc..401731c 100644
--- a/databases/mysql51-server/files/mysql-server.sh.in
+++ b/databases/mysql51-server/files/mysql-server.sh.in
@@ -39,6 +39,7 @@ 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 &"
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}"
@@ -60,4 +61,14 @@ mysql_prestart()
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"
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 3ac2ff9..f5bb6ed 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.24
-PORTREVISION?= 1
+PORTVERSION= 5.1.25
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 1b7a101..aa9214a 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a
-SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560
-SIZE (mysql-5.1.24-rc.tar.gz) = 27501156
+MD5 (mysql-5.1.25-rc.tar.gz) = 3d9e8bf4f02b983d13be4ba3d33ae6ed
+SHA256 (mysql-5.1.25-rc.tar.gz) = 6441b509f29c84e63ad8dd75491caa3823496e3f5e30809e23705315e581eec0
+SIZE (mysql-5.1.25-rc.tar.gz) = 27985830
diff --git a/databases/mysql54-server/files/mysql-server.sh.in b/databases/mysql54-server/files/mysql-server.sh.in
index 2caa4dc..401731c 100644
--- a/databases/mysql54-server/files/mysql-server.sh.in
+++ b/databases/mysql54-server/files/mysql-server.sh.in
@@ -39,6 +39,7 @@ 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 &"
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}"
@@ -60,4 +61,14 @@ mysql_prestart()
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"
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 3ac2ff9..f5bb6ed 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.24
-PORTREVISION?= 1
+PORTVERSION= 5.1.25
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 1b7a101..aa9214a 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a
-SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560
-SIZE (mysql-5.1.24-rc.tar.gz) = 27501156
+MD5 (mysql-5.1.25-rc.tar.gz) = 3d9e8bf4f02b983d13be4ba3d33ae6ed
+SHA256 (mysql-5.1.25-rc.tar.gz) = 6441b509f29c84e63ad8dd75491caa3823496e3f5e30809e23705315e581eec0
+SIZE (mysql-5.1.25-rc.tar.gz) = 27985830
diff --git a/databases/mysql55-server/files/mysql-server.sh.in b/databases/mysql55-server/files/mysql-server.sh.in
index 2caa4dc..401731c 100644
--- a/databases/mysql55-server/files/mysql-server.sh.in
+++ b/databases/mysql55-server/files/mysql-server.sh.in
@@ -39,6 +39,7 @@ 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 &"
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}"
@@ -60,4 +61,14 @@ mysql_prestart()
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"
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 3ac2ff9..f5bb6ed 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.24
-PORTREVISION?= 1
+PORTVERSION= 5.1.25
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 1b7a101..aa9214a 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a
-SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560
-SIZE (mysql-5.1.24-rc.tar.gz) = 27501156
+MD5 (mysql-5.1.25-rc.tar.gz) = 3d9e8bf4f02b983d13be4ba3d33ae6ed
+SHA256 (mysql-5.1.25-rc.tar.gz) = 6441b509f29c84e63ad8dd75491caa3823496e3f5e30809e23705315e581eec0
+SIZE (mysql-5.1.25-rc.tar.gz) = 27985830
diff --git a/databases/mysql60-server/files/mysql-server.sh.in b/databases/mysql60-server/files/mysql-server.sh.in
index 2caa4dc..401731c 100644
--- a/databases/mysql60-server/files/mysql-server.sh.in
+++ b/databases/mysql60-server/files/mysql-server.sh.in
@@ -39,6 +39,7 @@ 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 &"
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}"
@@ -60,4 +61,14 @@ mysql_prestart()
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"
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 3ac2ff9..f5bb6ed 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.24
-PORTREVISION?= 1
+PORTVERSION= 5.1.25
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 1b7a101..aa9214a 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a
-SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560
-SIZE (mysql-5.1.24-rc.tar.gz) = 27501156
+MD5 (mysql-5.1.25-rc.tar.gz) = 3d9e8bf4f02b983d13be4ba3d33ae6ed
+SHA256 (mysql-5.1.25-rc.tar.gz) = 6441b509f29c84e63ad8dd75491caa3823496e3f5e30809e23705315e581eec0
+SIZE (mysql-5.1.25-rc.tar.gz) = 27985830
diff --git a/databases/percona55-server/files/mysql-server.sh.in b/databases/percona55-server/files/mysql-server.sh.in
index 2caa4dc..401731c 100644
--- a/databases/percona55-server/files/mysql-server.sh.in
+++ b/databases/percona55-server/files/mysql-server.sh.in
@@ -39,6 +39,7 @@ 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 &"
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}"
@@ -60,4 +61,14 @@ mysql_prestart()
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"
OpenPOWER on IntegriCloud