mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
- Update to 5.4.0 [1]
- Remove -a and old school sockets from rc.d script [myself] PR: ports/144566 [1] Submitted by: Cristiano Rolim Pereira <cristianorolim@hotmail.com> (maintainer) [1] Feature safe: yes
This commit is contained in:
Philip M. Gollucci
parent
62c96bebb9
commit
767e4a7e66
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=250735
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= rsyslog
|
||||
PORTVERSION= 5.3.7
|
||||
PORTVERSION= 5.4.0
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://download.rsyslog.com/rsyslog/
|
||||
.ifdef MNAME
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
|
||||
SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
|
||||
SIZE (rsyslog-5.3.7.tar.gz) = 2109777
|
||||
MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
|
||||
SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
|
||||
SIZE (rsyslog-5.4.0.tar.gz) = 2124201
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog5-devel/files/Attic/rsyslogd.in,v 1.2 2009-12-18 20:44:28 miwi Exp $
|
||||
# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog5-devel/files/Attic/rsyslogd.in,v 1.3 2010-03-08 23:15:09 pgollucci Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -20,59 +20,6 @@ load_rc_config $name
|
||||
pidfile="${rsyslogd_pidfile}"
|
||||
command_args="-i ${pidfile} -f ${rsyslogd_config}"
|
||||
required_files="${rsyslogd_config}"
|
||||
start_precmd="rsyslogd_precmd"
|
||||
extra_commands="reload"
|
||||
|
||||
sockfile="/var/run/rsyslogd.sockets"
|
||||
evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
|
||||
altlog_proglist="named"
|
||||
|
||||
rsyslogd_precmd()
|
||||
{
|
||||
local _l _ldir
|
||||
|
||||
# Transitional symlink for old binaries
|
||||
#
|
||||
if [ ! -L /dev/log ]; then
|
||||
ln -sf /var/run/log /dev/log
|
||||
fi
|
||||
rm -f /var/run/log
|
||||
|
||||
# Create default list of syslog sockets to watch
|
||||
#
|
||||
( umask 022 ; > $sockfile )
|
||||
|
||||
# If running named(8) or ntpd(8) chrooted, added appropriate
|
||||
# syslog socket to list of sockets to watch.
|
||||
#
|
||||
for _l in $altlog_proglist; do
|
||||
eval _ldir=\$${_l}_chrootdir
|
||||
if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
|
||||
echo "${_ldir}/var/run/log" >> $sockfile
|
||||
fi
|
||||
done
|
||||
|
||||
# If other sockets have been provided, change run_rc_command()'s
|
||||
# internal copy of $rsyslogd_flags to force use of specific
|
||||
# rsyslogd sockets.
|
||||
#
|
||||
if [ -s $sockfile ]; then
|
||||
echo "/var/run/log" >> $sockfile
|
||||
eval $evalargs
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
set_socketlist()
|
||||
{
|
||||
local _s _socketargs
|
||||
|
||||
_socketargs=
|
||||
for _s in `cat $sockfile | tr '\n' ' '` ; do
|
||||
_socketargs="-a $_s $_socketargs"
|
||||
done
|
||||
echo $_socketargs
|
||||
}
|
||||
|
||||
run_rc_command "$1"
|
||||
|
||||
@ -126,6 +126,7 @@ sbin/rsyslogd
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= rsyslog
|
||||
PORTVERSION= 5.3.7
|
||||
PORTVERSION= 5.4.0
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://download.rsyslog.com/rsyslog/
|
||||
.ifdef MNAME
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
|
||||
SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
|
||||
SIZE (rsyslog-5.3.7.tar.gz) = 2109777
|
||||
MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
|
||||
SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
|
||||
SIZE (rsyslog-5.4.0.tar.gz) = 2124201
|
||||
|
||||
@ -20,59 +20,6 @@ load_rc_config $name
|
||||
pidfile="${rsyslogd_pidfile}"
|
||||
command_args="-i ${pidfile} -f ${rsyslogd_config}"
|
||||
required_files="${rsyslogd_config}"
|
||||
start_precmd="rsyslogd_precmd"
|
||||
extra_commands="reload"
|
||||
|
||||
sockfile="/var/run/rsyslogd.sockets"
|
||||
evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
|
||||
altlog_proglist="named"
|
||||
|
||||
rsyslogd_precmd()
|
||||
{
|
||||
local _l _ldir
|
||||
|
||||
# Transitional symlink for old binaries
|
||||
#
|
||||
if [ ! -L /dev/log ]; then
|
||||
ln -sf /var/run/log /dev/log
|
||||
fi
|
||||
rm -f /var/run/log
|
||||
|
||||
# Create default list of syslog sockets to watch
|
||||
#
|
||||
( umask 022 ; > $sockfile )
|
||||
|
||||
# If running named(8) or ntpd(8) chrooted, added appropriate
|
||||
# syslog socket to list of sockets to watch.
|
||||
#
|
||||
for _l in $altlog_proglist; do
|
||||
eval _ldir=\$${_l}_chrootdir
|
||||
if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
|
||||
echo "${_ldir}/var/run/log" >> $sockfile
|
||||
fi
|
||||
done
|
||||
|
||||
# If other sockets have been provided, change run_rc_command()'s
|
||||
# internal copy of $rsyslogd_flags to force use of specific
|
||||
# rsyslogd sockets.
|
||||
#
|
||||
if [ -s $sockfile ]; then
|
||||
echo "/var/run/log" >> $sockfile
|
||||
eval $evalargs
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
set_socketlist()
|
||||
{
|
||||
local _s _socketargs
|
||||
|
||||
_socketargs=
|
||||
for _s in `cat $sockfile | tr '\n' ' '` ; do
|
||||
_socketargs="-a $_s $_socketargs"
|
||||
done
|
||||
echo $_socketargs
|
||||
}
|
||||
|
||||
run_rc_command "$1"
|
||||
|
||||
@ -126,6 +126,7 @@ sbin/rsyslogd
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= rsyslog
|
||||
PORTVERSION= 5.3.7
|
||||
PORTVERSION= 5.4.0
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://download.rsyslog.com/rsyslog/
|
||||
.ifdef MNAME
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
|
||||
SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
|
||||
SIZE (rsyslog-5.3.7.tar.gz) = 2109777
|
||||
MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
|
||||
SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
|
||||
SIZE (rsyslog-5.4.0.tar.gz) = 2124201
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog55/files/Attic/rsyslogd.in,v 1.2 2009-12-18 20:44:28 miwi Exp $
|
||||
# $FreeBSD: /tmp/pcvs/ports/sysutils/rsyslog55/files/Attic/rsyslogd.in,v 1.3 2010-03-08 23:15:09 pgollucci Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -20,59 +20,6 @@ load_rc_config $name
|
||||
pidfile="${rsyslogd_pidfile}"
|
||||
command_args="-i ${pidfile} -f ${rsyslogd_config}"
|
||||
required_files="${rsyslogd_config}"
|
||||
start_precmd="rsyslogd_precmd"
|
||||
extra_commands="reload"
|
||||
|
||||
sockfile="/var/run/rsyslogd.sockets"
|
||||
evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
|
||||
altlog_proglist="named"
|
||||
|
||||
rsyslogd_precmd()
|
||||
{
|
||||
local _l _ldir
|
||||
|
||||
# Transitional symlink for old binaries
|
||||
#
|
||||
if [ ! -L /dev/log ]; then
|
||||
ln -sf /var/run/log /dev/log
|
||||
fi
|
||||
rm -f /var/run/log
|
||||
|
||||
# Create default list of syslog sockets to watch
|
||||
#
|
||||
( umask 022 ; > $sockfile )
|
||||
|
||||
# If running named(8) or ntpd(8) chrooted, added appropriate
|
||||
# syslog socket to list of sockets to watch.
|
||||
#
|
||||
for _l in $altlog_proglist; do
|
||||
eval _ldir=\$${_l}_chrootdir
|
||||
if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
|
||||
echo "${_ldir}/var/run/log" >> $sockfile
|
||||
fi
|
||||
done
|
||||
|
||||
# If other sockets have been provided, change run_rc_command()'s
|
||||
# internal copy of $rsyslogd_flags to force use of specific
|
||||
# rsyslogd sockets.
|
||||
#
|
||||
if [ -s $sockfile ]; then
|
||||
echo "/var/run/log" >> $sockfile
|
||||
eval $evalargs
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
set_socketlist()
|
||||
{
|
||||
local _s _socketargs
|
||||
|
||||
_socketargs=
|
||||
for _s in `cat $sockfile | tr '\n' ' '` ; do
|
||||
_socketargs="-a $_s $_socketargs"
|
||||
done
|
||||
echo $_socketargs
|
||||
}
|
||||
|
||||
run_rc_command "$1"
|
||||
|
||||
@ -126,6 +126,7 @@ sbin/rsyslogd
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= rsyslog
|
||||
PORTVERSION= 5.3.7
|
||||
PORTVERSION= 5.4.0
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://download.rsyslog.com/rsyslog/
|
||||
.ifdef MNAME
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2
|
||||
SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029
|
||||
SIZE (rsyslog-5.3.7.tar.gz) = 2109777
|
||||
MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
|
||||
SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
|
||||
SIZE (rsyslog-5.4.0.tar.gz) = 2124201
|
||||
|
||||
@ -20,59 +20,6 @@ load_rc_config $name
|
||||
pidfile="${rsyslogd_pidfile}"
|
||||
command_args="-i ${pidfile} -f ${rsyslogd_config}"
|
||||
required_files="${rsyslogd_config}"
|
||||
start_precmd="rsyslogd_precmd"
|
||||
extra_commands="reload"
|
||||
|
||||
sockfile="/var/run/rsyslogd.sockets"
|
||||
evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
|
||||
altlog_proglist="named"
|
||||
|
||||
rsyslogd_precmd()
|
||||
{
|
||||
local _l _ldir
|
||||
|
||||
# Transitional symlink for old binaries
|
||||
#
|
||||
if [ ! -L /dev/log ]; then
|
||||
ln -sf /var/run/log /dev/log
|
||||
fi
|
||||
rm -f /var/run/log
|
||||
|
||||
# Create default list of syslog sockets to watch
|
||||
#
|
||||
( umask 022 ; > $sockfile )
|
||||
|
||||
# If running named(8) or ntpd(8) chrooted, added appropriate
|
||||
# syslog socket to list of sockets to watch.
|
||||
#
|
||||
for _l in $altlog_proglist; do
|
||||
eval _ldir=\$${_l}_chrootdir
|
||||
if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
|
||||
echo "${_ldir}/var/run/log" >> $sockfile
|
||||
fi
|
||||
done
|
||||
|
||||
# If other sockets have been provided, change run_rc_command()'s
|
||||
# internal copy of $rsyslogd_flags to force use of specific
|
||||
# rsyslogd sockets.
|
||||
#
|
||||
if [ -s $sockfile ]; then
|
||||
echo "/var/run/log" >> $sockfile
|
||||
eval $evalargs
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
set_socketlist()
|
||||
{
|
||||
local _s _socketargs
|
||||
|
||||
_socketargs=
|
||||
for _s in `cat $sockfile | tr '\n' ' '` ; do
|
||||
_socketargs="-a $_s $_socketargs"
|
||||
done
|
||||
echo $_socketargs
|
||||
}
|
||||
|
||||
run_rc_command "$1"
|
||||
|
||||
@ -126,6 +126,7 @@ sbin/rsyslogd
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html
|
||||
|
||||
Loading…
Reference in New Issue
Block a user