From 5184a714ee62ba45de57f801cb08daeff05b56f6 Mon Sep 17 00:00:00 2001 From: pgollucci Date: Mon, 8 Mar 2010 23:15:09 +0000 Subject: - 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 (maintainer) [1] Feature safe: yes --- sysutils/rsyslog5/files/rsyslogd.in | 53 ------------------------------------- 1 file changed, 53 deletions(-) (limited to 'sysutils/rsyslog5/files') diff --git a/sysutils/rsyslog5/files/rsyslogd.in b/sysutils/rsyslog5/files/rsyslogd.in index 7604f8b8cce0..57b09fffd37b 100644 --- a/sysutils/rsyslog5/files/rsyslogd.in +++ b/sysutils/rsyslog5/files/rsyslogd.in @@ -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" -- cgit