From root@ec-m.fr  Fri Oct 21 16:09:03 2011
Return-Path: <root@ec-m.fr>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD84E106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Oct 2011 16:09:03 +0000 (UTC)
	(envelope-from root@ec-m.fr)
Received: from melo.ec-m.fr (melo.ec-m.fr [147.94.19.139])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C7458FC18
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Oct 2011 16:09:03 +0000 (UTC)
Received: from amavis3.serv.int (amavis3.serv.int [10.3.0.47])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 40C8DACBEE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Oct 2011 18:09:02 +0200 (CEST)
Received: from melo.ec-m.fr ([10.3.0.13])
	by amavis3.serv.int (amavis3.serv.int [10.3.0.47]) (amavisd-new, port 10024)
	with LMTP id fLzhWFIDatxH for <FreeBSD-gnats-submit@freebsd.org>;
	Fri, 21 Oct 2011 18:08:59 +0200 (CEST)
Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id C70D8AC9CB
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 21 Oct 2011 18:08:59 +0200 (CEST)
Received: by dgeo.sysadm.ec-m.fr (Postfix, from userid 0)
	id A23B31CD55; Fri, 21 Oct 2011 18:08:59 +0200 (CEST)
Message-Id: <20111021160859.A23B31CD55@dgeo.sysadm.ec-m.fr>
Date: Fri, 21 Oct 2011 18:08:59 +0200 (CEST)
From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] databases/mariadb-server: [SUMMARIZE CHANGES]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         161883
>Category:       ports
>Synopsis:       [MAINTAINER] databases/mariadb-server: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 21 16:10:07 UTC 2011
>Closed-Date:    Thu Jan 05 02:14:27 UTC 2012
>Last-Modified:  Mon Jan  9 14:10:15 UTC 2012
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 8.2-STABLE FreeBSD 8.2-STABLE #0: Thu Sep 22 18:47:15 CEST 2011
>Description:
add multi-instances capability to startup script

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mariadb-server-5.2.9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/files/mysql-server.in /usr/ports/databases/mariadb-server/files/mysql-server.in
--- /usr/ports/databases/mariadb-server.orig/files/mysql-server.in	2011-06-04 10:24:04.000000000 +0200
+++ /usr/ports/databases/mariadb-server/files/mysql-server.in	2011-10-21 18:07:13.000000000 +0200
@@ -16,6 +16,8 @@
 #			Base database directory.
 # mysql_args (str):	Custom additional arguments to be passed
 #			to mysqld_safe (default empty).
+# mysql_instances (str): Set to "" by default.
+#                       If defined, list of instances to enable
 
 . /etc/rc.subr
 
@@ -27,21 +29,68 @@
 : ${mysql_enable="NO"}
 : ${mysql_limits="NO"}
 : ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_instances=""}
 
 mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
 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"
+
+if [ -n "$2" ]; then
+	instance="$2"
+	if [ "x${mysql_instances}" != "x" ]; then
+		pidfile="${mysql_dbdir}/`/bin/hostname`_${instance}.pid"
+		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
+		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
+		eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
+		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
+	else
+		echo "$0: extra argument ignored: $2"
+	fi
+else
+	if [ -n "${mysql_instances}" -a -n "$1" ]; then
+		for instance in ${mysql_instances}; do
+			eval _enable="\${mysql_${instance}_enable}"
+			case "${_enable:-${mysql_enable}}" in
+			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+				continue
+				;;
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+				;;
+			*)
+				if test -z "$_enable"; then
+					_var=mysql_enable
+				else
+					_var=mysql_${instance}_enable
+				fi
+				warn "Bad value" \
+					"'${_enable:-${mysql_enable}}'" \
+					"for ${_var}. " \
+					"Instance ${instance} skipped."
+				continue
+				;;
+			esac
+			echo "===> mysql instance: ${instance}"
+			if $0 $1 ${instance}; then
+				success="${instance} ${success:-}"
+			else
+				failed="${instance} (${retcode}) ${failed:-}"
+			fi
+		done
+		exit 0
+	fi
+fi
+
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
 mysql_install_db_args="--ldata=${mysql_dbdir}"
