ports/144566: [maintainer-update] - update sysutils/rsyslog5 to version 5.4.0

[Cristiano Rolim Pereira]

>Number:         144566
>Category:       ports
>Synopsis:       [maintainer-update] - update sysutils/rsyslog5 to version 5.4.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 08 22:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Cristiano Rolim Pereira
>Release:        8.0-RELEASE
>Organization:
>Environment:
FreeBSD bsd8.casa 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC 2010     root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
The attached diff file:

* Updates sysutils/rsyslog5 to version 5.4.0
* Updates the rc.d script (Thanks to pgollucci)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN ../rsyslog5.orig/Makefile ./Makefile
--- ../rsyslog5.orig/Makefile	2010-02-26 00:06:10.000000000 -0300
+++ ./Makefile	2010-03-08 18:58:53.000000000 -0300
@@ -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
diff -ruN ../rsyslog5.orig/distinfo ./distinfo
--- ../rsyslog5.orig/distinfo	2010-02-26 00:06:10.000000000 -0300
+++ ./distinfo	2010-03-08 18:59:15.000000000 -0300
@@ -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
diff -ruN ../rsyslog5.orig/files/rsyslogd.in ./files/rsyslogd.in
--- ../rsyslog5.orig/files/rsyslogd.in	2010-02-26 00:06:10.000000000 -0300
+++ ./files/rsyslogd.in	2010-03-05 13:33:12.000000000 -0300
@@ -20,59 +20,6 @@
 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"
diff -ruN ../rsyslog5.orig/pkg-plist ./pkg-plist
--- ../rsyslog5.orig/pkg-plist	2010-02-26 00:06:10.000000000 -0300
+++ ./pkg-plist	2010-03-08 19:36:19.000000000 -0300
@@ -126,6 +126,7 @@
 %%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


>Release-Note:
>Audit-Trail:
>Unformatted: