Rename rc.conf variables syslog_ng_config and syslog_ng_pid to

syslog_ng_flags and syslog_ng_pidfile respecively, making them
consistent with the rest of the ports tree.

PR:		249984
Submitted by:	Boris Korzun <drtr0jan@yandex.ru>
Reviewed by:	Peter Czanik (syslog-ng upstream)
This commit is contained in:
Cy Schubert 2020-09-29 17:04:50 +00:00
parent 01aad17939
commit f15a5caf53
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=550534
10 changed files with 127 additions and 56 deletions

View File

@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20200930:
AFFECTS: users of sysutils/syslog-ng32[789]
AUTHOR: cy@FreeBSD.org
rc.conf variables syslog_ng_config and syslog_ng_pid have been replaced
by syslog_ng_flags and syslog_ng_pidfile respecively, making them
consistent with the rest of the ports tree. syslog_ng_config and
syslog_ng_pid will continue to work until syslog-ng331 has been
released and imported into ports.
20200924:
AFFECTS: users of net/freeradius3, who need python support
AUTHOR: zi@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= syslog-ng
DISTVERSION= 3.27.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
.if !defined(MASTERDIR)

View File

@ -30,4 +30,12 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd
%%PREFIX%%/etc/rc.d/syslog-ng start
EOM
}
{ type: upgrade
maximum_version: "3.27.1_1"
message: <<EOM
When upgrading from before 3.29.1 these variables, if used, should be replaced:
* syslog_ng_flags replaces syslog_ng_config (syslog_ng_config still works),
* syslog_ng_pidfile replaces syslog_ng_pid (syslog_ng_pid still works).
EOM
}
]

View File

@ -12,35 +12,47 @@
# to enable this service:
#
#syslog_ng_enable="YES"
#syslog_ng_config="-u daemon"
#syslog_ng_pid="/var/run/syslog-ng.pid"
#syslog_ng_flags="-u daemon"
#syslog_ng_pidfile="/var/run/syslog-ng.pid"
#
syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"}
. /etc/rc.subr
name=syslog_ng
rcvar=syslog_ng_enable
command=%%PREFIX%%/sbin/syslog-ng
required_files=%%PREFIX%%/etc/syslog-ng.conf
extra_commands=reload
if checkyesno syslog_ng_purgeklog; then
start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd";
fi
stop_postcmd=stop_postcmd
load_rc_config $name
: ${syslog_ng_enable:="NO"}
pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"}
command_args="-p ${pidfile} ${syslog_ng_config}"
: ${syslog_ng_purgeklog:="NO"}
: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"}
: ${syslog_ng_pidfile:=/var/run/syslog.pid}
stop_postcmd() {
rm -f $pidfile
# backwards compatibility
if [ -n "${syslog_ng_pid}" ]; then
syslog_ng_pidfile="${syslog_ng_pid}"
fi
if [ ! -f "${syslog_ng_config}" ]; then
syslog_ng_flags="${syslog_ng_config}"
syslog_ng_config="%%PREFIX%%/etc/syslog-ng.conf"
fi
if checkyesno syslog_ng_purgeklog; then
start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1"
fi
pidfile="${syslog_ng_pidfile}"
required_files="${syslog_ng_config}"
command="%%PREFIX%%/sbin/syslog-ng"
command_args="-f ${syslog_ng_config} -p ${pidfile}"
stop_postcmd="stop_postcmd"
extra_commands="reload"
stop_postcmd()
{
rm -f "${pidfile}"
}
run_rc_command "$1"

View File

@ -3,7 +3,7 @@
PORTNAME= syslog-ng
DISTVERSION= 3.28.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
.if !defined(MASTERDIR)

View File

@ -30,4 +30,12 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd
%%PREFIX%%/etc/rc.d/syslog-ng start
EOM
}
{ type: upgrade
maximum_version: "3.28.1_1"
message: <<EOM
When upgrading from before 3.29.1 these variables, if used, should be replaced:
* syslog_ng_flags replaces syslog_ng_config (syslog_ng_config still works),
* syslog_ng_pidfile replaces syslog_ng_pid (syslog_ng_pid still works).
EOM
}
]

View File

