Date: Tue, 29 Sep 2020 17:04:50 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550534 - in head: . sysutils/syslog-ng327 sysutils/syslog-ng327/files sysutils/syslog-ng328 sysutils/syslog-ng328/files sysutils/syslog-ng329 sysutils/syslog-ng329/files Message-ID: <202009291704.08TH4oAI045278@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Sep 29 17:04:50 2020 New Revision: 550534 URL: https://svnweb.freebsd.org/changeset/ports/550534 Log: 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) Modified: head/UPDATING head/sysutils/syslog-ng327/Makefile (contents, props changed) head/sysutils/syslog-ng327/files/pkg-message.in (contents, props changed) head/sysutils/syslog-ng327/files/syslog-ng.in head/sysutils/syslog-ng328/Makefile (contents, props changed) head/sysutils/syslog-ng328/files/pkg-message.in (contents, props changed) head/sysutils/syslog-ng328/files/syslog-ng.in head/sysutils/syslog-ng329/Makefile (contents, props changed) head/sysutils/syslog-ng329/files/pkg-message.in (contents, props changed) head/sysutils/syslog-ng329/files/syslog-ng.in Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Sep 29 17:02:31 2020 (r550533) +++ head/UPDATING Tue Sep 29 17:04:50 2020 (r550534) @@ -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 Modified: head/sysutils/syslog-ng327/Makefile ============================================================================== --- head/sysutils/syslog-ng327/Makefile Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng327/Makefile Tue Sep 29 17:04:50 2020 (r550534) @@ -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) Modified: head/sysutils/syslog-ng327/files/pkg-message.in ============================================================================== --- head/sysutils/syslog-ng327/files/pkg-message.in Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng327/files/pkg-message.in Tue Sep 29 17:04:50 2020 (r550534) @@ -30,4 +30,12 @@ syslog-ng is now installed! To replace FreeBSD's stan %%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 +} ] Modified: head/sysutils/syslog-ng327/files/syslog-ng.in ============================================================================== --- head/sysutils/syslog-ng327/files/syslog-ng.in Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng327/files/syslog-ng.in Tue Sep 29 17:04:50 2020 (r550534) @@ -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" Modified: head/sysutils/syslog-ng328/Makefile ============================================================================== --- head/sysutils/syslog-ng328/Makefile Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng328/Makefile Tue Sep 29 17:04:50 2020 (r550534) @@ -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) Modified: head/sysutils/syslog-ng328/files/pkg-message.in ============================================================================== --- head/sysutils/syslog-ng328/files/pkg-message.in Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng328/files/pkg-message.in Tue Sep 29 17:04:50 2020 (r550534) @@ -30,4 +30,12 @@ syslog-ng is now installed! To replace FreeBSD's stan %%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 +} ] Modified: head/sysutils/syslog-ng328/files/syslog-ng.in ============================================================================== --- head/sysutils/syslog-ng328/files/syslog-ng.in Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng328/files/syslog-ng.in Tue Sep 29 17:04:50 2020 (r550534) @@ -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" Modified: head/sysutils/syslog-ng329/Makefile ============================================================================== --- head/sysutils/syslog-ng329/Makefile Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng329/Makefile Tue Sep 29 17:04:50 2020 (r550534) @@ -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) Modified: head/sysutils/syslog-ng329/files/pkg-message.in ============================================================================== --- head/sysutils/syslog-ng329/files/pkg-message.in Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng329/files/pkg-message.in Tue Sep 29 17:04:50 2020 (r550534) @@ -30,4 +30,12 @@ syslog-ng is now installed! To replace FreeBSD's stan %%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 +} ] Modified: head/sysutils/syslog-ng329/files/syslog-ng.in ============================================================================== --- head/sysutils/syslog-ng329/files/syslog-ng.in Tue Sep 29 17:02:31 2020 (r550533) +++ head/sysutils/syslog-ng329/files/syslog-ng.in Tue Sep 29 17:04:50 2020 (r550534) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009291704.08TH4oAI045278>