diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2020-11-20 01:54:12 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2020-11-20 01:54:12 +0000 |
| commit | 3af0d0c047097fc8aa6afe885c8b8c0701a757a0 (patch) | |
| tree | e66dba26f7ef6ecb34d70e960cedf7bf6180973f /sysutils/syslog-ng/files | |
| parent | devel/git-cola: update to 3.8 (diff) | |
Update 3.29.1 --> 3.30.1
Submitted by: Peter Czanik (CzP) <peter.czanik@oneidentity.com>
Balabit (a OneIdentity company) / syslog-ng upstream
Notes
Notes:
svn path=/head/; revision=555725
Diffstat (limited to 'sysutils/syslog-ng/files')
| -rw-r--r-- | sysutils/syslog-ng/files/patch-modules_afsocket_socket-options.c | 20 | ||||
| -rw-r--r-- | sysutils/syslog-ng/files/syslog-ng.conf.sample | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/sysutils/syslog-ng/files/patch-modules_afsocket_socket-options.c b/sysutils/syslog-ng/files/patch-modules_afsocket_socket-options.c deleted file mode 100644 index b92530e0fbda..000000000000 --- a/sysutils/syslog-ng/files/patch-modules_afsocket_socket-options.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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) - { diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample index 6da4747a5706..625b821f33dd 100644 --- a/sysutils/syslog-ng/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample @@ -1,4 +1,4 @@ -@version:3.29 +@version:3.30 @include "scl.conf" # |