Attachment 222160 Details for Bug 252613 – syslog-ng.diff

[patch] syslog-ng.diff

syslog-ng.diff (text/plain), 9.37 KB, created by Boris Korzun on 2021-02-04 11:39:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2021-02-04 11:39:04 UTC

Size: 9.37 KB

patch

obsolete

>Index: sysutils/syslog-ng/Makefile
>===================================================================
>--- sysutils/syslog-ng/Makefile	(revision 563791)
>+++ sysutils/syslog-ng/Makefile	(working copy)
>@@ -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}/
> 
>@@ -10,6 +10,10 @@
> MAINTAINER=	cy@FreeBSD.org
> COMMENT=	Powerful syslogd replacement
> 
>+LICENSE=	GPLv2+ LGPL21+
>+LICENSE_COMB=	multi
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
> 
> LIB_DEPENDS=	libpcre.so:devel/pcre \
>@@ -226,13 +230,10 @@
> 	${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 \
>Index: sysutils/syslog-ng/files/patch-modules_system-source_system-source.c
>===================================================================
>--- sysutils/syslog-ng/files/patch-modules_system-source_system-source.c	(nonexistent)
>+++ sysutils/syslog-ng/files/patch-modules_system-source_system-source.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- modules/system-source/system-source.c.orig 2021-01-13 10:46:26.320565000 +0100
>++++ modules/system-source/system-source.c 2021-01-13 10:52:26.747801000 +0100
>+@@ -164,7 +164,7 @@
>+       strncmp(release, "9.0", 3) == 0)
>+     system_sysblock_add_file(sysblock, "/dev/klog", 1, "kernel", "no-parse", NULL, FALSE);
>+   else
>+-    system_sysblock_add_file(sysblock, "/dev/klog", 0, "kernel", "no-parse", NULL, FALSE);
>++    system_sysblock_add_file(sysblock, "/dev/klog", 0, "kernel", NULL, NULL, FALSE);
>+ }
>+
>+ static gboolean
>
>Property changes on: sysutils/syslog-ng/files/patch-modules_system-source_system-source.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/syslog-ng/files/syslog-ng.conf.sample
>===================================================================
>--- sysutils/syslog-ng/files/syslog-ng.conf.sample	(revision 563791)
>+++ sysutils/syslog-ng/files/syslog-ng.conf.sample	(working copy)
>@@ -16,9 +16,8 @@
> #
> # 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
>Index: sysutils/syslog-ng/files/syslog-ng.conf.sample.11
>===================================================================
>--- sysutils/syslog-ng/files/syslog-ng.conf.sample.11	(revision 563791)
>+++ sysutils/syslog-ng/files/syslog-ng.conf.sample.11	(nonexistent)
>@@ -1,185 +0,0 @@
>-@version:3.29
>-@include "scl.conf"
>-
>-#
>-# This sample configuration file is essentially equilivent to the stock
>-# FreeBSD /etc/syslog.conf file.
>-#
>-# $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.conf.sample 340872 2014-01-24 00:14:07Z mat $
>-#
>-
>-#
>-# options
>-#
>-options { chain_hostnames(off); flush_lines(0); threaded(yes); };
>-
>-#
>-# sources
>-#
>-source src { system();
>-	     udp(); internal(); };
>-
>-#
>-# destinations
>-#
>-destination messages { file("/var/log/messages"); };
>-destination security { file("/var/log/security"); };
>-destination authlog { file("/var/log/auth.log"); };
>-destination maillog { file("/var/log/maillog"); };
>-destination lpd-errs { file("/var/log/lpd-errs"); };
>-destination xferlog { file("/var/log/xferlog"); };
>-destination cron { file("/var/log/cron"); };
>-destination debuglog { file("/var/log/debug.log"); };
>-destination consolelog { file("/var/log/console.log"); };
>-destination all { file("/var/log/all.log"); };
>-destination newscrit { file("/var/log/news/news.crit"); };
>-destination newserr { file("/var/log/news/news.err"); };
>-destination newsnotice { file("/var/log/news/news.notice"); };
>-destination slip { file("/var/log/slip.log"); };
>-destination ppp { file("/var/log/ppp.log"); };
>-destination console { file("/dev/console"); };
>-destination allusers { usertty("*"); };
>-#destination loghost { udp("loghost" port(514)); };
>-
>-#
>-# log facility filters
>-#
>-filter f_auth { facility(auth); };
>-filter f_authpriv { facility(authpriv); };
>-filter f_not_authpriv { not facility(authpriv); };
>-#filter f_console { facility(console); };
>-filter f_cron { facility(cron); };
>-filter f_daemon { facility(daemon); };
>-filter f_ftp { facility(ftp); };
>-filter f_kern { facility(kern); };
>-filter f_lpr { facility(lpr); };
>-filter f_mail { facility(mail); };
>-filter f_news { facility(news); };
>-filter f_security { facility(security); };
>-filter f_user { facility(user); };
>-filter f_uucp { facility(uucp); };
>-filter f_local0 { facility(local0); };
>-filter f_local1 { facility(local1); };
>-filter f_local2 { facility(local2); };
>-filter f_local3 { facility(local3); };
>-filter f_local4 { facility(local4); };
>-filter f_local5 { facility(local5); };
>-filter f_local6 { facility(local6); };
>-filter f_local7 { facility(local7); };
>-
>-#
>-# log level filters
>-#
>-filter f_emerg { level(emerg); };
>-filter f_alert { level(alert..emerg); };
>-filter f_crit { level(crit..emerg); };
>-filter f_err { level(err..emerg); };
>-filter f_warning { level(warning..emerg); };
>-filter f_notice { level(notice..emerg); };
>-filter f_info { level(info..emerg); };
>-filter f_debug { level(debug..emerg); };
>-filter f_is_debug { level(debug); };
>-
>-#
>-# program filters
>-#
>-filter f_ppp { program("ppp"); };
>-filter f_slip { program("startslip"); };
>-
>-#
>-# *.err;kern.warning;auth.notice;mail.crit		/dev/console
>-#
>-log { source(src); filter(f_err); destination(console); };
>-log { source(src); filter(f_kern); filter(f_warning); destination(console); };
>-log { source(src); filter(f_auth); filter(f_notice); destination(console); };
>-log { source(src); filter(f_mail); filter(f_crit); destination(console); };
>-
>-#
>-# *.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err	/var/log/messages
>-#
>-log { source(src); filter(f_notice); filter(f_not_authpriv); destination(messages); };
>-log { source(src); filter(f_kern); filter(f_debug); destination(messages); };
>-log { source(src); filter(f_lpr); filter(f_info); destination(messages); };
>-log { source(src); filter(f_mail); filter(f_crit); destination(messages); };
>-log { source(src); filter(f_news); filter(f_err); destination(messages); };
>-
>-#
>-# security.*						/var/log/security
>-#
>-log { source(src); filter(f_security); destination(security); };
>-
>-#
>-# auth.info;authpriv.info				/var/log/auth.log
>-log { source(src); filter(f_auth); filter(f_info); destination(authlog); };
>-log { source(src); filter(f_authpriv); filter(f_info); destination(authlog); };
>-
>-#
>-# mail.info						/var/log/maillog
>-#
>-log { source(src); filter(f_mail); filter(f_info); destination(maillog); };
>-
>-#
>-# lpr.info						/var/log/lpd-errs
>-#
>-log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); };
>-
>-#
>-# ftp.info						/var/log/xferlog
>-#
>-log { source(src); filter(f_ftp); filter(f_info); destination(xferlog); };
>-
>-#
>-# cron.*						/var/log/cron
>-#
>-log { source(src); filter(f_cron); destination(cron); };
>-
>-#
>-# *.=debug						/var/log/debug.log
>-#
>-log { source(src); filter(f_is_debug); destination(debuglog); };
>-
>-#
>-# *.emerg						*
>-#
>-log { source(src); filter(f_emerg); destination(allusers); };
>-
>-#
>-# uncomment this to log all writes to /dev/console to /var/log/console.log
>-# console.info						/var/log/console.log
>-#
>-#log { source(src); filter(f_console); filter(f_info); destination(consolelog); };
>-
>-#
>-# uncomment this to enable logging of all log messages to /var/log/all.log
>-# touch /var/log/all.log and chmod it to mode 600 before it will work
>-# *.*							/var/log/all.log
>-#
>-#log { source(src); destination(all); };
>-
>-#
>-# uncomment this to enable logging to a remote loghost named loghost
>-# *.*							@loghost
>-#
>-#log { source(src); destination(loghost); };
>-
>-#
>-# uncomment these if you're running inn
>-# news.crit						/var/log/news/news.crit
>-# news.err						/var/log/news/news.err
>-# news.notice						/var/log/news/news.notice
>-#
>-#log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
>-#log { source(src); filter(f_news); filter(f_err); destination(newserr); };
>-#log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
>-
>-#
>-# !startslip
>-# *.*							/var/log/slip.log
>-#
>-log { source(src); filter(f_slip); destination(slip); };
>-
>-#
>-# !ppp
>-# *.*							/var/log/ppp.log
>-#
>-log { source(src); filter(f_ppp); destination(ppp); };
>
>Property changes on: sysutils/syslog-ng/files/syslog-ng.conf.sample.11
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 252613: 221498 | 222100 | 222160