Attachment #104392 for bug #144566

View | Details | Raw Unified | Return to bug 144566
Collapse All | Expand All

Lines 6-12 Link Here

(-)./Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= rsyslog	8	PORTNAME= rsyslog
9	PORTVERSION= 5.3.7	9	PORTVERSION= 5.4.0
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://download.rsyslog.com/rsyslog/	11	MASTER_SITES= http://download.rsyslog.com/rsyslog/
12	.ifdef MNAME	12	.ifdef MNAME

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	MD5 (rsyslog-5.3.7.tar.gz) = 1a9b5c76bfea2d0ec28630b8f033d5e2	1	MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
2	SHA256 (rsyslog-5.3.7.tar.gz) = cab7d39d3979e18c23bd0726ffad714c283d1158dea6c611f23eb1718299c029	2	SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
3	SIZE (rsyslog-5.3.7.tar.gz) = 2109777	3	SIZE (rsyslog-5.4.0.tar.gz) = 2124201




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"

Lines 126-131 Link Here

(-)./pkg-plist (+1 lines)
126	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html	126	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
127	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html	127	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html
128	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html	128	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
		129	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html
129	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html	130	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
130	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html	131	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
131	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html	132	%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html

Return to bug 144566

Lines 20-78 Link Here

(-)./files/rsyslogd.in (-53 lines)
20	pidfile="${rsyslogd_pidfile}"	20	pidfile="${rsyslogd_pidfile}"
21	command_args="-i ${pidfile} -f ${rsyslogd_config}"	21	command_args="-i ${pidfile} -f ${rsyslogd_config}"
22	required_files="${rsyslogd_config}"	22	required_files="${rsyslogd_config}"
23	start_precmd="rsyslogd_precmd"
24	extra_commands="reload"	23	extra_commands="reload"
25		24
26	sockfile="/var/run/rsyslogd.sockets"
27	evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
28	altlog_proglist="named"
29
30	rsyslogd_precmd()
31	{
32	local _l _ldir
33
34	# Transitional symlink for old binaries
35	#
36	if [ ! -L /dev/log ]; then
37	ln -sf /var/run/log /dev/log
38	fi
39	rm -f /var/run/log
40
41	# Create default list of syslog sockets to watch
42	#
43	( umask 022 ; > $sockfile )
44
45	# If running named(8) or ntpd(8) chrooted, added appropriate
46	# syslog socket to list of sockets to watch.
47	#
48	for _l in $altlog_proglist; do
49	eval _ldir=\$${_l}_chrootdir
50	if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then
51	echo "${_ldir}/var/run/log" >> $sockfile
52	fi
53	done
54
55	# If other sockets have been provided, change run_rc_command()'s
56	# internal copy of $rsyslogd_flags to force use of specific
57	# rsyslogd sockets.
58	#
59	if [ -s $sockfile ]; then
60	echo "/var/run/log" >> $sockfile
61	eval $evalargs
62	fi
63
64	return 0
65	}
66
67	set_socketlist()
68	{
69	local _s _socketargs
70
71	_socketargs=
72	for _s in `cat $sockfile \| tr '\n' ' '` ; do
73	_socketargs="-a $_s $_socketargs"
74	done
75	echo $_socketargs
76	}
77
78	run_rc_command "$1"	25	run_rc_command "$1"