svn commit: r564027 - in head/sysutils/syslog-ng: . files

[Cy Schubert]

Author: cy
Date: Thu Feb  4 14:24:32 2021
New Revision: 564027
URL: https://svnweb.freebsd.org/changeset/ports/564027

Log:
  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 at yandex.ru>
  Reviewed by:	Peter Czanik (CzP) <peter.czanik at oneidentity.com>
  		Balabit (a OneIdentity company) / syslog-ng upstream

Modified:
  head/sysutils/syslog-ng/Makefile   (contents, props changed)
  head/sysutils/syslog-ng/files/syslog-ng.conf.sample

Modified: head/sysutils/syslog-ng/Makefile
==============================================================================
--- head/sysutils/syslog-ng/Makefile	Thu Feb  4 13:07:50 2021	(r564026)
+++ head/sysutils/syslog-ng/Makefile	Thu Feb  4 14:24:32 2021	(r564027)
@@ -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 \

Modified: head/sysutils/syslog-ng/files/syslog-ng.conf.sample
==============================================================================
--- head/sysutils/syslog-ng/files/syslog-ng.conf.sample	Thu Feb  4 13:07:50 2021	(r564026)
+++ head/sysutils/syslog-ng/files/syslog-ng.conf.sample	Thu Feb  4 14:24:32 2021	(r564027)
@@ -16,9 +16,8 @@ options { chain_hostnames(off); flush_lines(0); thread
 #
 # 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