fix bug #121648 problems stopping mysql under bsd

Package-Manager: portage-2.1_pre4-r1

4 files changed, 25 insertions, 20 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 843906eac6b0..7dac5c3515dd 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.299 2006/02/04 02:21:14 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.300 2006/02/05 16:59:03 vivo Exp $
+
+  05 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6-r3,
+  files/mysqlmanager-slot.rc6:
+  fix bug #121648 problems stopping mysql under bsd
 
   04 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6-r3:
   Fix for Bug #121461, plus minor cleanup.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d5cdc4eb270d..98ae9cc5cd3a 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e69ccb8b72c4063051180ab204637770 ChangeLog 60629
-RMD160 214e88b9105ffdd6c713ee9f0e7716ee256bc9e7 ChangeLog 60629
-SHA256 c8b34811e3300e76f8d6d1ff6dff9cc1a8c7f47c740ebcf295d5d63681b92b2b ChangeLog 60629
+MD5 2e0dfed14a963d7f9e4f581040a8de66 ChangeLog 60787
+RMD160 85d00fa8ecd71e2e2c4a64671e7d6620568f1677 ChangeLog 60787
+SHA256 8180ed660c2d0f1a321b6898e06fb482bb24b42ac8bf2067c3bd96a2ef5b7505 ChangeLog 60787
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 RMD160 eedbaecbaf03a55c5510f74aa508ff9075bf151f files/digest-mysql-3.23.58-r1 140
 SHA256 f08bf2eb63cd3809353ab2fbef2cf50ba57c6d8df0c696631b2577dae741f12e files/digest-mysql-3.23.58-r1 140
@@ -73,18 +73,18 @@ SHA256 d08fc106553f5442c331f9d90a4b9403c0815010aefdd5a245e4fa148b55eadd files/my
 MD5 8158f25fbd80fba48f0d01b0889ea0b3 files/mysql-slot.rc6-r1 9016
 RMD160 d01c789f6f21e7c786205f195033e1a007cab8c7 files/mysql-slot.rc6-r1 9016
 SHA256 b35229af374e06af90f95531536fa29d01222f13c42cef7735ce6816dfb450b6 files/mysql-slot.rc6-r1 9016
-MD5 272fdb47d5e510bb07bf50c1b1d967ef files/mysql-slot.rc6-r3 10369
-RMD160 2a8f598c57336a9b09f44eb6353cf6a2939ebcef files/mysql-slot.rc6-r3 10369
-SHA256 53ebd12b94abd2b73b5bd2096dc64585ec44f66764b0ae71a46cac6e56947a67 files/mysql-slot.rc6-r3 10369
+MD5 27f572d5955231d2962585647b72db19 files/mysql-slot.rc6-r3 10367
+RMD160 5c7414ab505dc4c3b7bbb8a8a2d224791bc69b8d files/mysql-slot.rc6-r3 10367
+SHA256 28bf3ac63d39ce60282e5d36049039961d90c7bb939c4617ebf34a941884868d files/mysql-slot.rc6-r3 10367
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 files/mysql.init 886
 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 files/mysql.init 886
 MD5 9ff84042930f67b14f418a9dcf78d860 files/mysqlmanager-slot.conf.d 1021
 RMD160 3868b32a4ac59a89ae870299d8ecf684ba2d320e files/mysqlmanager-slot.conf.d 1021
 SHA256 5b36b46e0a5ec1afbf8ae659ad7f901289421ecf1b100924c5fe4db11bbd1475 files/mysqlmanager-slot.conf.d 1021
-MD5 69488d8c4aca1adf37e4c24b39305487 files/mysqlmanager-slot.rc6 6614
-RMD160 0a71ab75c0ab3bef11211852c1550e07c55b5ff5 files/mysqlmanager-slot.rc6 6614
-SHA256 d43fa274fbde2e8fce3d59f8c7361ec68ba2d7e3c8bdeae46e621f74b0cb74ad files/mysqlmanager-slot.rc6 6614
+MD5 b5588fffc4abe92076d805705def2d25 files/mysqlmanager-slot.rc6 6625
+RMD160 f67a7d8888fabe9334642ddace6361321329f6b3 files/mysqlmanager-slot.rc6 6625
+SHA256 9fb188daf74f3245ec5c3d75ee86de52e905e01ba9bff7dd3be1a90bbdb97759 files/mysqlmanager-slot.rc6 6625
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 metadata.xml 158
 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 metadata.xml 158
