kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Import rsyslog-7.4.4 as wip/rsyslog7.

Browse source 
Rsyslog is an enhanced syslogd supporting, among others, MySQL,
PostgreSQL, failover log destinations, syslog/tcp, fine grain
output format control, high precision timestamps, queued operations
and the ability to filter on any message part. It is quite
compatible to stock sysklogd and can be used as a drop-in
replacement.
This commit is contained in:
Filip Hajny 2013-09-11 10:01:56 +00:00 committed by Thomas Klausner
parent 080ac186e2
commit 6cdc75234c
11 changed files with 294 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rsyslog7/DESCR Normal file
View file

@ -0,0 +1,6 @@
Rsyslog is an enhanced syslogd supporting, among others, MySQL,
PostgreSQL, failover log destinations, syslog/tcp, fine grain
output format control, high precision timestamps, queued operations
and the ability to filter on any message part. It is quite
compatible to stock sysklogd and can be used as a drop-in
replacement.

11
rsyslog7/MESSAGE.NetBSD Normal file
View file

@ -0,0 +1,11 @@
===========================================================================
$NetBSD: MESSAGE.NetBSD,v 1.1 2013/09/11 10:01:56 fhajny Exp $
For simple replacement for syslogd(8), you may put the following lines
into your /etc/rc.conf:
syslogd=NO
rsyslogd=YES
rsyslogd_flags="-c 3 -f /etc/syslog.conf"
===========================================================================

9
rsyslog7/MESSAGE.SunOS Normal file
View file

@ -0,0 +1,9 @@
===========================================================================
$NetBSD: MESSAGE.SunOS,v 1.1 2013/09/11 10:01:56 fhajny Exp $
To use rsyslogd on Solaris, you'll need to stop the default syslogd first
via SMF:
svcadm disable system/system-log
===========================================================================

59
rsyslog7/Makefile Normal file
View file

@ -0,0 +1,59 @@
# $NetBSD: Makefile,v 1.1 2013/09/11 10:01:56 fhajny Exp $
#
DISTNAME= rsyslog-7.4.4
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
MAINTAINER= filip@joyent.com
HOMEPAGE= http://www.rsyslog.com/
COMMENT= The enhanced syslogd for Unix
LICENSE= gnu-gpl-v3
CONFLICTS= rsyslog-[0-9]*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-testbench
CONFIGURE_ARGS+= --enable-mmnormalize
CONFIGURE_ARGS+= --enable-cached-man-pages
CONFIGURE_ARGS+= --enable-imdiag --enable-impstats --enable-omstdout
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= tools/rsyslog.conf.5 tools/rsyslogd.8 tools/syslogd.c
SUBST_SED.paths= -e "s|/etc/rsyslog.conf|${PKG_SYSCONFDIR}/rsyslog.conf|g"
SUBST_SED.paths+= -e "s|/etc/rsyslogd.conf|${PKG_SYSCONFDIR}/rsyslog.conf|g"
SUBST_MESSAGE.paths= Fixing paths.
DOCDIR= ${PREFIX}/share/doc/rsyslog
EGDIR= ${PREFIX}/share/examples/rsyslog
RCD_SCRIPTS= rsyslogd
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${DESTDIR}${EGDIR}/rsyslog.conf
.if !empty(PKG_OPTIONS:Mmysql)
${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql \
${DESTDIR}${EGDIR}/createDB-mysql.sql
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \
${DESTDIR}${EGDIR}/createDB-pgsql.sql
.endif
.include "../../wip/libee/buildlink3.mk"
BUILDLINK_ABI_DEPENDS.libestr+= libestr>=0.1.5
.include "../../wip/libestr/buildlink3.mk"
.include "../../wip/liblognorm/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/json-c/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

40
rsyslog7/PLIST Normal file
View file

@ -0,0 +1,40 @@
@comment $NetBSD: PLIST,v 1.1 2013/09/11 10:01:56 fhajny Exp $
${PLIST.diag}lib/rsyslog/imdiag.la
${PLIST.file}lib/rsyslog/imfile.la
${PLIST.gssapi}lib/rsyslog/imgssapi.la
${PLIST.klog}lib/rsyslog/imklog.la
lib/rsyslog/immark.la
lib/rsyslog/impstats.la
${PLIST.solaris}lib/rsyslog/imsolaris.la
lib/rsyslog/imtcp.la
lib/rsyslog/imudp.la
lib/rsyslog/imuxsock.la
${PLIST.libgcrypt}lib/rsyslog/lmcry_gcry.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
${PLIST.guardtime}lib/rsyslog/lmsig_gt.la
lib/rsyslog/lmstrmsrv.la
lib/rsyslog/lmtcpclt.la
lib/rsyslog/lmtcpsrv.la
lib/rsyslog/lmzlibw.la
lib/rsyslog/mmnormalize.la
${PLIST.gssapi}lib/rsyslog/omgssapi.la
${PLIST.dbi}lib/rsyslog/omlibdbi.la
${PLIST.mail}lib/rsyslog/ommail.la
${PLIST.mysql}lib/rsyslog/ommysql.la
${PLIST.pgsql}lib/rsyslog/ompgsql.la
lib/rsyslog/omruleset.la
${PLIST.snmp}lib/rsyslog/omsnmp.la
lib/rsyslog/omstdout.la
lib/rsyslog/omtesting.la
man/man5/rsyslog.conf.5
man/man8/rsyslogd.8
sbin/rsyslogd
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

2
rsyslog7/TODO Normal file
View file

@ -0,0 +1,2 @@
- Improve rc.d script
- Install or not HTML documentation?

7
rsyslog7/distinfo Normal file
View file

@ -0,0 +1,7 @@
$NetBSD: distinfo,v 1.1 2013/09/11 10:01:56 fhajny Exp $
SHA1 (rsyslog-7.4.4.tar.gz) = 635d1ee414b84a7220835ddca3aa76f23580a748
RMD160 (rsyslog-7.4.4.tar.gz) = d67be379cf725b4889c6f9d555530f0bc1eb1206
Size (rsyslog-7.4.4.tar.gz) = 2910075 bytes
SHA1 (patch-configure) = 5b97a21a88049d4d72d472998716a161d08ec1b8
SHA1 (patch-runtime_typedefs.h) = 0e6b2dbe7fd2028f4e34ddcf277486d1b7b24bf8

23
rsyslog7/files/rsyslogd.sh Normal file
View file

@ -0,0 +1,23 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: rsyslogd.sh,v 1.1 2013/09/11 10:01:57 fhajny Exp $
# NetBSD: syslogd,v 1.15 2004/10/11 13:29:52 lukem Exp
#
# PROVIDE: rsyslogd
# REQUIRE: mountcritremote sysdb wscons
# BEFORE: SERVERS
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
name="rsyslogd"
rcvar=$name
command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid"
required_files="@PKG_SYSCONFDIR@/rsyslog.conf"
extra_commands="reload"
load_rc_config $name
run_rc_command "$1"

108
rsyslog7/options.mk Normal file
View file

@ -0,0 +1,108 @@
# $NetBSD: options.mk,v 1.1 2013/09/11 10:01:56 fhajny Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rsyslog
PKG_SUPPORTED_OPTIONS= dbi diag file gnutls gssapi guardtime libgcrypt \
mail mysql pgsql snmp uuid
PKG_SUGGESTED_OPTIONS+= libgcrypt uuid
.if ${OPSYS} == "SunOS"
PKG_SUGGESTED_OPTIONS+= solaris
.else
PKG_SUGGESTED_OPTIONS+= klog
.endif
PKG_OPTIONS_REQUIRED_GROUPS= sysmod
PKG_OPTIONS_GROUP.sysmod= klog solaris
PLIST_VARS+= dbi diag file gnutls gssapi guardtime klog libgcrypt \
mail mysql pgsql snmp solaris
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgnutls)
.include "../../security/gnutls/buildlink3.mk"
CONFIGURE_ARGS+= --enable-gnutls
PLIST.gnutls= yes
.endif
.if !empty(PKG_OPTIONS:Mgssapi)
.include "../../mk/krb5.buildlink3.mk"
CONFIGURE_ARGS+= --enable-gssapi-krb5
PLIST.gssapi= yes
.endif
.if !empty(PKG_OPTIONS:Mmail)
CONFIGURE_ARGS+= --enable-mail
PLIST.mail= yes
.endif
.if !empty(PKG_OPTIONS:Mmysql)
.include "../../mk/mysql.buildlink3.mk"
CONFIGURE_ARGS+= --enable-mysql
PLIST.mysql= yes
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
CONFIGURE_ARGS+= --enable-pgsql
PLIST.pgsql= yes
.endif
.if !empty(PKG_OPTIONS:Msnmp)
.include "../../net/net-snmp/buildlink3.mk"
CONFIGURE_ARGS+= --enable-snmp
PLIST.snmp= yes
.endif
.if !empty(PKG_OPTIONS:Mklog)
CONFIGURE_ARGS+= --enable-klog
PLIST.klog= yes
RSYSLOG_SYSMOD= klog
.else
CONFIGURE_ARGS+= --disable-klog
.endif
.if !empty(PKG_OPTIONS:Msolaris)
CONFIGURE_ARGS+= --enable-imsolaris
PLIST.solaris= yes
RSYSLOG_SYSMOD= solaris
.endif
.if !empty(PKG_OPTIONS:Mfile)
CONFIGURE_ARGS+= --enable-imfile
PLIST.file= yes
.endif
.if !empty(PKG_OPTIONS:Mdbi)
CONFIGURE_ARGS+= --enable-libdbi
PLIST.dbi= yes
.include "../../databases/libdbi/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mdiag)
CONFIGURE_ARGS+= --enable-imdiag
PLIST.diag= yes
.endif
.if !empty(PKG_OPTIONS:Mguardtime)
CONFIGURE_ARGS+= --enable-guardtime
CONFIGURE_ENV+= GUARDTIME_CFLAGS=-I/opt/local/include
CONFIGURE_ENV+= GUARDTIME_LIBS='-L${BUILDLINK_PREFIX.libguardtime}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libguardtime}/lib -lgthttp -lgtbase -lcurl -lcrypto -lrt'
PLIST.guardtime= yes
.include "../../security/libguardtime/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mlibgcrypt)
CONFIGURE_ARGS+= --enable-libgcrypt
PLIST.libgcrypt= yes
.include "../../security/libgcrypt/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-libgcrypt
.endif
.if !empty(PKG_OPTIONS:Muuid)
CONFIGURE_ARGS+= --enable-uuid
.include "../../devel/libuuid/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-uuid
.endif

14
rsyslog7/patches/patch-configure Normal file
View file

@ -0,0 +1,14 @@
$NetBSD: patch-configure,v 1.1 2013/09/11 10:01:57 fhajny Exp $
Portability.
--- configure.orig 2013-09-03 10:32:49.000000000 +0000
+++ configure
@@ -18601,7 +18601,7 @@ $as_echo "no" >&6; }
fi
- if test "x${RST2MAN}" == "x"; then
+ if test "x${RST2MAN}" = "x"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "rst2man not found in PATH

15
rsyslog7/patches/patch-runtime_typedefs.h Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-runtime_typedefs.h,v 1.1 2013/09/11 10:01:57 fhajny Exp $
SunOS has off64_t defined.
--- runtime/typedefs.h.orig 2013-08-30 16:30:41.000000000 +0000
+++ runtime/typedefs.h
@@ -156,7 +156,9 @@ typedef enum {
} fiop_t;
#ifndef HAVE_LSEEK64
+# ifndef __sun
typedef off_t off64_t;
+# endif
#endif
/* types of configuration handlers