FreeBSD Bugzilla – Attachment 192231 Details for
Bug 227236
databases/percona57-server: Adapt ${name}_limits to the new resource limiting mechanics for services
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch adding support for the new ${name}_limits mechanics (databases/percona57-server, revision: 1)
percona57-server--r1.diff (text/plain), 2.80 KB, created by
Mateusz Piotrowski
on 2018-04-04 18:20:01 UTC
(
hide
)
Description:
Patch adding support for the new ${name}_limits mechanics (databases/percona57-server, revision: 1)
Filename:
MIME Type:
Creator:
Mateusz Piotrowski
Created:
2018-04-04 18:20:01 UTC
Size:
2.80 KB
patch
obsolete
>diff --git databases/percona57-server/Makefile databases/percona57-server/Makefile >index 84deffb1f53c..ac0ad01fd155 100644 >--- databases/percona57-server/Makefile >+++ databases/percona57-server/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME?= percona > DISTVERSION= 5.7.21-20 >-PORTREVISION?= 0 >+PORTREVISION?= 1 > CATEGORIES= databases ipv6 > MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ > SF/boost/boost/1.59.0:boost >@@ -127,6 +127,15 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" > # But this keeps the pkg-plist not overlaping > CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0 > >+.include <bsd.port.options.mk> >+ >+.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1101514 || \ >+ ${OSVERSION} >= 1200000 && ${OSVERSION} < 1200057 >+SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " >+.else >+SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" >+.endif >+ > post-install: > ${MKDIR} ${STAGEDIR}/var/db/mysql > ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring >diff --git databases/percona57-server/files/mysql-server.in databases/percona57-server/files/mysql-server.in >index 719583c8c845..5c6041ffaa90 100644 >--- databases/percona57-server/files/mysql-server.in >+++ databases/percona57-server/files/mysql-server.in >@@ -11,9 +11,9 @@ > # 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. >+%%LEGACY_LIMITS%%# mysql_limits (bool): Set to "NO" by default. >+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` >+%%LEGACY_LIMITS%%# just before mysql starts. > # mysql_dbdir (str): Default to "%%MY_DBDIR%%" > # Base database directory. > # mysql_confdir (str): Default to "%%ETCDIR%%" >@@ -34,7 +34,7 @@ rcvar=mysql_enable > load_rc_config $name > > : ${mysql_enable="NO"} >-: ${mysql_limits="NO"} >+%%LEGACY_LIMITS%%: ${mysql_limits="NO"} > : ${mysql_dbdir="%%MY_DBDIR%%"} > : ${mysql_confdir="%%ETCDIR%%"} > if [ -f "${mysql_dbdir}/my.cnf" ]; then >@@ -44,7 +44,7 @@ else > fi > > mysql_user="mysql" >-mysql_limits_args="-e -U ${mysql_user}" >+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" > : ${hostname:=`/bin/hostname`} > pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} > command="/usr/sbin/daemon" >@@ -76,11 +76,12 @@ 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 >+%%LEGACY_LIMITS%% if checkyesno mysql_limits; then >+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null >+%%LEGACY_LIMITS%% else >+%%LEGACY_LIMITS%% return 0 >+%%LEGACY_LIMITS%% fi >+%%MODERN_LIMITS%% return 0 > } > > mysql_poststart()
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 227236
:
192152
|
192231
|
192417