@@ -118,7 +118,7 @@ SHA256 3a1e1c8d111f9c74a9b96b85e45f5508537b8726808ddf952d23b5e011476066 mysql-5.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5A+tKolR564NvWYRAuAwAKCjMKC4HUMC1Zoo/HpMLHUr/3JXOQCdHf8L
-hjiiFjfd9R+LkhU5Sn5SnbQ=
-=ClSN
+iD8DBQFD5i8bKolR564NvWYRAoEIAKC73FuyS+/7fsgCl1FmZEjQMBUXmgCfaM3u
+d/i076V31KLyrfBAJGX2gVA=
+=lucK
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/mysql-slot.rc6-r3 b/dev-db/mysql/files/mysql-slot.rc6-r3
index e46baccdf6de..217f74b056ef 100644
--- a/dev-db/mysql/files/mysql-slot.rc6-r3
+++ b/dev-db/mysql/files/mysql-slot.rc6-r3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6-r3,v 1.2 2006/02/04 02:21:15 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6-r3,v 1.3 2006/02/05 16:59:03 vivo Exp $
 
 # external binaryes used: which, sed, tac
 
@@ -42,7 +42,7 @@ get_slot_config() {
 	MY_SUFFIX="-${srv_slot}"
 	# srv=array(0 => [srv_slot], 1 => [srv_num] )
 	srv=( ${srv_slot} ${srv_num} )
-	
+
 	local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
 	local conf_d_parameters="${!tmp_eval}"
 	if [[ "${srv_slot}" == "0" ]] ; then
@@ -321,7 +321,7 @@ stop() {
 	local runwhat pidfile shutdown_elem
 	local PID cnt timeout=${STOPTIMEOUT:-"120"}
 	local retstatus=0
-	local shutdown_list="$(tac "${MYSQL_GLOB_PID_FILE}")"
+	local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
 
 	ebegin "Stopping ${myservice} (pid=${PID})"
 	for shutdown_elem in $shutdown_list; do
diff --git a/dev-db/mysql/files/mysqlmanager-slot.rc6 b/dev-db/mysql/files/mysqlmanager-slot.rc6
index 935d3d592ca7..8d55103cb00d 100644
--- a/dev-db/mysql/files/mysqlmanager-slot.rc6
+++ b/dev-db/mysql/files/mysqlmanager-slot.rc6
@@ -1,12 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager-slot.rc6,v 1.2 2005/12/08 17:44:12 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager-slot.rc6,v 1.3 2006/02/05 16:59:03 vivo Exp $
 
 # external binaryes used: which, sed, tac
 
 depend() {
 	use dns net localmount netmount nfsmount
+	#provide mysql
 }
 
 # int in_list(char * elem, char * list)
@@ -62,7 +63,7 @@ get_slot_config() {
 				;;
 		esac
 	done
-	
+
 	if [[ ! -r "${MY_CNF}" ]]; then
 		ewarn "Cannot access ${MY_CNF} !"
 		MY_CNF=""
@@ -72,7 +73,7 @@ get_slot_config() {
 		if [[ ! -x "${my_print_defaults}" ]]; then
 			eerror "my_print_defaults NOT found or not executable"
 			my_defaults=""
-		else			
+		else
 			my_defaults=$( ${my_print_defaults} \
 				--loose-verbose \
 				--config-file="${MY_CNF}" \
@@ -200,7 +201,7 @@ stop () {
 	local runwhat pidfile shutdown_elem
 	local PID cnt timeout
 	local retstatus=0
-	local shutdown_list="$(tac "${MYSQL_GLOB_PID_FILE}")"
+	local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
 
 	# shutdown in reverse order
 	ebegin