diff options
author | Cy Schubert <cy@FreeBSD.org> | 2021-02-04 14:24:32 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2021-02-04 14:24:32 +0000 |
commit | 04a7b4be81f26028456cf8a39f761ff58ec17320 (patch) | |
tree | 428fd23e9861fe38d3d832a706d333bc8e4e56ef /sysutils/syslog-ng | |
parent | a2980c0e843b2c2a50eabb3e8b296aa5671a70eb (diff) | |
download | ports-04a7b4be81f26028456cf8a39f761ff58ec17320.tar.gz ports-04a7b4be81f26028456cf8a39f761ff58ec17320.zip |
Revert r555726: Support RFC5424/IETF syslog format.
There is a better way to support RFC5424/IETF syslog format implemented
in 12-STABLE, 13-STABLE, and 14-CURRENT.
PR: 252613
Reported by: Boris Korzun <drtr0jan@yandex.ru>
Reviewed by: Peter Czanik (CzP) <peter.czanik@oneidentity.com>
Balabit (a OneIdentity company) / syslog-ng upstream
Notes
Notes:
svn path=/head/; revision=564027
Diffstat (limited to 'sysutils/syslog-ng')
-rw-r--r-- | sysutils/syslog-ng/Makefile | 7 | ||||
-rw-r--r-- | sysutils/syslog-ng/files/syslog-ng.conf.sample | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 9b1bf533e336..bbec460fee3f 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -3,7 +3,7 @@ PORTNAME= syslog-ng DISTVERSION= 3.30.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -226,13 +226,8 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/ ${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/ -.if ${OSVERSION} > 1200000 ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \ ${STAGEDIR}${PREFIX}/etc -.else - ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample.11 \ - ${STAGEDIR}${PREFIX}/etc/syslog-ng.conf.sample -.endif ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \ ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample index bec698e9a561..625b821f33dd 100644 --- a/sysutils/syslog-ng/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample @@ -16,9 +16,8 @@ options { chain_hostnames(off); flush_lines(0); threaded(yes); }; # # sources # -source src { unix-dgram("/var/run/log" flags(syslog-protocol)); - file("/dev/klog" flags(kernel) program_override("kernel: ")); - internal(); }; +source src { system(); + udp(); internal(); }; # # destinations |