diff options
| -rw-r--r-- | UPDATING | 10 | ||||
| -rw-r--r-- | sysutils/syslog-ng327/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/syslog-ng327/files/pkg-message.in | 8 | ||||
| -rw-r--r-- | sysutils/syslog-ng327/files/syslog-ng.in | 42 | ||||
| -rw-r--r-- | sysutils/syslog-ng328/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/syslog-ng328/files/pkg-message.in | 8 | ||||
| -rw-r--r-- | sysutils/syslog-ng328/files/syslog-ng.in | 42 | ||||
| -rw-r--r-- | sysutils/syslog-ng329/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/syslog-ng329/files/pkg-message.in | 8 | ||||
| -rw-r--r-- | sysutils/syslog-ng329/files/syslog-ng.in | 42 |
10 files changed, 118 insertions, 47 deletions
@@ -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 diff --git a/sysutils/syslog-ng327/Makefile b/sysutils/syslog-ng327/Makefile index f9fe7dccfe13..7c19f55610b5 100644 --- a/sysutils/syslog-ng327/Makefile +++ b/sysutils/syslog-ng327/Makefile @@ -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) diff --git a/sysutils/syslog-ng327/files/pkg-message.in b/sysutils/syslog-ng327/files/pkg-message.in index 95140fc941eb..527815349bdc 100644 --- a/sysutils/syslog-ng327/files/pkg-message.in +++ b/sysutils/syslog-ng327/files/pkg-message.in @@ -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 +} ] diff --git a/sysutils/syslog-ng327/files/syslog-ng.in b/sysutils/syslog-ng327/files/syslog-ng.in index ae24e4984375..ed17c0eb363f 100644 --- a/sysutils/syslog-ng327/files/syslog-ng.in +++ b/sysutils/syslog-ng327/files/syslog-ng.in @@ -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 +load_rc_config $name + +: ${syslog_ng_enable:="NO"} +: ${syslog_ng_purgeklog:="NO"} +: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"} +: ${syslog_ng_pidfile:=/var/run/syslog.pid} + +# 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 $start_precmd"; + start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1" fi -stop_postcmd=stop_postcmd +pidfile="${syslog_ng_pidfile}" +required_files="${syslog_ng_config}" -load_rc_config $name +command="%%PREFIX%%/sbin/syslog-ng" +command_args="-f ${syslog_ng_config} -p ${pidfile}" -: ${syslog_ng_enable:="NO"} -pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"} -command_args="-p ${pidfile} ${syslog_ng_config}" +stop_postcmd="stop_postcmd" +extra_commands="reload" -stop_postcmd() { - rm -f $pidfile +stop_postcmd() +{ + rm -f "${pidfile}" } run_rc_command "$1" diff --git a/sysutils/syslog-ng328/Makefile b/sysutils/syslog-ng328/Makefile index 43579b7dcc82..02cace4f748d 100644 --- a/sysutils/syslog-ng328/Makefile +++ b/sysutils/syslog-ng328/Makefile @@ -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) diff --git a/sysutils/syslog-ng328/files/pkg-message.in b/sysutils/syslog-ng328/files/pkg-message.in index 95140fc941eb..08e414b722de 100644 --- a/sysutils/syslog-ng328/files/pkg-message.in +++ b/sysutils/syslog-ng328/files/pkg-message.in @@ -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 +} ] diff --git a/sysutils/syslog-ng328/files/syslog-ng.in b/sysutils/syslog-ng328/files/syslog-ng.in index ae24e4984375..ed17c0eb363f 100644 --- a/sysutils/syslog-ng328/files/syslog-ng.in +++ b/sysutils/syslog-ng328/files/syslog-ng.in @@ -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 +load_rc_config $name + +: ${syslog_ng_enable:="NO"} +: ${syslog_ng_purgeklog:="NO"} +: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"} +: ${syslog_ng_pidfile:=/var/run/syslog.pid} + +# 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 $start_precmd"; + start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1" fi -stop_postcmd=stop_postcmd +pidfile="${syslog_ng_pidfile}" +required_files="${syslog_ng_config}" -load_rc_config $name +command="%%PREFIX%%/sbin/syslog-ng" +command_args="-f ${syslog_ng_config} -p ${pidfile}" -: ${syslog_ng_enable:="NO"} -pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"} -command_args="-p ${pidfile} ${syslog_ng_config}" +stop_postcmd="stop_postcmd" +extra_commands="reload" -stop_postcmd() { - rm -f $pidfile +stop_postcmd() +{ + rm -f "${pidfile}" } run_rc_command "$1" diff --git a/sysutils/syslog-ng329/Makefile b/sysutils/syslog-ng329/Makefile index dc3a3ab45e23..3bcf3a023688 100644 --- a/sysutils/syslog-ng329/Makefile +++ b/sysutils/syslog-ng329/Makefile @@ -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) diff --git a/sysutils/syslog-ng329/files/pkg-message.in b/sysutils/syslog-ng329/files/pkg-message.in index 95140fc941eb..fb48e06bacbb 100644 --- a/sysutils/syslog-ng329/files/pkg-message.in +++ b/sysutils/syslog-ng329/files/pkg-message.in @@ -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 +} ] diff --git a/sysutils/syslog-ng329/files/syslog-ng.in b/sysutils/syslog-ng329/files/syslog-ng.in index ae24e4984375..ed17c0eb363f 100644 --- a/sysutils/syslog-ng329/files/syslog-ng.in +++ b/sysutils/syslog-ng329/files/syslog-ng.in @@ -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 +load_rc_config $name + +: ${syslog_ng_enable:="NO"} +: ${syslog_ng_purgeklog:="NO"} +: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"} +: ${syslog_ng_pidfile:=/var/run/syslog.pid} + +# 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 $start_precmd"; + start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1" fi -stop_postcmd=stop_postcmd +pidfile="${syslog_ng_pidfile}" +required_files="${syslog_ng_config}" -load_rc_config $name +command="%%PREFIX%%/sbin/syslog-ng" +command_args="-f ${syslog_ng_config} -p ${pidfile}" -: ${syslog_ng_enable:="NO"} -pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"} -command_args="-p ${pidfile} ${syslog_ng_config}" +stop_postcmd="stop_postcmd" +extra_commands="reload" -stop_postcmd() { - rm -f $pidfile +stop_postcmd() +{ + rm -f "${pidfile}" } run_rc_command "$1" |