+mysql_limits_args="-e -U ${mysql_user}"
+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}"
 
 mysql_create_auth_tables()
 {
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
+	eval $_install_db $_install_db_args >/dev/null 2>/dev/null
         [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
 }
 
--- mariadb-server-5.2.9.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dougb 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Oct 21 16:10:18 UTC 2011 
Responsible-Changed-Why:  
dougb@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161883 

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: bug-followup@FreeBSD.org, Doug Barton <dougb@FreeBSD.org>
Cc:  
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: [SUMMARIZE
 CHANGES]
Date: Fri, 21 Oct 2011 23:45:52 +0200

 Please don't commit it now: it's buggy
 
 I'll work on it next week more seriously...
 
 --=20
 *Geoffroy Desvernay*
 C.R.I - Administration syst=C3=A8mes et r=C3=A9seaux
 Ecole Centrale de Marseille
 
 
State-Changed-From-To: open->suspended 
State-Changed-By: dougb 
State-Changed-When: Fri Oct 21 22:16:01 UTC 2011 
State-Changed-Why:  

Originator asked to hold off. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161883 

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: multi-instance
 startup script
Date: Mon, 24 Oct 2011 22:47:50 +0200

 This is a multi-part message in MIME format.
 --------------000306020403010308060101
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: quoted-printable
 
 Seems to work this time...
 --=20
 *Geoffroy Desvernay*
 C.R.I - Administration syst=C3=A8mes et r=C3=A9seaux
 Ecole Centrale de Marseille
 
 --------------000306020403010308060101
 Content-Type: text/x-diff;
  name="mariadb-server.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mariadb-server.patch"
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/files/mysql-server.in /usr/ports/databases/mariadb-server/files/mysql-server.in
 --- /usr/ports/databases/mariadb-server.orig/files/mysql-server.in	2011-06-04 10:24:04.000000000 +0200
 +++ /usr/ports/databases/mariadb-server/files/mysql-server.in	2011-10-24 21:02:49.000000000 +0200
 @@ -16,42 +16,95 @@
  #			Base database directory.
  # mysql_args (str):	Custom additional arguments to be passed
  #			to mysqld_safe (default empty).
 +# mysql_instances (str): Set to "" by default.
 +#                       If defined, list of instances to enable
  
  . /etc/rc.subr
  
  name="mysql"
  rcvar=`set_rcvar`
  
 -load_rc_config $name
 +load_rc_config ${name}
  
  : ${mysql_enable="NO"}
  : ${mysql_limits="NO"}
  : ${mysql_dbdir="/var/db/mysql"}
 +: ${mysql_instances=""}
  
 -mysql_user="mysql"
 -mysql_limits_args="-e -U ${mysql_user}"
 -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_dbdir=/var/db/mysql
 +
 +if [ -n "$2" ]; then
 +	instance="$2"
 +	load_rc_config ${name}_${instance}
 +	if [ "x${mysql_instances}" != "x" ]; then
 +		pidfile="${mysql_dbdir}/`/bin/hostname`_${instance}.pid"
 +		eval _args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
 +		eval _dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
 +		eval _limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
 +		eval _user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
 +	else
 +		echo "$0: extra argument ignored: $2"
 +	fi
 +else
 +	if [ -n "${mysql_instances}" -a -n "$1" ]; then
 +		for instance in ${mysql_instances}; do
 +			eval _enable="\${mysql_${instance}_enable}"
 +			case "${_enable:-${mysql_enable}}" in
 +			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 +				continue
 +				;;
 +			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 +				;;
 +			*)
 +				if test -z "$_enable"; then
 +					_var=mysql_enable
 +				else
 +					_var=mysql_${instance}_enable
 +				fi
 +				warn "Bad value" \
 +					"'${_enable:-${mysql_enable}}'" \
 +					"for ${_var}. " \
 +					"Instance ${instance} skipped."
 +				continue
 +				;;
 +			esac
 +			echo "===> mysql instance: ${instance}"
 +			if $0 $1 ${instance}; then
 +				success="${instance} ${success:-}"
 +			else
 +				failed="${instance} (${retcode}) ${failed:-}"
 +			fi
 +		done
 +		exit 0
 +	else
 +		pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
 +		_dbdir="/var/db/mysql"
 +		_user="mysql"
 +	fi
 +fi
 +
  mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
 -mysql_install_db_args="--ldata=${mysql_dbdir}"
 +mysql_install_db_args="--ldata=${_dbdir}"
 +mysql_limits_args="-e -U ${_user}"
 +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${_dbdir}/my.cnf --user=${_user} --datadir=${_dbdir} --pid-file=${pidfile} ${_args}"
  
  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}
 +        [ $? -eq 0 ] && chown -R ${_user}:${_group} ${_dbdir}
  }
  
  mysql_prestart()
  {
 -	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 +	if [ ! -d "${_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
 +		eval `/usr/bin/limits ${_limits_args}` 2>/dev/null
  	else
  		return 0
  	fi
 ===> Done
 
 --------------000306020403010308060101--

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: bug-followup@FreeBSD.org
Cc: Doug Barton <dougb@FreeBSD.org>
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: multi-instance
 startup script
Date: Mon, 24 Oct 2011 23:24:42 +0200

 This time the startup script seems to work as expected (last followup's=20
 diff):
   - doesn't break old installs
   - add a 'mysql_instances' rc var to make more than one mysql server=20
 start at boot
   - Permit to start/stop/... one instance at a time
 
 Copy-pasted from memcached's script for most :)
 
 --=20
 *Geoffroy Desvernay*
 C.R.I - Administration syst=C3=A8mes et r=C3=A9seaux
 Ecole Centrale de Marseille
 
 

From: Doug Barton <dougb@FreeBSD.org>
To: bug-followup@FreeBSD.org, dgeo@centrale-marseille.fr
Cc:  
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: [SUMMARIZE
 CHANGES]
Date: Sun, 06 Nov 2011 22:13:31 -0800

 This is a multi-part message in MIME format.
 --------------090704040000040107040406
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Please consider the attached, which has a few small tweaks:
 
 1. The use of {brackets} around variable names are only really necessary
 when they are close to some other text. Adding new instances of them
 when they are not needed is frowned on.
 
 2. Empty default variable assignments (: ${mysql_instances=""}) are not
 necessary or desirable.
 
 3. You assigned mysql_dbdir=/var/db/mysql unconditionally, in spite of
 the mysql_dbdir variable.
 
 4. I changed the bare test for the existence of mysql_instances for a
 case statement to check if $2 is in there. If it isn't, there should be
 an error.
 
 5. I changed $0 to %%PREFIX%%/etc/rc.d/mysql-server in the invocation line.
 
 Please test this version and let me know if it works for you.
 
 
 Doug
 
 -- 
 
 		"We could put the whole Internet into a book."
 		"Too practical."
 
 	Breadth of IT experience, and depth of knowledge in the DNS.
 	Yours for the right price.  :)  http://SupersetSolutions.com/
 
 
 --------------090704040000040107040406
 Content-Type: text/plain;
  name="mariadb-rcd.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mariadb-rcd.diff"
 
 Index: mysql-server.in
 ===================================================================
 RCS file: /home/pcvs/ports/databases/mariadb-server/files/mysql-server.in,v
 retrieving revision 1.4
 diff -u -r1.4 mysql-server.in
 --- mysql-server.in	4 Jun 2011 08:24:04 -0000	1.4
 +++ mysql-server.in	7 Nov 2011 06:13:28 -0000
 @@ -16,6 +16,8 @@
  #			Base database directory.
  # mysql_args (str):	Custom additional arguments to be passed
  #			to mysqld_safe (default empty).
 +# mysql_instances (str): Set to "" by default.
 +#                       If defined, list of instances to enable
  
  . /etc/rc.subr
  
 @@ -28,30 +30,81 @@
  : ${mysql_limits="NO"}
  : ${mysql_dbdir="/var/db/mysql"}
  
 -mysql_user="mysql"
 -mysql_limits_args="-e -U ${mysql_user}"
 -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"
 +
 +if [ -n "$2" ]; then
 +	instance="$2"
 +	load_rc_config ${name}_${instance}
 +	case "$mysql_instances" in
 +	"$2 "*|*" $2 "*|*" $2")
 +		pidfile="${mysql_dbdir}/`/bin/hostname`_${instance}.pid"
 +		eval _args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
 +		eval _dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
 +		eval _limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
 +		eval _user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
 +		;;
 +	*)
 +		err 1 "$2 not found in mysql_instances" ;;
 +	esac
 +else
 +	if [ -n "${mysql_instances}" -a -n "$1" ]; then
 +		for instance in ${mysql_instances}; do
 +			eval _enable="\${mysql_${instance}_enable}"
 +			case "${_enable:-${mysql_enable}}" in
 +			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 +				continue
 +				;;
 +			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 +				;;
 +			*)
 +				if [ -z "$_enable" ]; then
 +					_var=mysql_enable
 +				else
 +					_var=mysql_${instance}_enable
 +				fi
 +				warn "Bad value" \
 +					"'${_enable:-${mysql_enable}}'" \
 +					"for ${_var}. " \
 +					"Instance ${instance} skipped."
 +				continue
 +				;;
 +			esac
 +			echo "===> mysql instance: ${instance}"
 +			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
 +				success="${instance} ${success}"
 +			else
 +				failed="${instance} (${retcode}) ${failed}"
 +			fi
 +		done
 +		exit 0
 +	else
 +		pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
 +		_dbdir="/var/db/mysql"
 +		_user="mysql"
 +	fi
 +fi
 +
  mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
 -mysql_install_db_args="--ldata=${mysql_dbdir}"
 +mysql_install_db_args="--ldata=${_dbdir}"
 +mysql_limits_args="-e -U ${_user}"
 +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${_dbdir}/my.cnf --user=${_user} --datadir=${_dbdir} --pid-file=${pidfile} ${_args}"
  
  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}
 +        [ $? -eq 0 ] && chown -R ${_user}:${_group} ${_dbdir}
  }
  
  mysql_prestart()
  {
 -	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 +	if [ ! -d "${_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
 +		eval `/usr/bin/limits ${_limits_args}` 2>/dev/null
  	else
  		return 0
  	fi
 
 --------------090704040000040107040406--

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: Doug Barton <dougb@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: [SUMMARIZE
 CHANGES]
Date: Sat, 19 Nov 2011 18:39:03 +0100

 This is a multi-part message in MIME format.
 --------------070709080307060106030207
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: quoted-printable
 
 On 07/11/2011 07:13, Doug Barton wrote:
 > Please consider the attached, which has a few small tweaks:
 >
 > 1. The use of {brackets} around variable names are only really necessar=
 y
 > when they are close to some other text. Adding new instances of them
 > when they are not needed is frowned on.
 >
 > 2. Empty default variable assignments (: ${mysql_instances=3D""}) are n=
 ot
 > necessary or desirable.
 >
 > 3. You assigned mysql_dbdir=3D/var/db/mysql unconditionally, in spite o=
 f
 > the mysql_dbdir variable.
 >
 > 4. I changed the bare test for the existence of mysql_instances for a
 > case statement to check if $2 is in there. If it isn't, there should be=
 
 > an error.
 >
 > 5. I changed $0 to %%PREFIX%%/etc/rc.d/mysql-server in the invocation l=
 ine.
 >
 > Please test this version and let me know if it works for you.
 >
 >
 > Doug
 >
 Just tested on our production server: it works for us(tm)
 
 * replaced :
    "$2 "*|*" $2 "*|*" $2")
 by:
    "$2 "*|*" $2 "*|*" $2"|"$2")
 to let it work in case there is only one instance
 
 * changed the pidfile just below, using ${_dbdir}/`/bin/hostname`.pid=20
 instead of ${mysql_dbdir}/`/bin/hostname`_${instance}.pid ($mysql_dbdir=20
 may not let instance's owner write pidfile)
 
 * added 'mysql_user' declaration and '_limits_args'
   to fix limits call if defined
 
 Sorry for the delay, we had some big electrical problems these weeks...=20
 And I'm better with /bin/sh than with 20 years-old UPS (even if not so=20
 good in /bin/sh ;)
 
 --=20
 *Geoffroy Desvernay*
 C.R.I - Administration syst=E8mes et r=E9seaux
 Ecole Centrale de Marseille
 Tel: (+33|0)4 91 05 45 24
 Fax: (+33|0)4 91 05 45 98
 dgeo@centrale-marseille.fr
 
 
 --------------070709080307060106030207
 Content-Type: text/x-diff;
  name="mariadb-rcd+limits.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mariadb-rcd+limits.diff"
 
 --- mariadb-server.orig/files/mysql-server.in	2011-06-04 10:24:04.000000000 +0200
 +++ mariadb-server/files/mysql-server.in	2011-11-19 18:30:42.000000000 +0100
 @@ -16,6 +16,8 @@
  #			Base database directory.
  # mysql_args (str):	Custom additional arguments to be passed
  #			to mysqld_safe (default empty).
 +# mysql_instances (str): Set to "" by default.
 +#                       If defined, list of instances to enable
  
  . /etc/rc.subr
  
 @@ -26,32 +28,86 @@
  
  : ${mysql_enable="NO"}
  : ${mysql_limits="NO"}
 +: ${mysql_user="mysql"}
  : ${mysql_dbdir="/var/db/mysql"}
  
 -mysql_user="mysql"
 -mysql_limits_args="-e -U ${mysql_user}"
 -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"
 +
 +if [ -n "$2" ]; then
 +	instance="$2"
 +	load_rc_config ${name}_${instance}
 +	case "$mysql_instances" in
 +	"$2 "*|*" $2 "*|*" $2"|"$2")
 +		eval _args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
 +		eval _dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
 +		eval _limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
 +		eval _user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
 +		eval _limits_args="\${mysql_${instance}_limits_args:-\"${mysql_limits_args}\"}"
 +		[ -z "$_limits_args" ] && eval _limits_args=\"-e -U $_user\"
 +		pidfile="${_dbdir}/`/bin/hostname`.pid"
 +	;;
 +	*)
 +		err 1 "$2 not found in mysql_instances" ;;
 +	esac
 +else
 +	if [ -n "${mysql_instances}" -a -n "$1" ]; then
 +		for instance in ${mysql_instances}; do
 +			eval _enable="\${mysql_${instance}_enable}"
 +			case "${_enable:-${mysql_enable}}" in
 +			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 +				continue
 +			;;
 +			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 +			;;
 +			*)
 +				if [ -z "$_enable" ]; then
 +					_var=mysql_enable
 +				else
 +					_var=mysql_${instance}_enable
 +				fi
 +				warn "Bad value" \
 +					"'${_enable:-${mysql_enable}}'" \
 +					"for ${_var}. " \
 +					"Instance ${instance} skipped."
 +				continue
 +			;;
 +			esac
 +			echo "===> mysql instance: ${instance}"
 +			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
 +				success="${instance} ${success}"
 +			else
 +				failed="${instance} (${retcode}) ${failed}"
 +			fi
 +		done
 +		exit 0
 +	else
 +		pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
 +		_dbdir="/var/db/mysql"
 +		_user="mysql"
 +		_limits_args="-e -U ${_user}"
 +	fi
 +fi
 +
  mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
 -mysql_install_db_args="--ldata=${mysql_dbdir}"
 +mysql_install_db_args="--ldata=${_dbdir}"
 +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${_dbdir}/my.cnf --user=${_user} --datadir=${_dbdir} --pid-file=${pidfile} ${_args}"
  
  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}
 +        [ $? -eq 0 ] && chown -R ${_user}:${_user} ${_dbdir}
  }
  
  mysql_prestart()
  {
 -	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 +	if [ ! -d "${_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
 +		eval `/usr/bin/limits $_limits_args` 2>/dev/null
  	else
  		return 0
  	fi
 
 --------------070709080307060106030207--

From: Doug Barton <dougb@FreeBSD.org>
To: bug-followup@FreeBSD.org, dgeo@centrale-marseille.fr
Cc:  
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: [SUMMARIZE
 CHANGES]
Date: Mon, 26 Dec 2011 23:24:42 -0800

 Any progress on a .10 update? I was sort of hoping to commit this new
 script along with the new version.
 
 
 Doug
 
 -- 
 
 	Breadth of IT experience, and depth of knowledge in the DNS.
 	Yours for the right price.  :)  http://SupersetSolutions.com/
 

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: bug-followup@FreeBSD.org, dgeo@centrale-marseille.fr
Cc: Doug Barton <dougb@FreeBSD.org>, =?UTF-8?B?0JTQtdC90LjRgSBub25l?=
 <pandorabox2007@gmail.com>
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: upstream
 upgrade and multi-instances
Date: Wed, 04 Jan 2012 15:27:22 +0100

 This is a multi-part message in MIME format.
 --------------070608030407050501060601
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: quoted-printable
 
 Same patch, with upstream upgrade (5.2.10)
 
 Includes a patch to auth_pam.c to let it compile (should disappear in=20
 next upstream release)
 
 Happy new year !
 --=20
 *Geoffroy Desvernay*
 C.R.I - Administration syst=C3=A8mes et r=C3=A9seaux
 Ecole Centrale de Marseille
 
 
 --------------070608030407050501060601
 Content-Type: text/x-diff;
  name="mariadb.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mariadb.diff"
 
 ===> Generating patch
 ===> Viewing diff with more
 diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/Makefile /usr/ports/databases/mariadb-server/Makefile
 --- /usr/ports/databases/mariadb-server.orig/Makefile	2011-09-30 01:20:49.000000000 +0200
 +++ /usr/ports/databases/mariadb-server/Makefile	2011-12-27 20:33:40.000000000 +0100
 @@ -5,7 +5,7 @@
  # $FreeBSD: ports/databases/mariadb-server/Makefile,v 1.14 2011/09/29 23:20:49 dougb Exp $
  
  PORTNAME=	mariadb
 -PORTVERSION=	5.2.9
 +PORTVERSION=	5.2.10
  PORTREVISION?=	0
  CATEGORIES=	databases ipv6
  MASTER_SITES=	http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/distinfo /usr/ports/databases/mariadb-server/distinfo
 --- /usr/ports/databases/mariadb-server.orig/distinfo	2011-09-30 01:20:49.000000000 +0200
 +++ /usr/ports/databases/mariadb-server/distinfo	2011-12-27 20:38:48.000000000 +0100
 @@ -1,2 +1,2 @@
 -SIZE (mariadb-5.2.9.tar.gz) = 25107185
 -SHA256 (mariadb-5.2.9.tar.gz) = 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611
 +SIZE (mariadb-5.2.10.tar.gz) = 25242675
 +SHA256 (mariadb-5.2.10.tar.gz) = dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
 diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/files/mysql-server.in /usr/ports/databases/mariadb-server/files/mysql-server.in
 --- /usr/ports/databases/mariadb-server.orig/files/mysql-server.in	2011-06-04 10:24:04.000000000 +0200
 +++ /usr/ports/databases/mariadb-server/files/mysql-server.in	2011-12-27 20:33:23.000000000 +0100
 @@ -16,6 +16,8 @@
  #			Base database directory.
  # mysql_args (str):	Custom additional arguments to be passed
  #			to mysqld_safe (default empty).
 +# mysql_instances (str): Set to "" by default.
 +#                       If defined, list of instances to enable
  
  . /etc/rc.subr
  
 @@ -26,32 +28,86 @@
  
  : ${mysql_enable="NO"}
  : ${mysql_limits="NO"}
 +: ${mysql_user="mysql"}
  : ${mysql_dbdir="/var/db/mysql"}
  
 -mysql_user="mysql"
 -mysql_limits_args="-e -U ${mysql_user}"
 -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"
 +
 +if [ -n "$2" ]; then
 +	instance="$2"
 +	load_rc_config ${name}_${instance}
 +	case "$mysql_instances" in
 +	"$2 "*|*" $2 "*|*" $2"|"$2")
 +		eval _args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
 +		eval _dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
 +		eval _limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
 +		eval _user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
 +		eval _limits_args="\${mysql_${instance}_limits_args:-\"${mysql_limits_args}\"}"
 +		[ -z "$_limits_args" ] && eval _limits_args=\"-e -U $_user\"
 +		pidfile="${_dbdir}/`/bin/hostname`.pid"
 +	;;
 +	*)
 +		err 1 "$2 not found in mysql_instances" ;;
 +	esac
 +else
 +	if [ -n "${mysql_instances}" -a -n "$1" ]; then
 +		for instance in ${mysql_instances}; do
 +			eval _enable="\${mysql_${instance}_enable}"
 +			case "${_enable:-${mysql_enable}}" in
 +			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 +				continue
 +			;;
 +			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 +			;;
 +			*)
 +				if [ -z "$_enable" ]; then
 +					_var=mysql_enable
 +				else
 +					_var=mysql_${instance}_enable
 +				fi
 +				warn "Bad value" \
 +					"'${_enable:-${mysql_enable}}'" \
 +					"for ${_var}. " \
 +					"Instance ${instance} skipped."
 +				continue
 +			;;
 +			esac
 +			echo "===> mysql instance: ${instance}"
 +			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
 +				success="${instance} ${success}"
 +			else
 +				failed="${instance} (${retcode}) ${failed}"
 +			fi
 +		done
 +		exit 0
 +	else
 +		pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
 +		_dbdir="/var/db/mysql"
 +		_user="mysql"
 +		_limits_args="-e -U ${_user}"
 +	fi
 +fi
 +
  mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
 -mysql_install_db_args="--ldata=${mysql_dbdir}"
 +mysql_install_db_args="--ldata=${_dbdir}"
 +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${_dbdir}/my.cnf --user=${_user} --datadir=${_dbdir} --pid-file=${pidfile} ${_args}"
  
  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}
 +        [ $? -eq 0 ] && chown -R ${_user}:${_user} ${_dbdir}
  }
  
  mysql_prestart()
  {
 -	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 +	if [ ! -d "${_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
 +		eval `/usr/bin/limits $_limits_args` 2>/dev/null
  	else
  		return 0
  	fi
 diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/files/mysql-server.in.orig /usr/ports/databases/mariadb-server/files/mysql-server.in.orig
 --- /usr/ports/databases/mariadb-server.orig/files/mysql-server.in.orig	1970-01-01 01:00:00.000000000 +0100
 +++ /usr/ports/databases/mariadb-server/files/mysql-server.in.orig	2011-06-04 10:24:04.000000000 +0200
 @@ -0,0 +1,70 @@
 +#!/bin/sh
 +
 +# $FreeBSD: ports/databases/mariadb-server/files/mysql-server.in,v 1.4 2011/06/04 08:24:04 dougb 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_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_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"
 diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/files/patch-plugin__auth_pam__auth_pam.c /usr/ports/databases/mariadb-server/files/patch-plugin__auth_pam__auth_pam.c
 --- /usr/ports/databases/mariadb-server.orig/files/patch-plugin__auth_pam__auth_pam.c	1970-01-01 01:00:00.000000000 +0100
 +++ /usr/ports/databases/mariadb-server/files/patch-plugin__auth_pam__auth_pam.c	2012-01-04 14:19:17.000000000 +0100
 @@ -0,0 +1,10 @@
 +--- plugin/auth_pam/auth_pam.c.orig	2012-01-04 14:17:30.000000000 +0100
 ++++ plugin/auth_pam/auth_pam.c	2012-01-04 14:17:36.000000000 +0100
 +@@ -1,7 +1,6 @@
 + #include <mysql/plugin_auth.h>
 + #include <string.h>
 + #include <security/pam_appl.h>
 +-#include <security/pam_modules.h>
 + 
 + struct param {
 +   unsigned char buf[10240], *ptr;
 diff -ruN --exclude=CVS /usr/ports/databases/mariadb-server.orig/pkg-plist /usr/ports/databases/mariadb-server/pkg-plist
 --- /usr/ports/databases/mariadb-server.orig/pkg-plist	2011-06-07 09:11:25.000000000 +0200
 +++ /usr/ports/databases/mariadb-server/pkg-plist	2012-01-04 15:16:57.000000000 +0100
 @@ -96,10 +96,18 @@
  %%NDB%%lib/mysql/libndbclient.so
  %%NDB%%lib/mysql/libndbclient.so.3
  lib/mysql/libvio.a
 +%%STATIC%%lib/mysql/plugin/auth_pam.a
 +%%STATIC%%lib/mysql/plugin/auth_pam.la
 +%%STATIC%%lib/mysql/plugin/auth_pam.so
 +%%STATIC%%lib/mysql/plugin/auth_pam.so.0
  %%STATIC%%lib/mysql/plugin/dialog.a
  %%STATIC%%lib/mysql/plugin/dialog.la
  %%STATIC%%lib/mysql/plugin/dialog.so
  %%STATIC%%lib/mysql/plugin/dialog.so.0
 +%%STATIC%%lib/mysql/plugin/feedback.a
 +%%STATIC%%lib/mysql/plugin/feedback.la
 +%%STATIC%%lib/mysql/plugin/feedback.so
 +%%STATIC%%lib/mysql/plugin/feedback.so.0
  %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
  %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
  %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so
 ===> Done
 
 --------------070608030407050501060601--
State-Changed-From-To: suspended->closed 
State-Changed-By: dougb 
State-Changed-When: Thu Jan 5 02:14:07 UTC 2012 
State-Changed-Why:  

Committed, thanks for all your hard work and patience. :) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161883 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161883: commit references a PR
Date: Thu,  5 Jan 2012 02:13:46 +0000 (UTC)

 dougb       2012-01-05 02:13:37 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/mariadb-server Makefile distinfo pkg-plist 
     databases/mariadb-server/files mysql-server.in 
   Added files:
     databases/mariadb-server/files 
                                    patch-plugin__auth_pam__auth_pam.c 
   Log:
   Upgrade to version 5.2.10:
   
   * Introduce a PAM authentication plugin
   * Various bug fixes
   
   For the rc.d script, add the ability to run multiple instances
   
   PR:             ports/161883
   Submitted by:   Geoffroy Desvernay <dgeo@centrale-marseille.fr> (maintainer)
   
   Revision  Changes    Path
   1.15      +1 -1      ports/databases/mariadb-server/Makefile
   1.9       +2 -2      ports/databases/mariadb-server/distinfo
   1.5       +65 -9     ports/databases/mariadb-server/files/mysql-server.in
   1.1       +10 -0     ports/databases/mariadb-server/files/patch-plugin__auth_pam__auth_pam.c (new)
   1.7       +8 -0      ports/databases/mariadb-server/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: =?UTF-8?B?aW50ZXJmYVN5cyBzw6BybA==?= <interfasys@gmail.com>
To: bug-followup@FreeBSD.org, dgeo@centrale-marseille.fr
Cc:  
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: [SUMMARIZE
 CHANGES]
Date: Mon, 09 Jan 2012 11:08:28 +0000

 The rc.d script is broken.
 mysql_dbdir is not used anymore when looking for the datadir and the
 configuration file even though it's defined in rc.conf.
 
 mysql_enable="YES"
 mysql_dbdir="/dbs/mysql"
 
 
 This is what is launched
 mysql    72088  0.0  0.0  8328  1836  ??  Is   11:40AM   0:00.01 /bin/sh
 /usr/local/bin/mysqld_safe --defaults-extra-file=/var/db/mysql/my.cnf
 --user=mysql --datadir=/var/db/mysql --pid-file=/dbs/mysql/host.net.pid
 
 
 Cheers,
 
 Olivier

From: geoffroy desvernay <dgeo@centrale-marseille.fr>
To: =?UTF-8?B?aW50ZXJmYVN5cyBzw6BybA==?= <interfasys@gmail.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/161883: [MAINTAINER] databases/mariadb-server: [SUMMARIZE
 CHANGES]
Date: Mon, 09 Jan 2012 15:06:48 +0100

 This is a multi-part message in MIME format.
 --------------000602070801080806050504
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 8bit
 
 On 09.01.2012 12:08, interfaSys sàrl wrote:
 > The rc.d script is broken.
 > mysql_dbdir is not used anymore when looking for the datadir and the
 > configuration file even though it's defined in rc.conf.
 >
 > mysql_enable="YES"
 > mysql_dbdir="/dbs/mysql"
 >
 >
 > This is what is launched
 > mysql    72088  0.0  0.0  8328  1836  ??  Is   11:40AM   0:00.01 /bin/sh
 > /usr/local/bin/mysqld_safe --defaults-extra-file=/var/db/mysql/my.cnf
 > --user=mysql --datadir=/var/db/mysql --pid-file=/dbs/mysql/host.net.pid
 >
 >
 > Cheers,
 >
 > Olivier
 
 I found another bug: did not taks '_user' into account for different 
 instances.
 
 Patch attached to correct this
 
 Thanks !
 -- 
 *geoffroy desvernay*
 C.R.I - Administration systèmes et réseaux
 Ecole Centrale de Marseille
 
 --------------000602070801080806050504
 Content-Type: text/plain;
  name="mariadb.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
  filename="mariadb.diff"
 
 PT09PiBHZW5lcmF0aW5nIHBhdGNoCj09PT4gVmlld2luZyBkaWZmIHdpdGggbW9yZQpkaWZm
 IC1ydU4gLS1leGNsdWRlPUNWUyAvdXNyL3BvcnRzL2RhdGFiYXNlcy9tYXJpYWRiLXNlcnZl
 ci5vcmlnL2ZpbGVzL215c3FsLXNlcnZlci5pbiAvdXNyL3BvcnRzL2RhdGFiYXNlcy9tYXJp
 YWRiLXNlcnZlci9maWxlcy9teXNxbC1zZXJ2ZXIuaW4KLS0tIC91c3IvcG9ydHMvZGF0YWJh
 c2VzL21hcmlhZGItc2VydmVyLm9yaWcvZmlsZXMvbXlzcWwtc2VydmVyLmluCTIwMTItMDEt
 MDUgMDM6MTM6MzYuMDAwMDAwMDAwICswMTAwCisrKyAvdXNyL3BvcnRzL2RhdGFiYXNlcy9t
 YXJpYWRiLXNlcnZlci9maWxlcy9teXNxbC1zZXJ2ZXIuaW4JMjAxMi0wMS0wOSAxNDo0Mjoy
 OC4wMDAwMDAwMDAgKzAxMDAKQEAgLTEsNiArMSw2IEBACiAjIS9iaW4vc2gKIAotIyAkRnJl
 ZUJTRDogcG9ydHMvZGF0YWJhc2VzL21hcmlhZGItc2VydmVyL2ZpbGVzL215c3FsLXNlcnZl
 ci5pbix2IDEuNSAyMDEyLzAxLzA1IDAyOjEzOjM2IGRvdWdiIEV4cCAkCisjICRGcmVlQlNE
 OiBwb3J0cy9kYXRhYmFzZXMvbWFyaWFkYi1zZXJ2ZXIvZmlsZXMvbXlzcWwtc2VydmVyLmlu
 LHYgMS40IDIwMTEvMDYvMDQgMDg6MjQ6MDQgZG91Z2IgRXhwICQKICMKICMgUFJPVklERTog
 bXlzcWwKICMgUkVRVUlSRTogTE9HSU4KQEAgLTI5LDYgKzI5LDcgQEAKIDogJHtteXNxbF9l
 bmFibGU9Ik5PIn0KIDogJHtteXNxbF9saW1pdHM9Ik5PIn0KIDogJHtteXNxbF91c2VyPSJt
 eXNxbCJ9Cis6ICR7bXlzcWxfbGltaXRzX2FyZ3M9Ii1lIC1VICRteXNxbF91c2VyIn0KIDog
 JHtteXNxbF9kYmRpcj0iL3Zhci9kYi9teXNxbCJ9CiAKIGNvbW1hbmQ9Ii91c3Ivc2Jpbi9k
 YWVtb24iCkBAIC00MSwxMyArNDIsMTIgQEAKIAlsb2FkX3JjX2NvbmZpZyAke25hbWV9XyR7
 aW5zdGFuY2V9CiAJY2FzZSAiJG15c3FsX2luc3RhbmNlcyIgaW4KIAkiJDIgIip8KiIgJDIg
 Iip8KiIgJDIifCIkMiIpCi0JCWV2YWwgX2FyZ3M9Ilwke215c3FsXyR7aW5zdGFuY2V9X2Fy
 Z3M6LVwiJHtteXNxbF9hcmdzfVwifSIKLQkJZXZhbCBfZGJkaXI9Ilwke215c3FsXyR7aW5z
 dGFuY2V9X2RiZGlyOi1cIi92YXIvZGIvbXlzcWxfJHtpbnN0YW5jZX1cIn0iCi0JCWV2YWwg
 X2xpbWl0cz0iXCR7bXlzcWxfJHtpbnN0YW5jZX1fbGltaXRzOi1cIiR7bXlzcWxfbGltaXRz
 fVwifSIKLQkJZXZhbCBfdXNlcj0iXCR7bXlzcWxfJHtpbnN0YW5jZX1fdXNlcjotXCIke215
 c3FsX3VzZXJ9XCJ9IgotCQlldmFsIF9saW1pdHNfYXJncz0iXCR7bXlzcWxfJHtpbnN0YW5j
 ZX1fbGltaXRzX2FyZ3M6LVwiJHtteXNxbF9saW1pdHNfYXJnc31cIn0iCi0JCVsgLXogIiRf
 bGltaXRzX2FyZ3MiIF0gJiYgZXZhbCBfbGltaXRzX2FyZ3M9XCItZSAtVSAkX3VzZXJcIgot
 CQlwaWRmaWxlPSIke19kYmRpcn0vYC9iaW4vaG9zdG5hbWVgLnBpZCIKKwkJZXZhbCBteXNx
 bF9hcmdzPSJcJHtteXNxbF8ke2luc3RhbmNlfV9hcmdzOi1cIiR7bXlzcWxfYXJnc31cIn0i
 CisJCWV2YWwgbXlzcWxfZGJkaXI9Ilwke215c3FsXyR7aW5zdGFuY2V9X2RiZGlyOi1cIi92
 YXIvZGIvbXlzcWxfJHtpbnN0YW5jZX1cIn0iCisJCWV2YWwgbXlzcWxfbGltaXRzPSJcJHtt
 eXNxbF8ke2luc3RhbmNlfV9saW1pdHM6LVwiJHtteXNxbF9saW1pdHN9XCJ9IgorCQlldmFs
 IG15c3FsX3VzZXI9Ilwke215c3FsXyR7aW5zdGFuY2V9X3VzZXI6LVwiJHtteXNxbF91c2Vy
 fVwifSIKKwkJZXZhbCBteXNxbF9saW1pdHNfYXJncz0iXCR7bXlzcWxfJHtpbnN0YW5jZX1f
 bGltaXRzX2FyZ3M6LVwiJHtteXNxbF9saW1pdHNfYXJnc31cIn0iCisJCXBpZGZpbGU9IiR7
 bXlzcWxfZGJkaXJ9L2AvYmluL2hvc3RuYW1lYC5waWQiCiAJOzsKIAkqKQogCQllcnIgMSAi
 JDIgbm90IGZvdW5kIGluIG15c3FsX2luc3RhbmNlcyIgOzsKQEAgLTc2LDcgKzc2LDcgQEAK
 IAkJCTs7CiAJCQllc2FjCiAJCQllY2hvICI9PT0+IG15c3FsIGluc3RhbmNlOiAke2luc3Rh
 bmNlfSIKLQkJCWlmICUlUFJFRklYJSUvZXRjL3JjLmQvbXlzcWwtc2VydmVyICQxICR7aW5z
 dGFuY2V9OyB0aGVuCisJCQlpZiAvdXNyL2xvY2FsL2V0Yy9yYy5kL215c3FsLXNlcnZlciAk
 MSAke2luc3RhbmNlfTsgdGhlbgogCQkJCXN1Y2Nlc3M9IiR7aW5zdGFuY2V9ICR7c3VjY2Vz
 c30iCiAJCQllbHNlCiAJCQkJZmFpbGVkPSIke2luc3RhbmNlfSAoJHtyZXRjb2RlfSkgJHtm
 YWlsZWR9IgpAQCAtODUsMjkgKzg1LDI2IEBACiAJCWV4aXQgMAogCWVsc2UKIAkJcGlkZmls
 ZT0iJHtteXNxbF9kYmRpcn0vYC9iaW4vaG9zdG5hbWVgLnBpZCIKLQkJX2RiZGlyPSIvdmFy
 L2RiL215c3FsIgotCQlfdXNlcj0ibXlzcWwiCi0JCV9saW1pdHNfYXJncz0iLWUgLVUgJHtf
 dXNlcn0iCiAJZmkKIGZpCiAKIG15c3FsX2luc3RhbGxfZGI9IiUlUFJFRklYJSUvYmluL215
 c3FsX2luc3RhbGxfZGIiCi1teXNxbF9pbnN0YWxsX2RiX2FyZ3M9Ii0tbGRhdGE9JHtfZGJk
 aXJ9IgotY29tbWFuZF9hcmdzPSItYyAtZiAlJVBSRUZJWCUlL2Jpbi9teXNxbGRfc2FmZSAt
 LWRlZmF1bHRzLWV4dHJhLWZpbGU9JHtfZGJkaXJ9L215LmNuZiAtLXVzZXI9JHtfdXNlcn0g
 LS1kYXRhZGlyPSR7X2RiZGlyfSAtLXBpZC1maWxlPSR7cGlkZmlsZX0gJHtfYXJnc30iCitt
 eXNxbF9pbnN0YWxsX2RiX2FyZ3M9Ii0tbGRhdGE9JHtteXNxbF9kYmRpcn0iCitjb21tYW5k
 X2FyZ3M9Ii1jIC1mICUlUFJFRklYJSUvYmluL215c3FsZF9zYWZlIC0tZGVmYXVsdHMtZXh0
 cmEtZmlsZT0ke215c3FsX2RiZGlyfS9teS5jbmYgLS11c2VyPSR7bXlzcWxfdXNlcn0gLS1k
 YXRhZGlyPSR7bXlzcWxfZGJkaXJ9IC0tcGlkLWZpbGU9JHtwaWRmaWxlfSAke215c3FsX2Fy
 Z3N9IgogCiBteXNxbF9jcmVhdGVfYXV0aF90YWJsZXMoKQogewotCWV2YWwgJG15c3FsX2lu
 c3RhbGxfZGIgJG15c3FsX2luc3RhbGxfZGJfYXJncyA+L2Rldi9udWxsIDI+L2Rldi9udWxs
 Ci0gICAgICAgIFsgJD8gLWVxIDAgXSAmJiBjaG93biAtUiAke191c2VyfToke191c2VyfSAk
 e19kYmRpcn0KKwlldmFsICRteXNxbF9pbnN0YWxsX2RiICRteXNxbF9pbnN0YWxsX2RiX2Fy
 Z3MKKyAgICAgICAgWyAkPyAtZXEgMCBdICYmIGNob3duIC1SICR7bXlzcWxfdXNlcn06JChp
 ZCAtZ24gJG15c3FsX3VzZXIpICR7bXlzcWxfZGJkaXJ9CiB9CiAKIG15c3FsX3ByZXN0YXJ0
 KCkKIHsKLQlpZiBbICEgLWQgIiR7X2RiZGlyfS9teXNxbC8uIiBdOyB0aGVuCisJaWYgWyAh
 IC1kICIke215c3FsX2RiZGlyfS9teXNxbC8uIiBdOyB0aGVuCiAJCW15c3FsX2NyZWF0ZV9h
 dXRoX3RhYmxlcyB8fCByZXR1cm4gMQogCWZpCiAJaWYgY2hlY2t5ZXNubyBteXNxbF9saW1p
 dHM7IHRoZW4KLQkJZXZhbCBgL3Vzci9iaW4vbGltaXRzICRfbGltaXRzX2FyZ3NgIDI+L2Rl
 di9udWxsCisJCWV2YWwgYC91c3IvYmluL2xpbWl0cyAke215c3FsX2xpbWl0c19hcmdzOi0i
 LWUgLVUgJG15c3FsX3VzZXIifWAgMj4vZGV2L251bGwKIAllbHNlCiAJCXJldHVybiAwCiAJ
 ZmkKPT09PiBEb25lCg==
 --------------000602070801080806050504--
>Unformatted:
