Add LICENSE.
Remove @dirrm.
Reorganize PLIST.
Changes since 3.20.11:
Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02
- bugfix: invalid error message issued if $inlcudeConfig was on an empty
set of files (e.g. *.conf, where none such files existed)
thanks to Michael Biebl for reporting this bug
- bugfix: when run in foreground (but not in debug mode), a
debug message ("DoDie called") was emitted at shutdown. Removed.
thanks to Michael Biebl for reporting this bug
- bugfix: some garbagge was emitted to stderr on shutdown. This
garbage consisted of file names, which were written during
startup (key point: not a pointer error)
thanks to Michael Biebl for reporting this bug
- bugfix: startup and shutdown message were emitted to stdout
thanks to Michael Biebl for reporting this bug
- bugfix: error messages were not emitted to stderr in forked mode
(stderr and stdo are now kept open across forks)
- bugfix: internal messages were emitted to whatever file had fd2 when
rsyslogd ran in forked mode (as usual!)
Thanks to varmojfekoj for the patch
- small enhancement: config validation run now exits with code 1 if an
error is detected. This change is considered important but small enough
to apply it directly to the stable version. [But it is a border case,
the change requires more code than I had hoped. Thus I have NOT tried
to actually catch all cases, this is left for the current devel
releases, if necessary]
- bugfix: light and full delay watermarks had invalid values, badly
affecting performance for delayable inputs
- bugfix: potential segfault issue when multiple $UDPServerRun directives
are specified. Thanks to Michael Biebl for helping to debug this one.
- relaxed GnuTLS version requirement to 1.4.0 after confirmation from the
field that this version is sufficient
- bugfix: parser did not properly handle empty structured data
- bugfix: invalid mutex release in msg.c (detected under thread debugger,
seems not to have any impact on actual deployments)
Version 3.22.0 [v3-stable] (rgerhards), 2009-04-21
This is the first stable release that includes the full functionality
of the 3.21.x version tree.
- bugfix: $InputTCPMaxSessions config directive was accepted, but not
honored. This resulted in a fixed upper limit of 200 connections.
- bugfix: the default for $DirCreateMode was 0644, and as such wrong.
It has now been changed to 0700. For some background, please see
http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
- bugfix: ompgsql did not detect problems in sql command execution
this could cause loss of messages. The handling was correct if the
connection broke, but not if there was a problem with statement
execution. The most probable case for such a case would be invalid
sql inside the template, and this is now much easier to diagnose.
This commit is contained in:
Bartosz Kuzma
Thomas Klausner
parent
3fe4017b07
commit
5b76b53916
12 changed files with 35 additions and 47 deletions
|
|
@ -1,8 +1,8 @@
|
|||
===========================================================================
|
||||
$NetBSD: MESSAGE,v 1.2 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
$NetBSD: MESSAGE,v 1.3 2009/09/28 22:32:45 bartoszkuzma Exp $
|
||||
|
||||
For simple replacement for syslogd(8), you may put below
|
||||
lines in your /etc/rc.conf:
|
||||
For simple replacement for syslogd(8), you may put the following lines
|
||||
into your /etc/rc.conf:
|
||||
|
||||
syslogd=NO
|
||||
rsyslogd=YES
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
# $NetBSD: Makefile,v 1.16 2009/04/09 09:30:42 bartoszkuzma Exp $
|
||||
# $NetBSD: Makefile,v 1.17 2009/09/28 22:32:45 bartoszkuzma Exp $
|
||||
#
|
||||
|
||||
DISTNAME= rsyslog-3.21.11
|
||||
DISTNAME= rsyslog-3.22.1
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= http://download.rsyslog.com/rsyslog/
|
||||
|
||||
MAINTAINER= bartosz.kuzma@gmail.com
|
||||
HOMEPAGE= http://www.rsyslog.com/
|
||||
COMMENT= The enhanced syslogd for Unix
|
||||
LICENSE= gnu-gpl-v3
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
|
|
@ -26,12 +27,8 @@ EGDIR= ${PREFIX}/share/examples/rsyslog
|
|||
CONF_FILES= ${EGDIR}/rsyslog.conf ${PKG_SYSCONFDIR}/rsyslog.conf
|
||||
RCD_SCRIPTS= rsyslogd
|
||||
|
||||
PLIST_SRC= PLIST.common
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
PLIST_SRC+= PLIST.common_end
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${DOCDIR}
|
||||
cd ${WRKSRC}/doc && pax -rw *.html ${DOCDIR}
|
||||
|
|
@ -47,5 +44,4 @@ post-install:
|
|||
. endif
|
||||
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../security/gnutls/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,21 +1,27 @@
|
|||
@comment $NetBSD: PLIST.common,v 1.3 2009/04/09 09:30:42 bartoszkuzma Exp $
|
||||
man/man5/rsyslog.conf.5
|
||||
man/man8/rsyslogd.8
|
||||
sbin/rsyslogd
|
||||
share/examples/rc.d/rsyslogd
|
||||
share/examples/rsyslog/rsyslog.conf
|
||||
@comment $NetBSD: PLIST,v 1.4 2009/09/28 22:32:45 bartoszkuzma Exp $
|
||||
${PLIST.gssapi}lib/rsyslog/imgssapi.la
|
||||
lib/rsyslog/imklog.la
|
||||
lib/rsyslog/immark.la
|
||||
lib/rsyslog/imtcp.la
|
||||
lib/rsyslog/imudp.la
|
||||
lib/rsyslog/imuxsock.la
|
||||
${PLIST.gssapi}lib/rsyslog/lmgssutil.la
|
||||
lib/rsyslog/lmnet.la
|
||||
lib/rsyslog/lmnetstrms.la
|
||||
${PLIST.gnutls}lib/rsyslog/lmnsd_gtls.la
|
||||
lib/rsyslog/lmnsd_ptcp.la
|
||||
lib/rsyslog/lmregexp.la
|
||||
lib/rsyslog/lmtcpclt.la
|
||||
lib/rsyslog/lmtcpsrv.la
|
||||
${PLIST.gssapi}lib/rsyslog/omgssapi.la
|
||||
${PLIST.mail}lib/rsyslog/ommail.la
|
||||
${PLIST.mysql}lib/rsyslog/ommysql.la
|
||||
${PLIST.pgsql}lib/rsyslog/ompgsql.la
|
||||
${PLIST.snmp}lib/rsyslog/omsnmp.la
|
||||
lib/rsyslog/omtesting.la
|
||||
man/man5/rsyslog.conf.5
|
||||
man/man8/rsyslogd.8
|
||||
sbin/rsyslogd
|
||||
share/doc/rsyslog/bugs.html
|
||||
share/doc/rsyslog/build_from_repo.html
|
||||
share/doc/rsyslog/contributors.html
|
||||
|
|
@ -108,3 +114,7 @@ share/doc/rsyslog/tls_cert_udp_relay.html
|
|||
share/doc/rsyslog/troubleshoot.html
|
||||
share/doc/rsyslog/v3compatibility.html
|
||||
share/doc/rsyslog/version_naming.html
|
||||
share/examples/rc.d/rsyslogd
|
||||
${PLIST.mysql}share/examples/rsyslog/createDB-mysql.sql
|
||||
${PLIST.pgsql}share/examples/rsyslog/createDB-pgsql.sql
|
||||
share/examples/rsyslog/rsyslog.conf
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
@comment $NetBSD: PLIST.common_end,v 1.2 2008/12/09 18:04:29 bartoszkuzma Exp $
|
||||
@dirrm share/doc/rsyslog
|
||||
@dirrm share/examples/rsyslog
|
||||
@dirrm lib/rsyslog
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
@comment $NetBSD: PLIST.gnutls,v 1.1 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
lib/rsyslog/lmnsd_gtls.la
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
@comment $NetBSD: PLIST.gssapi,v 1.1 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
lib/rsyslog/imgssapi.la
|
||||
lib/rsyslog/lmgssutil.la
|
||||
lib/rsyslog/omgssapi.la
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
@comment $NetBSD: PLIST.mail,v 1.1 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
lib/rsyslog/ommail.la
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
@comment $NetBSD: PLIST.mysql,v 1.1 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
lib/rsyslog/ommysql.la
|
||||
share/examples/rsyslog/createDB-mysql.sql
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
@comment $NetBSD: PLIST.pgsql,v 1.1 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
lib/rsyslog/ompgsql.la
|
||||
share/examples/rsyslog/createDB-pgsql.sql
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
@comment $NetBSD: PLIST.snmp,v 1.1 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
lib/rsyslog/omsnmp.la
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.6 2009/04/09 09:30:42 bartoszkuzma Exp $
|
||||
$NetBSD: distinfo,v 1.7 2009/09/28 22:32:45 bartoszkuzma Exp $
|
||||
|
||||
SHA1 (rsyslog-3.21.11.tar.gz) = d97fda34a1075d5c2ebb580c4550bf3e88cb3d26
|
||||
RMD160 (rsyslog-3.21.11.tar.gz) = 4b948e771a488cf633745f2587d79236b0e4a130
|
||||
Size (rsyslog-3.21.11.tar.gz) = 1332927 bytes
|
||||
SHA1 (rsyslog-3.22.1.tar.gz) = d5c8828db3edef35e48a1eec418e800fafc6d6a3
|
||||
RMD160 (rsyslog-3.22.1.tar.gz) = 979dc146d40a5373ec7d210c424e925b5e091c15
|
||||
Size (rsyslog-3.22.1.tar.gz) = 1358598 bytes
|
||||
SHA1 (patch-aa) = 4d28013f731ea4556c220966791f1e1fec82ce2c
|
||||
SHA1 (patch-ab) = dadb60f64ca2285de7ee7454684ac180ffece70c
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
# $NetBSD: options.mk,v 1.4 2008/12/07 14:16:32 bartoszkuzma Exp $
|
||||
# $NetBSD: options.mk,v 1.5 2009/09/28 22:32:45 bartoszkuzma Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.rsyslog
|
||||
PKG_SUPPORTED_OPTIONS= gnutls gssapi largefile mail mysql pgsql snmp
|
||||
PKG_SUGGESTED_OPTIONS= largefile
|
||||
|
||||
PLIST_VARS+= gnutls gssapi mail mysql pgsql snmp
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mlargefile)
|
||||
|
|
@ -13,34 +15,34 @@ CONFIGURE_ARGS+= --enable-largefile
|
|||
.if !empty(PKG_OPTIONS:Mgnutls)
|
||||
.include "../../security/gnutls/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --enable-gnutls
|
||||
PLIST_SRC+= PLIST.gnutls
|
||||
PLIST.gnutls= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mgssapi)
|
||||
.include "../../mk/krb5.buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --enable-gssapi-krb5
|
||||
PLIST_SRC+= PLIST.gssapi
|
||||
PLIST.gssapi= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mmail)
|
||||
CONFIGURE_ARGS+= --enable-mail
|
||||
PLIST_SRC+= PLIST.mail
|
||||
PLIST.mail= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mmysql)
|
||||
.include "../../mk/mysql.buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --enable-mysql
|
||||
PLIST_SRC+= PLIST.mysql
|
||||
PLIST.mysql= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mpgsql)
|
||||
.include "../../mk/pgsql.buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --enable-pgsql
|
||||
PLIST_SRC+= PLIST.pgsql
|
||||
PLIST.pgsql= yes
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Msnmp)
|
||||
.include "../../net/net-snmp/buildlink3.mk"
|
||||
CONFIGURE_ARGS+= --enable-snmp
|
||||
PLIST_SRC+= PLIST.snmp
|
||||
PLIST.snmp= yes
|
||||
.endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue