Attachment #119369 for bug #161883

Lines 5-11 Link Here

(-)/usr/ports/databases/mariadb-server/Makefile (-1 / +1 lines)
5	# $FreeBSD: ports/databases/mariadb-server/Makefile,v 1.14 2011/09/29 23:20:49 dougb Exp $	5	# $FreeBSD: ports/databases/mariadb-server/Makefile,v 1.14 2011/09/29 23:20:49 dougb Exp $
6		6
7	PORTNAME= mariadb	7	PORTNAME= mariadb
8	PORTVERSION= 5.2.9	8	PORTVERSION= 5.2.10
9	PORTREVISION?= 0	9	PORTREVISION?= 0
10	CATEGORIES= databases ipv6	10	CATEGORIES= databases ipv6
11	MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \	11	MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \

Lines 1-2 Link Here

(-)/usr/ports/databases/mariadb-server/distinfo (-2 / +2 lines)
1	SIZE (mariadb-5.2.9.tar.gz) = 25107185	1	SIZE (mariadb-5.2.10.tar.gz) = 25242675
2	SHA256 (mariadb-5.2.9.tar.gz) = 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611	2	SHA256 (mariadb-5.2.10.tar.gz) = dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3




#			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



: ${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=${_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 ${_user}:${_user} ${_dbdir}
}

mysql_prestart()
{
	if [ ! -d "${_dbdir}/mysql/." ]; then
		mysql_create_auth_tables || return 1
	fi
	if checkyesno mysql_limits; then
		eval `/usr/bin/limits $_limits_args` 2>/dev/null
	else
		return 0
	fi




#!/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"

Line 0 Link Here

(-)/usr/ports/databases/mariadb-server/files/patch-plugin__auth_pam__auth_pam.c (+10 lines)
	1	--- plugin/auth_pam/auth_pam.c.orig 2012-01-04 14:17:30.000000000 +0100
	2	+++ plugin/auth_pam/auth_pam.c 2012-01-04 14:17:36.000000000 +0100
	3	@@ -1,7 +1,6 @@
	4	#include <mysql/plugin_auth.h>
	5	#include <string.h>
	6	#include <security/pam_appl.h>
	7	-#include <security/pam_modules.h>
	8
	9	struct param {
	10	unsigned char buf[10240], *ptr;

Lines 96-105 Link Here

(-)/usr/ports/databases/mariadb-server/pkg-plist (+8 lines)
96	%%NDB%%lib/mysql/libndbclient.so	96	%%NDB%%lib/mysql/libndbclient.so
97	%%NDB%%lib/mysql/libndbclient.so.3	97	%%NDB%%lib/mysql/libndbclient.so.3
98	lib/mysql/libvio.a	98	lib/mysql/libvio.a
		99	%%STATIC%%lib/mysql/plugin/auth_pam.a
		100	%%STATIC%%lib/mysql/plugin/auth_pam.la
		101	%%STATIC%%lib/mysql/plugin/auth_pam.so
		102	%%STATIC%%lib/mysql/plugin/auth_pam.so.0
99	%%STATIC%%lib/mysql/plugin/dialog.a	103	%%STATIC%%lib/mysql/plugin/dialog.a
100	%%STATIC%%lib/mysql/plugin/dialog.la	104	%%STATIC%%lib/mysql/plugin/dialog.la
101	%%STATIC%%lib/mysql/plugin/dialog.so	105	%%STATIC%%lib/mysql/plugin/dialog.so
102	%%STATIC%%lib/mysql/plugin/dialog.so.0	106	%%STATIC%%lib/mysql/plugin/dialog.so.0
		107	%%STATIC%%lib/mysql/plugin/feedback.a
		108	%%STATIC%%lib/mysql/plugin/feedback.la
		109	%%STATIC%%lib/mysql/plugin/feedback.so
		110	%%STATIC%%lib/mysql/plugin/feedback.so.0
103	%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a	111	%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
104	%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la	112	%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
105	%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so	113	%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so

Return to bug 161883

Lines 16-21 Link Here

(-)/usr/ports/databases/mariadb-server/files/mysql-server.in (-8 / +64 lines)
16	# Base database directory.	16	# Base database directory.
17	# mysql_args (str): Custom additional arguments to be passed	17	# mysql_args (str): Custom additional arguments to be passed
18	# to mysqld_safe (default empty).	18	# to mysqld_safe (default empty).
		19	# mysql_instances (str): Set to "" by default.
		20	# If defined, list of instances to enable
19		21
20	. /etc/rc.subr	22	. /etc/rc.subr
21		23
Lines 26-57 Link Here
26		28
27	: ${mysql_enable="NO"}	29	: ${mysql_enable="NO"}
28	: ${mysql_limits="NO"}	30	: ${mysql_limits="NO"}
		31	: ${mysql_user="mysql"}
29	: ${mysql_dbdir="/var/db/mysql"}	32	: ${mysql_dbdir="/var/db/mysql"}
30		33
31	mysql_user="mysql"
32	mysql_limits_args="-e -U ${mysql_user}"
33	pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
34	command="/usr/sbin/daemon"	34	command="/usr/sbin/daemon"
35	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}"
36	procname="%%PREFIX%%/libexec/mysqld"	35	procname="%%PREFIX%%/libexec/mysqld"
37	start_precmd="${name}_prestart"	36	start_precmd="${name}_prestart"
38	start_postcmd="${name}_poststart"	37	start_postcmd="${name}_poststart"
		38
		39	if [ -n "$2" ]; then
		40	instance="$2"
		41	load_rc_config ${name}_${instance}
		42	case "$mysql_instances" in
		43	"$2 "\|" $2 "\|" $2"\|"$2")
		44	eval _args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
		45	eval _dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
		46	eval _limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
		47	eval _user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
		48	eval _limits_args="\${mysql_${instance}_limits_args:-\"${mysql_limits_args}\"}"
		49	[ -z "$_limits_args" ] && eval _limits_args=\"-e -U $_user\"
		50	pidfile="${_dbdir}/`/bin/hostname`.pid"
		51	;;
		52	*)
		53	err 1 "$2 not found in mysql_instances" ;;
		54	esac
		55	else
		56	if [ -n "${mysql_instances}" -a -n "$1" ]; then
		57	for instance in ${mysql_instances}; do
		58	eval _enable="\${mysql_${instance}_enable}"
		59	case "${_enable:-${mysql_enable}}" in
		60	[Nn][Oo]\|[Ff][Aa][Ll][Ss][Ee]\|[Oo][Ff][Ff]\|0)
		61	continue
		62	;;
		63	[Yy][Ee][Ss]\|[Tt][Rr][Uu][Ee]\|[Oo][Nn]\|1)
		64	;;
		65	*)
		66	if [ -z "$_enable" ]; then
		67	_var=mysql_enable
		68	else
		69	_var=mysql_${instance}_enable
		70	fi
		71	warn "Bad value" \
		72	"'${_enable:-${mysql_enable}}'" \
		73	"for ${_var}. " \
		74	"Instance ${instance} skipped."
		75	continue
		76	;;
		77	esac
		78	echo "===> mysql instance: ${instance}"
		79	if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
		80	success="${instance} ${success}"
		81	else
		82	failed="${instance} (${retcode}) ${failed}"
		83	fi
		84	done
		85	exit 0
		86	else
		87	pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
		88	_dbdir="/var/db/mysql"
		89	_user="mysql"
		90	_limits_args="-e -U ${_user}"
		91	fi
		92	fi
		93
39	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"	94	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
40	mysql_install_db_args="--ldata=${mysql_dbdir}"	95	mysql_install_db_args="--ldata=${_dbdir}"
		96	command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${_dbdir}/my.cnf --user=${_user} --datadir=${_dbdir} --pid-file=${pidfile} ${_args}"
41		97
42	mysql_create_auth_tables()	98	mysql_create_auth_tables()
43	{	99	{
44	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null	100	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
45	[ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}	101	[ $? -eq 0 ] && chown -R ${_user}:${_user} ${_dbdir}
46	}	102	}
47		103
48	mysql_prestart()	104	mysql_prestart()
49	{	105	{
50	if [ ! -d "${mysql_dbdir}/mysql/." ]; then	106	if [ ! -d "${_dbdir}/mysql/." ]; then
51	mysql_create_auth_tables \|\| return 1	107	mysql_create_auth_tables \|\| return 1
52	fi	108	fi
53	if checkyesno mysql_limits; then	109	if checkyesno mysql_limits; then
54	eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null	110	eval `/usr/bin/limits $_limits_args` 2>/dev/null
55	else	111	else
56	return 0	112	return 0
57	fi	113	fi

Line 0 Link Here

(-)/usr/ports/databases/mariadb-server/files/mysql-server.in.orig (+70 lines)
		1	#!/bin/sh
		2
		3	# $FreeBSD: ports/databases/mariadb-server/files/mysql-server.in,v 1.4 2011/06/04 08:24:04 dougb Exp $
		4	#
		5	# PROVIDE: mysql
		6	# REQUIRE: LOGIN
		7	# KEYWORD: shutdown
		8	#
		9	# Add the following line to /etc/rc.conf to enable mysql:
		10	# mysql_enable (bool): Set to "NO" by default.
		11	# Set it to "YES" to enable MySQL.
		12	# mysql_limits (bool): Set to "NO" by default.
		13	# Set it to yes to run `limits -e -U mysql`
		14	# just before mysql starts.
		15	# mysql_dbdir (str): Default to "/var/db/mysql"
		16	# Base database directory.
		17	# mysql_args (str): Custom additional arguments to be passed
		18	# to mysqld_safe (default empty).
		19
		20	. /etc/rc.subr
		21
		22	name="mysql"
		23	rcvar=`set_rcvar`
		24
		25	load_rc_config $name
		26
		27	: ${mysql_enable="NO"}
		28	: ${mysql_limits="NO"}
		29	: ${mysql_dbdir="/var/db/mysql"}
		30
		31	mysql_user="mysql"
		32	mysql_limits_args="-e -U ${mysql_user}"
		33	pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
		34	command="/usr/sbin/daemon"
		35	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}"
		36	procname="%%PREFIX%%/libexec/mysqld"
		37	start_precmd="${name}_prestart"
		38	start_postcmd="${name}_poststart"
		39	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
		40	mysql_install_db_args="--ldata=${mysql_dbdir}"
		41
		42	mysql_create_auth_tables()
		43	{
		44	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
		45	[ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
		46	}
		47
		48	mysql_prestart()
		49	{
		50	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
		51	mysql_create_auth_tables \|\| return 1
		52	fi
		53	if checkyesno mysql_limits; then
		54	eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
		55	else
		56	return 0
		57	fi
		58	}
		59
		60	mysql_poststart()
		61	{
		62	local timeout=15
		63	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
		64	timeout=$(( timeout - 1 ))
65	sleep 1
66	done
67	return 0
68	}
69
70	run_rc_command "$1"