diff options
author | brd <brd@FreeBSD.org> | 2013-05-26 04:01:57 +0800 |
---|---|---|
committer | brd <brd@FreeBSD.org> | 2013-05-26 04:01:57 +0800 |
commit | 1c3dd91fdd6056cd62e0499b88f5e5f382f633c2 (patch) | |
tree | 56bccbc0623e45357f376f15145000d67ccce7cc | |
parent | c8e93b5f7d7834880f7be4d70977b35f763d651b (diff) | |
download | freebsd-ports-gnome-1c3dd91fdd6056cd62e0499b88f5e5f382f633c2.tar.gz freebsd-ports-gnome-1c3dd91fdd6056cd62e0499b88f5e5f382f633c2.tar.zst freebsd-ports-gnome-1c3dd91fdd6056cd62e0499b88f5e5f382f633c2.zip |
- Update sysutils/rsyslog7 to 7.2.7
- Partially based on work in [1]
- Convert to PORTDOCS= and PORTEXAMPLES=
- Pet portlint
- Add sysutils/rsyslog7-devel at version 7.3.15
PR: 176601 [1]
Submitted by: Cristiano Rolim Pereira <cristianorolim at outlook.com> [1]
Reviewed by: koobs@, jgh@
21 files changed, 519 insertions, 161 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 80f30751112f..837958ea0e0f 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -813,6 +813,7 @@ SUBDIR += rsyslog6-devel-rfc3195 SUBDIR += rsyslog6-devel-snmp SUBDIR += rsyslog7 + SUBDIR += rsyslog7-devel SUBDIR += rtty SUBDIR += ruby-quota SUBDIR += rubygem-SyslogLogger diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile new file mode 100644 index 000000000000..ad4c431b93e7 --- /dev/null +++ b/sysutils/rsyslog7-devel/Makefile @@ -0,0 +1,180 @@ +# $FreeBSD$ + +PORTNAME= rsyslog +PORTVERSION= 7.3.15 +CATEGORIES= sysutils +MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ + +MAINTAINER= brd@FreeBSD.org +COMMENT= Syslogd supporting SQL, TCP, and TLS + +GNU_CONFIGURE= yes +USE_LDCONFIG= yes + +LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ + estr:${PORTSDIR}/devel/libestr \ + json.0:${PORTSDIR}/devel/json-c \ + sysinfo:${PORTSDIR}/devel/libsysinfo \ + uuid:${PORTSDIR}/misc/e2fsprogs-libuuid + +BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \ + rst2man:${PORTSDIR}/textproc/py-docutils + +PORTSCOUT= limit:^6 +PORTDOCS= * +PORTEXAMPLES= * + +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP + +DBI_DESC= LibDBI output module for rsyslog +GNUTLS_DESC= GNUTLS module for rsyslog +GSSAPI_DESC= GSS API input/output module for rsyslog +MYSQL_DESC= MySQL output module for rsyslog +PGSQL_DESC= PostgreSQL output module for rsyslog +RELP_DESC= RELP input/output module for rsyslog +RFC3195_DESC= RFC3195 input support for rsyslog +SNMP_DESC= SNMP trap sender for rsyslog + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDBI} +LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi +USES+= pkgconfig +CONFIGURE_ARGS+=--enable-libdbi +PLIST_FILES+= lib/rsyslog/omlibdbi.la \ + lib/rsyslog/omlibdbi.so +.else +CONFIGURE_ARGS+=--disable-libdbi +.endif + +.if ${PORT_OPTIONS:MGNUTLS} +LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls \ + gcrypt:${PORTSDIR}/security/libgcrypt +USES+= pkgconfig +CONFIGURE_ARGS+=--enable-gnutls +PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ + lib/rsyslog/lmnsd_gtls.so +.else +CONFIGURE_ARGS+=--disable-gnutls +.endif + +.if ${PORT_OPTIONS:MGSSAPI} +CONFIGURE_ARGS+=--enable-gssapi-krb5 +PLIST_FILES+= lib/rsyslog/imgssapi.la \ + lib/rsyslog/imgssapi.so \ + lib/rsyslog/lmgssutil.la \ + lib/rsyslog/lmgssutil.so \ + lib/rsyslog/omgssapi.la \ + lib/rsyslog/omgssapi.so +.else +CONFIGURE_ARGS+=--disable-gssapi-krb5 +.endif + +.if ${PORT_OPTIONS:MMYSQL} +USE_MYSQL= yes +CONFIGURE_ARGS+=--enable-mysql +PLIST_FILES+= lib/rsyslog/ommysql.so \ + lib/rsyslog/ommysql.la +.else +CONFIGURE_ARGS+=--disable-mysql +.endif + +.if ${PORT_OPTIONS:MPGSQL} +USE_PGSQL= yes +CONFIGURE_ARGS+=--enable-pgsql +PLIST_FILES+= lib/rsyslog/ompgsql.so \ + lib/rsyslog/ompgsql.la +.else +CONFIGURE_ARGS+=--disable-pgsql +.endif + +.if ${PORT_OPTIONS:MRELP} +LIB_DEPENDS+= relp.0:${PORTSDIR}/devel/librelp +USES+= pkgconfig +CONFIGURE_ARGS+=--enable-relp +PLIST_FILES+= lib/rsyslog/imrelp.la \ + lib/rsyslog/imrelp.so \ + lib/rsyslog/omrelp.la \ + lib/rsyslog/omrelp.so +.else +CONFIGURE_ARGS+=--disable-relp +.endif + +.if ${PORT_OPTIONS:MRFC3195} +LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging +USES+= pkgconfig +CONFIGURE_ARGS+=--enable-rfc3195 +PLIST_FILES+= lib/rsyslog/im3195.la \ + lib/rsyslog/im3195.so +.else +CONFIGURE_ARGS+=--disable-rfc3195 +.endif + +.if ${PORT_OPTIONS:MSNMP} +LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp +CONFIGURE_ARGS+=--enable-snmp +PLIST_FILES+= lib/rsyslog/omsnmp.la \ + lib/rsyslog/omsnmp.so +.else +CONFIGURE_ARGS+=--disable-snmp +.endif + +.ifdef WITH_MYSQL_MICROSECONDS +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds +.endif + +.ifdef WITH_SANE_HOSTNAME +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sane-hostname +.endif + +CONFLICTS= rsyslog-[56].[0-9]* +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +.ifdef WITH_DEBUG +CONFIGURE_ARGS+=--enable-rtinst --enable-debug +.endif + +.include <bsd.port.pre.mk> + +.if ${ARCH} == "i386" +CPPFLAGS+=-march=i686 +.endif + +CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lsysinfo -lkvm" +CFLAGS+= ${CPPFLAGS} + +MAN8= rsyslogd.8 +MAN5= rsyslog.conf.5 + +USE_RC_SUBR= ${PORTNAME}d +SUB_FILES= pkg-message + +CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout + +post-patch: + @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ + ${WRKSRC}/tools/syslogd.c + @${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\ + 's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|' + @${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c + @${FIND} ${WRKSRC} -name '*.bak' -delete + +post-install: +.if ${PORT_OPTIONS:MDOCS} + @${INSTALL} -d ${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/ +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + @${INSTALL} -d ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} +.endif + @${CAT} ${PKGMESSAGE} + +.if ${OSVERSION} < 700042 +USE_GCC= 4.2+ +.endif + +.include <bsd.port.post.mk> diff --git a/sysutils/rsyslog7-devel/distinfo b/sysutils/rsyslog7-devel/distinfo new file mode 100644 index 000000000000..1ed5d2089ec4 --- /dev/null +++ b/sysutils/rsyslog7-devel/distinfo @@ -0,0 +1,2 @@ +SHA256 (rsyslog-7.3.15.tar.gz) = 8468c58ae28b713bfb19073fba7335644ea26e18aebcb5b83af679d3e5702cbd +SIZE (rsyslog-7.3.15.tar.gz) = 2920543 diff --git a/sysutils/rsyslog7-devel/files/extra-patch-mysql-microseconds b/sysutils/rsyslog7-devel/files/extra-patch-mysql-microseconds new file mode 100644 index 000000000000..ec248b064741 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/extra-patch-mysql-microseconds @@ -0,0 +1,56 @@ +--- ./runtime/datetime.c.orig 2010-05-04 18:57:25.588028725 -0400 ++++ ./runtime/datetime.c 2010-05-04 18:59:12.390680038 -0400 +@@ -644,18 +644,30 @@ + pBuf[1] = (ts->year / 100) % 10 + '0'; + pBuf[2] = (ts->year / 10) % 10 + '0'; + pBuf[3] = ts->year % 10 + '0'; +- pBuf[4] = (ts->month / 10) % 10 + '0'; +- pBuf[5] = ts->month % 10 + '0'; +- pBuf[6] = (ts->day / 10) % 10 + '0'; +- pBuf[7] = ts->day % 10 + '0'; +- pBuf[8] = (ts->hour / 10) % 10 + '0'; +- pBuf[9] = ts->hour % 10 + '0'; +- pBuf[10] = (ts->minute / 10) % 10 + '0'; +- pBuf[11] = ts->minute % 10 + '0'; +- pBuf[12] = (ts->second / 10) % 10 + '0'; +- pBuf[13] = ts->second % 10 + '0'; +- pBuf[14] = '\0'; +- return 15; ++ pBuf[4] = '-'; ++ pBuf[5] = (ts->month / 10) % 10 + '0'; ++ pBuf[6] = ts->month % 10 + '0'; ++ pBuf[7] = '-'; ++ pBuf[8] = (ts->day / 10) % 10 + '0'; ++ pBuf[9] = ts->day % 10 + '0'; ++ pBuf[10] = ' '; ++ pBuf[11] = (ts->hour / 10) % 10 + '0'; ++ pBuf[12] = ts->hour % 10 + '0'; ++ pBuf[13] = ':'; ++ pBuf[14] = (ts->minute / 10) % 10 + '0'; ++ pBuf[15] = ts->minute % 10 + '0'; ++ pBuf[16] = ':'; ++ pBuf[17] = (ts->second / 10) % 10 + '0'; ++ pBuf[18] = ts->second % 10 + '0'; ++ pBuf[19] = '.'; ++ pBuf[20] = (ts->secfrac / 100000) % 10 + '0'; ++ pBuf[21] = (ts->secfrac / 10000) % 10 + '0'; ++ pBuf[22] = (ts->secfrac / 1000) % 10 + '0'; ++ pBuf[23] = (ts->secfrac / 100) % 10 + '0'; ++ pBuf[24] = (ts->secfrac / 10) % 10 + '0'; ++ pBuf[25] = ts->secfrac % 10 + '0'; ++ pBuf[26] = '\0'; ++ return 26; + + } + +--- ./runtime/msg.c.orig 2010-05-04 19:00:20.241528788 -0400 ++++ ./runtime/msg.c 2010-05-04 19:00:06.136349680 -0400 +@@ -1293,7 +1293,7 @@ + case tplFmtMySQLDate: + MsgLock(pM); + if(pM->pszTIMESTAMP_MySQL == NULL) { +- if((pM->pszTIMESTAMP_MySQL = MALLOC(15)) == NULL) { ++ if((pM->pszTIMESTAMP_MySQL = MALLOC(26)) == NULL) { + MsgUnlock(pM); + return ""; + } diff --git a/sysutils/rsyslog7-devel/files/extra-patch-sane-hostname b/sysutils/rsyslog7-devel/files/extra-patch-sane-hostname new file mode 100644 index 000000000000..bc7251475d81 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/extra-patch-sane-hostname @@ -0,0 +1,40 @@ +--- ./tools/syslogd.c.orig 2010-05-04 19:02:05.548362478 -0400 ++++ ./tools/syslogd.c 2010-05-04 19:02:27.452450741 -0400 +@@ -2611,37 +2611,6 @@ + net.getLocalHostname(&LocalFQDNName); + CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName)); + glbl.SetLocalFQDNName(LocalFQDNName); /* set the FQDN before we modify it */ +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) { +- *p++ = '\0'; +- LocalDomain = p; +- } else { +- LocalDomain = (uchar*)""; +- +- /* It's not clearly defined whether gethostname() +- * should return the simple hostname or the fqdn. A +- * good piece of software should be aware of both and +- * we want to distribute good software. Joey +- * +- * Good software also always checks its return values... +- * If syslogd starts up before DNS is up & /etc/hosts +- * doesn't have LocalHostName listed, gethostbyname will +- * return NULL. +- */ +- /* TODO: gethostbyname() is not thread-safe, but replacing it is +- * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25 +- */ +- hent = gethostbyname((char*)LocalHostName); +- if(hent) { +- free(LocalHostName); +- CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name)); +- +- if((p = (uchar*)strchr((char*)LocalHostName, '.'))) +- { +- *p++ = '\0'; +- LocalDomain = p; +- } +- } +- } + + /* Convert to lower case to recognize the correct domain laterly */ + for(p = LocalDomain ; *p ; p++) diff --git a/sysutils/rsyslog7-devel/files/patch-grammar__lexer.l b/sysutils/rsyslog7-devel/files/patch-grammar__lexer.l new file mode 100644 index 000000000000..c9597edcf735 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-grammar__lexer.l @@ -0,0 +1,11 @@ +--- grammar/lexer.l.ori 2012-12-31 21:57:37.000000000 -0700 ++++ grammar/lexer.l 2012-12-31 21:57:51.000000000 -0700 +@@ -88,7 +88,7 @@ + /* somehow, I need these prototype even though the headers are + * included. I guess that's some autotools magic I don't understand... + */ +-int fileno(FILE *stream); ++//int fileno(FILE *stream); + + %} + diff --git a/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c b/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c new file mode 100644 index 000000000000..df66168e87d9 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c @@ -0,0 +1,10 @@ +--- plugins/impstats/impstats.c.ori 2013-05-24 20:36:41.000000000 -0600 ++++ plugins/impstats/impstats.c 2013-05-24 20:36:56.000000000 -0600 +@@ -39,6 +39,7 @@ + #include "glbl.h" + #include "statsobj.h" + #include "prop.h" ++#include <sys/stat.h> + + MODULE_TYPE_INPUT + MODULE_TYPE_NOKEEP diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h b/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h new file mode 100644 index 000000000000..28432a658e25 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h @@ -0,0 +1,11 @@ +--- runtime/cryprov.h.ori 2013-05-24 19:47:48.000000000 -0600 ++++ runtime/cryprov.h 2013-05-24 20:20:40.000000000 -0600 +@@ -33,7 +33,7 @@ + rsRetVal (*Destruct)(void *ppThis); + rsRetVal (*OnFileOpen)(void *pThis, uchar *fn, void *pFileInstData); + rsRetVal (*Encrypt)(void *pFileInstData, uchar *buf, size_t *lenBuf); +- rsRetVal (*OnFileClose)(void *pFileInstData, off64_t offsLogfile); ++ rsRetVal (*OnFileClose)(void *pFileInstData, off_t offsLogfile); + ENDinterface(cryprov) + #define cryprovCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */ + #endif /* #ifndef INCLUDED_CRYPROV_H */ diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c b/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c new file mode 100644 index 000000000000..f9aaece39e33 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c @@ -0,0 +1,20 @@ +--- runtime/libgcry.c.ori 2013-05-24 20:24:27.000000000 -0600 ++++ runtime/libgcry.c 2013-05-24 20:24:52.000000000 -0600 +@@ -171,7 +171,7 @@ + * no matter what happens. + */ + static void +-eiClose(gcryfile gf, off64_t offsLogfile) ++eiClose(gcryfile gf, off_t offsLogfile) + { + char offs[21]; + size_t len; +@@ -213,7 +213,7 @@ + } + + int +-gcryfileDestruct(gcryfile gf, off64_t offsLogfile) ++gcryfileDestruct(gcryfile gf, off_t offsLogfile) + { + int r = 0; + if(gf == NULL) diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h b/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h new file mode 100644 index 000000000000..f29f6d267eb9 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h @@ -0,0 +1,11 @@ +--- runtime/libgcry.h.ori 2013-05-24 20:23:45.000000000 -0600 ++++ runtime/libgcry.h 2013-05-24 20:24:03.000000000 -0600 +@@ -49,7 +49,7 @@ + rsRetVal rsgcrySetAlgo(gcryctx ctx, uchar *modename); + gcryctx gcryCtxNew(void); + void rsgcryCtxDel(gcryctx ctx); +-int gcryfileDestruct(gcryfile gf, off64_t offsLogfile); ++int gcryfileDestruct(gcryfile gf, off_t offsLogfile); + rsRetVal rsgcryInitCrypt(gcryctx ctx, gcryfile *pgf, uchar *fname); + int rsgcryEncrypt(gcryfile pF, uchar *buf, size_t *len); + diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c b/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c new file mode 100644 index 000000000000..48986ab690a3 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c @@ -0,0 +1,11 @@ +--- runtime/lmcry_gcry.c.ori 2013-05-24 20:25:10.000000000 -0600 ++++ runtime/lmcry_gcry.c 2013-05-24 20:25:25.000000000 -0600 +@@ -216,7 +216,7 @@ + } + + static rsRetVal +-OnFileClose(void *pF, off64_t offsLogfile) ++OnFileClose(void *pF, off_t offsLogfile) + { + DEFiRet; + gcryfileDestruct(pF, offsLogfile); diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--queue.c b/sysutils/rsyslog7-devel/files/patch-runtime--queue.c new file mode 100644 index 000000000000..698020bfff9a --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-runtime--queue.c @@ -0,0 +1,11 @@ +--- runtime/queue.c.ori 2013-05-24 20:22:54.000000000 -0600 ++++ runtime/queue.c 2013-05-24 20:23:07.000000000 -0600 +@@ -1449,7 +1449,7 @@ + DoDeleteBatchFromQStore(qqueue_t *pThis, int nElem) + { + int i; +- off64_t bytesDel; ++ off_t bytesDel; + DEFiRet; + + ISOBJ_TYPE_assert(pThis, qqueue); diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--stream.h b/sysutils/rsyslog7-devel/files/patch-runtime--stream.h new file mode 100644 index 000000000000..4427e6a1d705 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/patch-runtime--stream.h @@ -0,0 +1,10 @@ +--- runtime/stream.h.ori 2013-05-24 20:21:51.000000000 -0600 ++++ runtime/stream.h 2013-05-24 20:21:11.000000000 -0600 +@@ -207,6 +207,6 @@ + + /* prototypes */ + PROTOTYPEObjClassInit(strm); +-rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off64_t offs, off64_t *bytesDel); ++rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off_t offs, off_t *bytesDel); + + #endif /* #ifndef STREAM_H_INCLUDED */ diff --git a/sysutils/rsyslog7-devel/files/pkg-message.in b/sysutils/rsyslog7-devel/files/pkg-message.in new file mode 100644 index 000000000000..abb08006e491 --- /dev/null +++ b/sysutils/rsyslog7-devel/files/pkg-message.in @@ -0,0 +1,25 @@ +=================================================================== +To start using rsyslogd(8), stop syslogd(8) if it's running and +add the following lines to rc.conf(5): + + syslogd_enable="NO" + rsyslogd_enable="YES" + +It's recommended to copy syslog.conf(5) to +%%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add +this: + + rsyslogd_config="/etc/syslog.conf" + +Add the following (3) lines to the beginning of the config file, for +basic functionality: + + $ModLoad immark.so # provides --MARK-- message capability + $ModLoad imuxsock.so # provides support for local system logging + $ModLoad imklog.so # kernel logging + +newsyslog(8) has the path of syslogd's pid file hardcoded. To +make it work seamlessly with rsyslog, add this: + + rsyslogd_pidfile="/var/run/syslog.pid" +=================================================================== diff --git a/sysutils/rsyslog7-devel/files/rsyslogd.in b/sysutils/rsyslog7-devel/files/rsyslogd.in new file mode 100644 index 000000000000..8730470c65fc --- /dev/null +++ b/sysutils/rsyslog7-devel/files/rsyslogd.in @@ -0,0 +1,25 @@ +#!/bin/sh +# +# $FreeBSD$ +# + + +# PROVIDE: rsyslogd +# REQUIRE: mountcritremote cleanvar newsyslog ldconfig +# BEFORE: SERVERS + +. /etc/rc.subr + +name=rsyslogd +rcvar=rsyslogd_enable +command="%%PREFIX%%/sbin/${name}" +load_rc_config $name +: ${rsyslogd_enable:="NO"} +: ${rsyslogd_pidfile:="/var/run/rsyslogd.pid"} +: ${rsyslogd_config:="%%PREFIX%%/etc/rsyslog.conf"} +pidfile="${rsyslogd_pidfile}" +command_args="-i ${pidfile} -f ${rsyslogd_config}" +required_files="${rsyslogd_config}" +extra_commands="reload" + +run_rc_command "$1" diff --git a/sysutils/rsyslog7-devel/pkg-descr b/sysutils/rsyslog7-devel/pkg-descr new file mode 100644 index 000000000000..38ffe7aaa43d --- /dev/null +++ b/sysutils/rsyslog7-devel/pkg-descr @@ -0,0 +1,19 @@ +Rsyslog is an enhanced multi-threaded syslogd with a focus on +security and reliability. + +Among others, it offers support for on-demand disk buffering, +reliable syslog over TCP, SSL, TLS and RELP, writing to databases +(MySQL, PostgreSQL, Oracle, and many more), email alerting, fully +configurable output formats (including high-precision timestamps), +the ability to filter on any part of the syslog message, on-the-wire +message compression, and the ability to convert text files to syslog. + +It is a drop-in replacement for stock syslogd and able to work with +the same configuration file syntax. Its advanced features make it +suitable for enterprise-class, encryption protected syslog relay +chains while at the same time being very easy to setup for the +novice user. + +Tracking v7-devel + +WWW: http://www.rsyslog.com/ diff --git a/sysutils/rsyslog7-devel/pkg-plist b/sysutils/rsyslog7-devel/pkg-plist new file mode 100644 index 000000000000..127620a78353 --- /dev/null +++ b/sysutils/rsyslog7-devel/pkg-plist @@ -0,0 +1,44 @@ +lib/rsyslog/imdiag.la +lib/rsyslog/imdiag.so +lib/rsyslog/imfile.la +lib/rsyslog/imfile.so +lib/rsyslog/imklog.la +lib/rsyslog/imklog.so +lib/rsyslog/immark.la +lib/rsyslog/immark.so +lib/rsyslog/impstats.la +lib/rsyslog/impstats.so +lib/rsyslog/imtcp.la +lib/rsyslog/imtcp.so +lib/rsyslog/imudp.la +lib/rsyslog/imudp.so +lib/rsyslog/imuxsock.la +lib/rsyslog/imuxsock.so +lib/rsyslog/lmcry_gcry.la +lib/rsyslog/lmcry_gcry.so +lib/rsyslog/lmnet.la +lib/rsyslog/lmnet.so +lib/rsyslog/lmnetstrms.la +lib/rsyslog/lmnetstrms.so +lib/rsyslog/lmnsd_ptcp.la +lib/rsyslog/lmnsd_ptcp.so +lib/rsyslog/lmregexp.la +lib/rsyslog/lmregexp.so +lib/rsyslog/lmstrmsrv.la +lib/rsyslog/lmstrmsrv.so +lib/rsyslog/lmtcpclt.la +lib/rsyslog/lmtcpclt.so +lib/rsyslog/lmtcpsrv.la +lib/rsyslog/lmtcpsrv.so +lib/rsyslog/lmzlibw.la +lib/rsyslog/lmzlibw.so +lib/rsyslog/ommail.la +lib/rsyslog/ommail.so +lib/rsyslog/omruleset.la +lib/rsyslog/omruleset.so +lib/rsyslog/omstdout.la +lib/rsyslog/omstdout.so +lib/rsyslog/omtesting.la +lib/rsyslog/omtesting.so +sbin/rsyslogd +@dirrmtry lib/rsyslog diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile index 0bd6a39195a1..77e5424d6e5e 100644 --- a/sysutils/rsyslog7/Makefile +++ b/sysutils/rsyslog7/Makefile @@ -1,25 +1,28 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 7.2.4 -PORTREVISION?= 2 +PORTVERSION= 7.2.7 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org -COMMENT?= Syslogd supporting SQL, TCP, and TLS +COMMENT= Syslogd supporting SQL, TCP, and TLS -USE_LDCONFIG= yes - -LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \ +LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ estr:${PORTSDIR}/devel/libestr \ - sysinfo:${PORTSDIR}/devel/libsysinfo \ json.0:${PORTSDIR}/devel/json-c \ + sysinfo:${PORTSDIR}/devel/libsysinfo \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid +USE_LDCONFIG= yes + PORTSCOUT= limit:^6 +PORTDOCS= * +PORTEXAMPLES= * + -OPTIONS_DEFINE= DBI GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP + +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog @@ -38,6 +41,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ lib/rsyslog/omlibdbi.so +.else +CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} @@ -47,6 +52,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ lib/rsyslog/lmnsd_gtls.so +.else +CONFIGURE_ARGS+=--disable-gnutls .endif .if ${PORT_OPTIONS:MGSSAPI} @@ -57,6 +64,8 @@ PLIST_FILES+= lib/rsyslog/imgssapi.la \ lib/rsyslog/lmgssutil.so \ lib/rsyslog/omgssapi.la \ lib/rsyslog/omgssapi.so +.else +CONFIGURE_ARGS+=--disable-gssapi-krb5 .endif .if ${PORT_OPTIONS:MMYSQL} @@ -64,6 +73,8 @@ USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql PLIST_FILES+= lib/rsyslog/ommysql.so \ lib/rsyslog/ommysql.la +.else +CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} @@ -71,6 +82,8 @@ USE_PGSQL= yes CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so \ lib/rsyslog/ompgsql.la +.else +CONFIGURE_ARGS+=--disable-pgsql .endif .if ${PORT_OPTIONS:MRELP} @@ -81,6 +94,8 @@ PLIST_FILES+= lib/rsyslog/imrelp.la \ lib/rsyslog/imrelp.so \ lib/rsyslog/omrelp.la \ lib/rsyslog/omrelp.so +.else +CONFIGURE_ARGS+=--disable-relp .endif .if ${PORT_OPTIONS:MRFC3195} @@ -89,6 +104,8 @@ USES+= pkgconfig CONFIGURE_ARGS+=--enable-rfc3195 PLIST_FILES+= lib/rsyslog/im3195.la \ lib/rsyslog/im3195.so +.else +CONFIGURE_ARGS+=--disable-rfc3195 .endif .if ${PORT_OPTIONS:MSNMP} @@ -96,9 +113,10 @@ LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ lib/rsyslog/omsnmp.so +.else +CONFIGURE_ARGS+=--disable-snmp .endif - .ifdef WITH_MYSQL_MICROSECONDS EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds .endif @@ -143,12 +161,12 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: -.ifndef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/ @${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/ .endif -.ifndef NOPORTEXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} @${INSTALL} -d ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} .endif diff --git a/sysutils/rsyslog7/distinfo b/sysutils/rsyslog7/distinfo index da8659273283..f1da0f307bda 100644 --- a/sysutils/rsyslog7/distinfo +++ b/sysutils/rsyslog7/distinfo @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.2.4.tar.gz) = 90af55f696db3209a9ef28d8e8052c48917479dd994838f5ef678b1f701c4540 -SIZE (rsyslog-7.2.4.tar.gz) = 2702981 +SHA256 (rsyslog-7.2.7.tar.gz) = 4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d +SIZE (rsyslog-7.2.7.tar.gz) = 2761741 diff --git a/sysutils/rsyslog7/pkg-descr b/sysutils/rsyslog7/pkg-descr index d80b7ba0d7a6..38ffe7aaa43d 100644 --- a/sysutils/rsyslog7/pkg-descr +++ b/sysutils/rsyslog7/pkg-descr @@ -14,6 +14,6 @@ suitable for enterprise-class, encryption protected syslog relay chains while at the same time being very easy to setup for the novice user. -Tracking v6-devel +Tracking v7-devel WWW: http://www.rsyslog.com/ diff --git a/sysutils/rsyslog7/pkg-plist b/sysutils/rsyslog7/pkg-plist index b8bff59d3778..341bd2192603 100644 --- a/sysutils/rsyslog7/pkg-plist +++ b/sysutils/rsyslog7/pkg-plist @@ -39,151 +39,4 @@ lib/rsyslog/omstdout.so lib/rsyslog/omtesting.la lib/rsyslog/omtesting.so sbin/rsyslogd -%%PORTDOCS%%%%DOCSDIR%%/bugs.html -%%PORTDOCS%%%%DOCSDIR%%/build_from_repo.html -%%PORTDOCS%%%%DOCSDIR%%/contributors.html -%%PORTDOCS%%%%DOCSDIR%%/debug.html -%%PORTDOCS%%%%DOCSDIR%%/dev_oplugins.html -%%PORTDOCS%%%%DOCSDIR%%/dev_queue.html -%%PORTDOCS%%%%DOCSDIR%%/droppriv.html -%%PORTDOCS%%%%DOCSDIR%%/expression.html -%%PORTDOCS%%%%DOCSDIR%%/features.html -%%PORTDOCS%%%%DOCSDIR%%/free_support.html -%%PORTDOCS%%%%DOCSDIR%%/generic_design.html -%%PORTDOCS%%%%DOCSDIR%%/gssapi.html -%%PORTDOCS%%%%DOCSDIR%%/history.html -%%PORTDOCS%%%%DOCSDIR%%/how2help.html -%%PORTDOCS%%%%DOCSDIR%%/im3195.html -%%PORTDOCS%%%%DOCSDIR%%/imfile.html -%%PORTDOCS%%%%DOCSDIR%%/imgssapi.html -%%PORTDOCS%%%%DOCSDIR%%/imklog.html -%%PORTDOCS%%%%DOCSDIR%%/imkmsg.html -%%PORTDOCS%%%%DOCSDIR%%/impstats.html -%%PORTDOCS%%%%DOCSDIR%%/imptcp.html -%%PORTDOCS%%%%DOCSDIR%%/imrelp.html -%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html -%%PORTDOCS%%%%DOCSDIR%%/imtcp.html -%%PORTDOCS%%%%DOCSDIR%%/imudp.html -%%PORTDOCS%%%%DOCSDIR%%/imuxsock.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/install.html -%%PORTDOCS%%%%DOCSDIR%%/ipv6.html -%%PORTDOCS%%%%DOCSDIR%%/licensing.html -%%PORTDOCS%%%%DOCSDIR%%/log_rotation_fix_size.html -%%PORTDOCS%%%%DOCSDIR%%/manual.html -%%PORTDOCS%%%%DOCSDIR%%/messageparser.html -%%PORTDOCS%%%%DOCSDIR%%/mmnormalize.html -%%PORTDOCS%%%%DOCSDIR%%/mmsnmptrapd.html -%%PORTDOCS%%%%DOCSDIR%%/modules.html -%%PORTDOCS%%%%DOCSDIR%%/multi_ruleset.html -%%PORTDOCS%%%%DOCSDIR%%/multi_ruleset_legacy_format.html -%%PORTDOCS%%%%DOCSDIR%%/netstream.html -%%PORTDOCS%%%%DOCSDIR%%/ns_gtls.html -%%PORTDOCS%%%%DOCSDIR%%/ns_ptcp.html -%%PORTDOCS%%%%DOCSDIR%%/omfile.html -%%PORTDOCS%%%%DOCSDIR%%/omfwd.html -%%PORTDOCS%%%%DOCSDIR%%/omhdfs.html -%%PORTDOCS%%%%DOCSDIR%%/omlibdbi.html -%%PORTDOCS%%%%DOCSDIR%%/ommail.html -%%PORTDOCS%%%%DOCSDIR%%/ommysql.html -%%PORTDOCS%%%%DOCSDIR%%/omoracle.html -%%PORTDOCS%%%%DOCSDIR%%/ompipe.html -%%PORTDOCS%%%%DOCSDIR%%/omprog.html -%%PORTDOCS%%%%DOCSDIR%%/omrelp.html -%%PORTDOCS%%%%DOCSDIR%%/omruleset.html -%%PORTDOCS%%%%DOCSDIR%%/omsnmp.html -%%PORTDOCS%%%%DOCSDIR%%/omstdout.html -%%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html -%%PORTDOCS%%%%DOCSDIR%%/omusrmsg.html -%%PORTDOCS%%%%DOCSDIR%%/omuxsock.html -%%PORTDOCS%%%%DOCSDIR%%/pmlastmsg.html -%%PORTDOCS%%%%DOCSDIR%%/property_replacer.html -%%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg -%%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic_small.jpg -%%PORTDOCS%%%%DOCSDIR%%/queues.html -%%PORTDOCS%%%%DOCSDIR%%/queues_analogy.html -%%PORTDOCS%%%%DOCSDIR%%/rainerscript.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_abortonuncleanconfig.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionexeconlywhenpreviousissuspended.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionresumeinterval.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_allowedsender.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_controlcharacterescapeprefix.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintcfsyslinehandlerlist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintmodulelist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprinttemplatelist.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dircreatemode.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirgroup.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirowner.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escape8bitcharsonreceive.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_filecreatemode.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_filegroup.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_fileowner.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_generateconfiggraph.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_gssforwardservicename.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_gsslistenservicename.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_gssmode.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_includeconfig.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_mainmsgqueuesize.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_markmessageperiod.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_maxopenfiles.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_moddir.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_modload.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_omfileforcechown.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_repeatedmsgreduction.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_resetconfigvariables.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_rulesetcreatemainqueue.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_rulesetparser.html -%%PORTDOCS%%%%DOCSDIR%%/rsconf1_umask.html -%%PORTDOCS%%%%DOCSDIR%%/rscript_abnf.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_actions.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_basic_structure.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_examples.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_file_syntax_differences.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_filter.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_global.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_lines.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_modules.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_nomatch.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_output.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf_templates.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_high_database_rate.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_ng_comparison.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_pgsql.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_reliable_forwarding.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html -%%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html -%%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html -%%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_100.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_ca.jpg -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_client.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_errmsgs.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_machine.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_scenario.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_server.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_summary.html -%%PORTDOCS%%%%DOCSDIR%%/tls_cert_udp_relay.html -%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html -%%PORTDOCS%%%%DOCSDIR%%/v3compatibility.html -%%PORTDOCS%%%%DOCSDIR%%/v4compatibility.html -%%PORTDOCS%%%%DOCSDIR%%/v5compatibility.html -%%PORTDOCS%%%%DOCSDIR%%/v6compatibility.html -%%PORTDOCS%%%%DOCSDIR%%/v7compatibility.html -%%PORTDOCS%%%%DOCSDIR%%/version_naming.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rsyslog-example.conf -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry lib/rsyslog |