aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorbrd <brd@FreeBSD.org>2014-05-16 20:54:17 +0800
committerbrd <brd@FreeBSD.org>2014-05-16 20:54:17 +0800
commit2cb5b66fe1db2608b0183790f334da0863090100 (patch)
treeeef75142e86fde8161ecf5ec29878974c893853f /sysutils
parent2f2495f3270c79d3b412ebfacda9f3467c8b70db (diff)
downloadfreebsd-ports-gnome-2cb5b66fe1db2608b0183790f334da0863090100.tar.gz
freebsd-ports-gnome-2cb5b66fe1db2608b0183790f334da0863090100.tar.zst
freebsd-ports-gnome-2cb5b66fe1db2608b0183790f334da0863090100.zip
- Update rsyslog8-devel from 8.1.6 to 8.3.2
- Add rsyslog8 at version 8.2.1 Reviewed by: zi@
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/rsyslog8-devel/Makefile16
-rw-r--r--sysutils/rsyslog8-devel/distinfo4
-rw-r--r--sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c11
-rw-r--r--sysutils/rsyslog8-devel/pkg-plist2
-rw-r--r--sysutils/rsyslog8/Makefile162
-rw-r--r--sysutils/rsyslog8/distinfo2
-rw-r--r--sysutils/rsyslog8/files/extra-patch-mysql-microseconds56
-rw-r--r--sysutils/rsyslog8/files/extra-patch-sane-hostname40
-rw-r--r--sysutils/rsyslog8/files/patch-runtime--libgcry.c20
-rw-r--r--sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c11
-rw-r--r--sysutils/rsyslog8/files/patch-runtime--queue.c11
-rw-r--r--sysutils/rsyslog8/files/patch-runtime--stream.h10
-rw-r--r--sysutils/rsyslog8/files/pkg-message.in25
-rw-r--r--sysutils/rsyslog8/files/rsyslogd.in25
-rw-r--r--sysutils/rsyslog8/pkg-descr19
-rw-r--r--sysutils/rsyslog8/pkg-plist44
17 files changed, 446 insertions, 13 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 9ecdb3bde7d4..fab56b4bcff0 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -777,6 +777,7 @@
SUBDIR += rsyncrypto
SUBDIR += rsyslog7
SUBDIR += rsyslog7-devel
+ SUBDIR += rsyslog8
SUBDIR += rsyslog8-devel
SUBDIR += rtty
SUBDIR += ruby-quota
diff --git a/sysutils/rsyslog8-devel/Makefile b/sysutils/rsyslog8-devel/Makefile
index 9879d827026d..3b086112c17f 100644
--- a/sysutils/rsyslog8-devel/Makefile
+++ b/sysutils/rsyslog8-devel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= rsyslog
-PORTVERSION= 8.1.6
+PORTVERSION= 8.3.2
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@@ -19,9 +19,7 @@ LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \
USE_LDCONFIG= yes
USE_AUTOTOOLS= autoconf
-PORTSCOUT= limit:^8\.1
-PORTDOCS= *
-PORTEXAMPLES= *
+PORTSCOUT= limit:^8\.3
PKGNAMESUFFIX= 8-devel
OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP
@@ -74,7 +72,7 @@ CONFIGURE_ARGS+=--disable-gssapi-krb5
USE_MYSQL= yes
CONFIGURE_ARGS+=--enable-mysql
PLIST_FILES+= lib/rsyslog/ommysql.so \
- lib/rsyslog/ommysql.la
+ lib/rsyslog/ommysql.la
.else
CONFIGURE_ARGS+=--disable-mysql
.endif
@@ -83,7 +81,7 @@ CONFIGURE_ARGS+=--disable-mysql
USE_PGSQL= yes
CONFIGURE_ARGS+=--enable-pgsql
PLIST_FILES+= lib/rsyslog/ompgsql.so \
- lib/rsyslog/ompgsql.la
+ lib/rsyslog/ompgsql.la
.else
CONFIGURE_ARGS+=--disable-pgsql
.endif
@@ -158,11 +156,7 @@ post-patch:
@${FIND} ${WRKSRC} -name '*.bak' -delete
post-install:
- @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
- @${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/
- @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR}
-.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail
+.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt mmexternal immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so
.endfor
diff --git a/sysutils/rsyslog8-devel/distinfo b/sysutils/rsyslog8-devel/distinfo
index a3db68d3bd88..df294fc045c4 100644
--- a/sysutils/rsyslog8-devel/distinfo
+++ b/sysutils/rsyslog8-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.1.6.tar.gz) = 7505609b461813e5fea1168d386e4d07e3678c923c2b449684e95d07b6b71849
-SIZE (rsyslog-8.1.6.tar.gz) = 2633711
+SHA256 (rsyslog-8.3.2.tar.gz) = 544593192651fbf7e758068c94c7e0aad3871970700916231f94efd32fc80139
+SIZE (rsyslog-8.3.2.tar.gz) = 1962748
diff --git a/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c b/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c
new file mode 100644
index 000000000000..9b4a736a7936
--- /dev/null
+++ b/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c
@@ -0,0 +1,11 @@
+--- ./plugins/mmexternal/mmexternal.c.orig 2014-05-15 11:34:32.462046745 -0600
++++ ./plugins/mmexternal/mmexternal.c 2014-05-15 11:34:44.101043805 -0600
+@@ -31,7 +31,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <wait.h>
++#include <sys/wait.h>
+ #include <sys/uio.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
diff --git a/sysutils/rsyslog8-devel/pkg-plist b/sysutils/rsyslog8-devel/pkg-plist
index 85c9a8742000..73d1c0724915 100644
--- a/sysutils/rsyslog8-devel/pkg-plist
+++ b/sysutils/rsyslog8-devel/pkg-plist
@@ -32,6 +32,8 @@ lib/rsyslog/lmtcpsrv.la
lib/rsyslog/lmtcpsrv.so
lib/rsyslog/lmzlibw.la
lib/rsyslog/lmzlibw.so
+lib/rsyslog/mmexternal.la
+lib/rsyslog/mmexternal.so
lib/rsyslog/ommail.la
lib/rsyslog/ommail.so
lib/rsyslog/omstdout.la
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
new file mode 100644
index 000000000000..c3d8976a42f9
--- /dev/null
+++ b/sysutils/rsyslog8/Makefile
@@ -0,0 +1,162 @@
+# $FreeBSD$
+
+PORTNAME= rsyslog
+PORTVERSION= 8.2.1
+CATEGORIES= sysutils
+MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
+
+MAINTAINER= brd@FreeBSD.org
+COMMENT= Syslogd supporting SQL, TCP, and TLS
+
+BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt
+
+LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \
+ libestr.so:${PORTSDIR}/devel/libestr \
+ libjson.so:${PORTSDIR}/devel/json-c \
+ liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \
+ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= autoconf
+
+PORTSCOUT= limit:^8\.2
+
+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
+
+USES= pkgconfig
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDBI}
+LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
+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+= libgnutls.so:${PORTSDIR}/security/gnutls \
+ libgcrypt.so:${PORTSDIR}/security/libgcrypt
+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+= librelp.so:${PORTSDIR}/devel/librelp
+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+= liblogging.so:${PORTSDIR}/devel/liblogging
+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+= libnetsnmp.so:${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= rsyslog6-* rsyslog-[0-9].*
+CFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+GNU_CONFIGURE= yes
+
+.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 -lkvm"
+CFLAGS+= ${CPPFLAGS}
+
+USE_RC_SUBR= ${PORTNAME}d
+SUB_FILES= pkg-message
+
+CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages --disable-testbench
+
+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:
+.for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
new file mode 100644
index 000000000000..4d6db6f28cde
--- /dev/null
+++ b/sysutils/rsyslog8/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rsyslog-8.2.1.tar.gz) = 193901c359b8228a85dca7a6a2e715ab2b52c18a66ca9f805d4028bedff98196
+SIZE (rsyslog-8.2.1.tar.gz) = 1944225
diff --git a/sysutils/rsyslog8/files/extra-patch-mysql-microseconds b/sysutils/rsyslog8/files/extra-patch-mysql-microseconds
new file mode 100644
index 000000000000..ec248b064741
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/files/extra-patch-sane-hostname b/sysutils/rsyslog8/files/extra-patch-sane-hostname
new file mode 100644
index 000000000000..bc7251475d81
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/files/patch-runtime--libgcry.c b/sysutils/rsyslog8/files/patch-runtime--libgcry.c
new file mode 100644
index 000000000000..f9aaece39e33
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/files/patch-runtime--lmcry_gcry.c b/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c
new file mode 100644
index 000000000000..48986ab690a3
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/files/patch-runtime--queue.c b/sysutils/rsyslog8/files/patch-runtime--queue.c
new file mode 100644
index 000000000000..698020bfff9a
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/files/patch-runtime--stream.h b/sysutils/rsyslog8/files/patch-runtime--stream.h
new file mode 100644
index 000000000000..4427e6a1d705
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/files/pkg-message.in b/sysutils/rsyslog8/files/pkg-message.in
new file mode 100644
index 000000000000..abb08006e491
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/files/rsyslogd.in b/sysutils/rsyslog8/files/rsyslogd.in
new file mode 100644
index 000000000000..8730470c65fc
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/pkg-descr b/sysutils/rsyslog8/pkg-descr
new file mode 100644
index 000000000000..38ffe7aaa43d
--- /dev/null
+++ b/sysutils/rsyslog8/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/rsyslog8/pkg-plist b/sysutils/rsyslog8/pkg-plist
new file mode 100644
index 000000000000..85c9a8742000
--- /dev/null
+++ b/sysutils/rsyslog8/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/omstdout.la
+lib/rsyslog/omstdout.so
+lib/rsyslog/omtesting.la
+lib/rsyslog/omtesting.so
+man/man5/rsyslog.conf.5.gz
+man/man8/rsyslogd.8.gz
+sbin/rsyslogd
+@dirrmtry lib/rsyslog