@ -12,35 +12,47 @@
# to enable this service:
#
#syslog_ng_enable="YES"
#syslog_ng_config="-u daemon"
#syslog_ng_pid="/var/run/syslog-ng.pid"
#syslog_ng_flags="-u daemon"
#syslog_ng_pidfile="/var/run/syslog-ng.pid"
#
syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"}
. /etc/rc.subr
name=syslog_ng
rcvar=syslog_ng_enable
command=%%PREFIX%%/sbin/syslog-ng
required_files=%%PREFIX%%/etc/syslog-ng.conf
extra_commands=reload
if checkyesno syslog_ng_purgeklog; then
start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd";
fi
stop_postcmd=stop_postcmd
load_rc_config $name
: ${syslog_ng_enable:="NO"}
pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"}
command_args="-p ${pidfile} ${syslog_ng_config}"
: ${syslog_ng_purgeklog:="NO"}
: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"}
: ${syslog_ng_pidfile:=/var/run/syslog.pid}
stop_postcmd() {
rm -f $pidfile
# backwards compatibility
if [ -n "${syslog_ng_pid}" ]; then
syslog_ng_pidfile="${syslog_ng_pid}"
fi
if [ ! -f "${syslog_ng_config}" ]; then
syslog_ng_flags="${syslog_ng_config}"
syslog_ng_config="%%PREFIX%%/etc/syslog-ng.conf"
fi
if checkyesno syslog_ng_purgeklog; then
start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1"
fi
pidfile="${syslog_ng_pidfile}"
required_files="${syslog_ng_config}"
command="%%PREFIX%%/sbin/syslog-ng"
command_args="-f ${syslog_ng_config} -p ${pidfile}"
stop_postcmd="stop_postcmd"
extra_commands="reload"
stop_postcmd()
{
rm -f "${pidfile}"
}
run_rc_command "$1"

View File

@ -3,6 +3,7 @@
PORTNAME= syslog-ng
DISTVERSION= 3.29.1
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
.if !defined(MASTERDIR)

View File

@ -30,4 +30,12 @@ syslog-ng is now installed! To replace FreeBSD's standard syslogd
%%PREFIX%%/etc/rc.d/syslog-ng start
EOM
}
{ type: upgrade
maximum_version: "3.29.1"
message: <<EOM
When upgrading from before 3.29.1 these variables, if used, should be replaced:
* syslog_ng_flags replaces syslog_ng_config (syslog_ng_config still works),
* syslog_ng_pidfile replaces syslog_ng_pid (syslog_ng_pid still works).
EOM
}
]

View File

@ -12,35 +12,47 @@
# to enable this service:
#
#syslog_ng_enable="YES"
#syslog_ng_config="-u daemon"
#syslog_ng_pid="/var/run/syslog-ng.pid"
#syslog_ng_flags="-u daemon"
#syslog_ng_pidfile="/var/run/syslog-ng.pid"
#
syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"}
. /etc/rc.subr
name=syslog_ng
rcvar=syslog_ng_enable
command=%%PREFIX%%/sbin/syslog-ng
required_files=%%PREFIX%%/etc/syslog-ng.conf
extra_commands=reload
if checkyesno syslog_ng_purgeklog; then
start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd";
fi
stop_postcmd=stop_postcmd
load_rc_config $name
: ${syslog_ng_enable:="NO"}
pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"}
command_args="-p ${pidfile} ${syslog_ng_config}"
: ${syslog_ng_purgeklog:="NO"}
: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"}
: ${syslog_ng_pidfile:=/var/run/syslog.pid}
stop_postcmd() {
rm -f $pidfile
# backwards compatibility
if [ -n "${syslog_ng_pid}" ]; then
syslog_ng_pidfile="${syslog_ng_pid}"
fi
if [ ! -f "${syslog_ng_config}" ]; then
syslog_ng_flags="${syslog_ng_config}"
syslog_ng_config="%%PREFIX%%/etc/syslog-ng.conf"
fi
if checkyesno syslog_ng_purgeklog; then
start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1"
fi
pidfile="${syslog_ng_pidfile}"
required_files="${syslog_ng_config}"
command="%%PREFIX%%/sbin/syslog-ng"
command_args="-f ${syslog_ng_config} -p ${pidfile}"
stop_postcmd="stop_postcmd"
extra_commands="reload"
stop_postcmd()
{
rm -f "${pidfile}"
}
run_rc_command "$1"