Attachment #218408 for bug #249984




--- modules/afsocket/socket-options.c.orig	2020-08-10 18:04:39 UTC
+++ modules/afsocket/socket-options.c
@@ -86,7 +86,16 @@ _setup_keepalive(gint fd)
 static gboolean
 _setup_reuseport(gint fd)
 {
-#ifdef SO_REUSEPORT
+#if defined(SO_REUSEPORT_LB)
+  gint on = 1;
+  if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT_LB, &on, sizeof(on)) < 0)
+    {
+      msg_error("The kernel refused our SO_REUSEPORT_LB setting",
+                evt_tag_error("error"));
+      return FALSE;
+    }
+  return TRUE;
+#elif defined(SO_REUSEPORT)
   gint on = 1;
   if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0)
     {

Lines 30-33 Link Here

(-)syslog-ng329/files/pkg-message.in (+8 lines)
30	%%PREFIX%%/etc/rc.d/syslog-ng start	30	%%PREFIX%%/etc/rc.d/syslog-ng start
31	EOM	31	EOM
32	}	32	}
		33	{ type: upgrade
		34	maximum_version: "3.29.1"
		35	message: <<EOM
		36	Upgrading from before 3.29.1 should to replace these variables (if used):
		37	* syslog_ng_flags instead syslog_ng_config (but legacy syslog_ng_config still works);
		38	* syslog_ng_pidfile instead syslog_ng_pid (but syslog_ng_pid still works).
		39	EOM
		40	}
33	]	41	]




# to enable this service:
#
#syslog_ng_enable="YES"
#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

load_rc_config $name
required_files=%%PREFIX%%/etc/syslog-ng.conf
extra_commands=reload

: ${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"
fi

pidfile="${syslog_ng_pidfile}"
required_files="${syslog_ng_config}"

command="%%PREFIX%%/sbin/syslog-ng"
command_args="-f ${syslog_ng_config} -p ${pidfile}"

stop_postcmd="stop_postcmd"
extra_commands="reload"
command_args="-p ${pidfile} ${syslog_ng_config}"

stop_postcmd()
{
	rm -f "${pidfile}"
}

run_rc_command "$1"




     %%PREFIX%%/etc/rc.d/syslog-ng start
EOM
}
{ type: upgrade
  maximum_version: "3.28.1_1"
  message: <<EOM
Upgrading from before 3.28.1_1 should to replace these variables (if used):
* syslog_ng_flags instead syslog_ng_config (but legacy syslog_ng_config still works);
* syslog_ng_pidfile instead syslog_ng_pid (but syslog_ng_pid still works).  
EOM
}

]




# to enable this service:
#
#syslog_ng_enable="YES"
#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

load_rc_config $name
required_files=%%PREFIX%%/etc/syslog-ng.conf
extra_commands=reload

: ${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"
fi

pidfile="${syslog_ng_pidfile}"
required_files="${syslog_ng_config}"

command="%%PREFIX%%/sbin/syslog-ng"
command_args="-f ${syslog_ng_config} -p ${pidfile}"

stop_postcmd="stop_postcmd"
extra_commands="reload"
command_args="-p ${pidfile} ${syslog_ng_config}"

stop_postcmd()
{
	rm -f "${pidfile}"
}

run_rc_command "$1"

Lines 30-33 Link Here

(-)syslog-ng327/files/pkg-message.in (+8 lines)
30	%%PREFIX%%/etc/rc.d/syslog-ng start	30	%%PREFIX%%/etc/rc.d/syslog-ng start
31	EOM	31	EOM
32	}	32	}
		33	{ type: upgrade
		34	maximum_version: "3.27.1_1"
		35	message: <<EOM
		36	Upgrading from before 3.27.1_1 should to replace these variables (if used):
		37	* syslog_ng_flags instead syslog_ng_config (but legacy syslog_ng_config still works);
		38	* syslog_ng_pidfile instead syslog_ng_pid (but syslog_ng_pid still works).
		39	EOM
		40	}
33	]	41	]




# to enable this service:
#
#syslog_ng_enable="YES"
#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

load_rc_config $name
required_files=%%PREFIX%%/etc/syslog-ng.conf
extra_commands=reload

: ${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"
fi

pidfile="${syslog_ng_pidfile}"
required_files="${syslog_ng_config}"

command="%%PREFIX%%/sbin/syslog-ng"
command_args="-f ${syslog_ng_config} -p ${pidfile}"

stop_postcmd="stop_postcmd"
extra_commands="reload"
command_args="-p ${pidfile} ${syslog_ng_config}"

stop_postcmd()
{
	rm -f "${pidfile}"
}

run_rc_command "$1"

Return to bug 249984

Line 0 Link Here

(-)syslog-ng329/files/patch-modules_afsocket_socket-options.c (+20 lines)
	1	--- modules/afsocket/socket-options.c.orig 2020-08-10 18:04:39 UTC
	2	+++ modules/afsocket/socket-options.c
	3	@@ -86,7 +86,16 @@ _setup_keepalive(gint fd)
	4	static gboolean
	5	_setup_reuseport(gint fd)
	6	{
	7	-#ifdef SO_REUSEPORT
	8	+#if defined(SO_REUSEPORT_LB)
	9	+ gint on = 1;
	10	+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT_LB, &on, sizeof(on)) < 0)
	11	+ {
	12	+ msg_error("The kernel refused our SO_REUSEPORT_LB setting",
	13	+ evt_tag_error("error"));
	14	+ return FALSE;
	15	+ }
	16	+ return TRUE;
	17	+#elif defined(SO_REUSEPORT)
	18	gint on = 1;
	19	if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0)
	20	{

Lines 12-46 Link Here

(-)syslog-ng329/files/syslog-ng.in (-15 / +27 lines)
12	# to enable this service:	12	# to enable this service:
13	#	13	#
14	#syslog_ng_enable="YES"	14	#syslog_ng_enable="YES"
15	#syslog_ng_config="-u daemon"	15	#syslog_ng_flags="-u daemon"
16	#syslog_ng_pid="/var/run/syslog-ng.pid"	16	#syslog_ng_pidfile="/var/run/syslog-ng.pid"
17	#	17	#
18		18
19	syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"}
20
21	. /etc/rc.subr	19	. /etc/rc.subr
22		20
23	name=syslog_ng	21	name=syslog_ng
24	rcvar=syslog_ng_enable	22	rcvar=syslog_ng_enable
25		23
26	command=%%PREFIX%%/sbin/syslog-ng	24	load_rc_config $name
27	required_files=%%PREFIX%%/etc/syslog-ng.conf
28	extra_commands=reload
29		25
		26	: ${syslog_ng_enable:="NO"}
		27	: ${syslog_ng_purgeklog:="NO"}
		28	: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"}
		29	: ${syslog_ng_pidfile:=/var/run/syslog.pid}
		30
		31	# backwards compatibility
		32	if [ -n "${syslog_ng_pid}" ]; then
		33	syslog_ng_pidfile="${syslog_ng_pid}"
		34	fi
		35	if [ ! -f "${syslog_ng_config}" ]; then
		36	syslog_ng_flags="${syslog_ng_config}"
		37	syslog_ng_config="%%PREFIX%%/etc/syslog-ng.conf"
		38	fi
		39
30	if checkyesno syslog_ng_purgeklog; then	40	if checkyesno syslog_ng_purgeklog; then
31	start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd";	41	start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1"
32	fi	42	fi
33		43
34	stop_postcmd=stop_postcmd	44	pidfile="${syslog_ng_pidfile}"
		45	required_files="${syslog_ng_config}"
35		46
36	load_rc_config $name	47	command="%%PREFIX%%/sbin/syslog-ng"
		48	command_args="-f ${syslog_ng_config} -p ${pidfile}"
37		49
38	: ${syslog_ng_enable:="NO"}	50	stop_postcmd="stop_postcmd"
39	pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"}	51	extra_commands="reload"
40	command_args="-p ${pidfile} ${syslog_ng_config}"
41		52
42	stop_postcmd() {	53	stop_postcmd()
43	rm -f $pidfile	54	{
		55	rm -f "${pidfile}"
44	}	56	}
45		57
46	run_rc_command "$1"	58	run_rc_command "$1"

Lines 30-42 Link Here

(-)syslog-ng328/files/pkg-message.in (-9 lines)
30	%%PREFIX%%/etc/rc.d/syslog-ng start	30	%%PREFIX%%/etc/rc.d/syslog-ng start
31	EOM	31	EOM
32	}	32	}
33	{ type: upgrade
34	maximum_version: "3.28.1_1"
35	message: <<EOM
36	Upgrading from before 3.28.1_1 should to replace these variables (if used):
37	* syslog_ng_flags instead syslog_ng_config (but legacy syslog_ng_config still works);
38	* syslog_ng_pidfile instead syslog_ng_pid (but syslog_ng_pid still works).
39	EOM
40	}
41
42	]	33	]

Lines 12-46 Link Here

(-)syslog-ng328/files/syslog-ng.in (-15 / +27 lines)
12	# to enable this service:	12	# to enable this service:
13	#	13	#
14	#syslog_ng_enable="YES"	14	#syslog_ng_enable="YES"
15	#syslog_ng_config="-u daemon"	15	#syslog_ng_flags="-u daemon"
16	#syslog_ng_pid="/var/run/syslog-ng.pid"	16	#syslog_ng_pidfile="/var/run/syslog-ng.pid"
17	#	17	#
18		18
19	syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"}
20
21	. /etc/rc.subr	19	. /etc/rc.subr
22		20
23	name=syslog_ng	21	name=syslog_ng
24	rcvar=syslog_ng_enable	22	rcvar=syslog_ng_enable
25		23
26	command=%%PREFIX%%/sbin/syslog-ng	24	load_rc_config $name
27	required_files=%%PREFIX%%/etc/syslog-ng.conf
28	extra_commands=reload
29		25
		26	: ${syslog_ng_enable:="NO"}
		27	: ${syslog_ng_purgeklog:="NO"}
		28	: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"}
		29	: ${syslog_ng_pidfile:=/var/run/syslog.pid}
		30
		31	# backwards compatibility
		32	if [ -n "${syslog_ng_pid}" ]; then
		33	syslog_ng_pidfile="${syslog_ng_pid}"
		34	fi
		35	if [ ! -f "${syslog_ng_config}" ]; then
		36	syslog_ng_flags="${syslog_ng_config}"
		37	syslog_ng_config="%%PREFIX%%/etc/syslog-ng.conf"
		38	fi
		39
30	if checkyesno syslog_ng_purgeklog; then	40	if checkyesno syslog_ng_purgeklog; then
31	start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd";	41	start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1"
32	fi	42	fi
33		43
34	stop_postcmd=stop_postcmd	44	pidfile="${syslog_ng_pidfile}"
		45	required_files="${syslog_ng_config}"
35		46
36	load_rc_config $name	47	command="%%PREFIX%%/sbin/syslog-ng"
		48	command_args="-f ${syslog_ng_config} -p ${pidfile}"
37		49
38	: ${syslog_ng_enable:="NO"}	50	stop_postcmd="stop_postcmd"
39	pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"}	51	extra_commands="reload"
40	command_args="-p ${pidfile} ${syslog_ng_config}"
41		52
42	stop_postcmd() {	53	stop_postcmd()
43	rm -f $pidfile	54	{
		55	rm -f "${pidfile}"
44	}	56	}
45		57
46	run_rc_command "$1"	58	run_rc_command "$1"

Lines 12-46 Link Here

(-)syslog-ng327/files/syslog-ng.in (-15 / +27 lines)
12	# to enable this service:	12	# to enable this service:
13	#	13	#
14	#syslog_ng_enable="YES"	14	#syslog_ng_enable="YES"
15	#syslog_ng_config="-u daemon"	15	#syslog_ng_flags="-u daemon"
16	#syslog_ng_pid="/var/run/syslog-ng.pid"	16	#syslog_ng_pidfile="/var/run/syslog-ng.pid"
17	#	17	#
18		18
19	syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"}
20
21	. /etc/rc.subr	19	. /etc/rc.subr
22		20
23	name=syslog_ng	21	name=syslog_ng
24	rcvar=syslog_ng_enable	22	rcvar=syslog_ng_enable
25		23
26	command=%%PREFIX%%/sbin/syslog-ng	24	load_rc_config $name
27	required_files=%%PREFIX%%/etc/syslog-ng.conf
28	extra_commands=reload
29		25
		26	: ${syslog_ng_enable:="NO"}
		27	: ${syslog_ng_purgeklog:="NO"}
		28	: ${syslog_ng_config:="%%PREFIX%%/etc/syslog-ng.conf"}
		29	: ${syslog_ng_pidfile:=/var/run/syslog.pid}
		30
		31	# backwards compatibility
		32	if [ -n "${syslog_ng_pid}" ]; then
		33	syslog_ng_pidfile="${syslog_ng_pid}"
		34	fi
		35	if [ ! -f "${syslog_ng_config}" ]; then
		36	syslog_ng_flags="${syslog_ng_config}"
		37	syslog_ng_config="%%PREFIX%%/etc/syslog-ng.conf"
		38	fi
		39
30	if checkyesno syslog_ng_purgeklog; then	40	if checkyesno syslog_ng_purgeklog; then
31	start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd";	41	start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1"
32	fi	42	fi
33		43
34	stop_postcmd=stop_postcmd	44	pidfile="${syslog_ng_pidfile}"
		45	required_files="${syslog_ng_config}"
35		46
36	load_rc_config $name	47	command="%%PREFIX%%/sbin/syslog-ng"
		48	command_args="-f ${syslog_ng_config} -p ${pidfile}"
37		49
38	: ${syslog_ng_enable:="NO"}	50	stop_postcmd="stop_postcmd"
39	pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"}	51	extra_commands="reload"
40	command_args="-p ${pidfile} ${syslog_ng_config}"
41		52
42	stop_postcmd() {	53	stop_postcmd()
43	rm -f $pidfile	54	{
		55	rm -f "${pidfile}"
44	}	56	}
45		57
46	run_rc_command "$1"	58	run_rc_command "$1"