rsyslog [Re: CVS: cvs.openbsd.org: ports]

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

rsyslog [Re: CVS: cvs.openbsd.org: ports]

Stuart Henderson
On 2016/03/06 05:18, Antoine Jacoutot wrote:

> CVSROOT: /cvs
> Module name: ports
> Changes by: [hidden email] 2016/03/06 05:18:31
>
> Modified files:
> sysutils/rsyslog: Makefile
> sysutils/rsyslog/patches: patch-runtime_nsd_gtls_c
>
> Log message:
> Fix build with GnuTLS >= 3.4
> On a side note, this port could use an update...
>

chris@ asked about this the other day too. here's a possible diff,
it builds but I haven't tried running it yet.

also since I don't use this I have no idea if we actually want
liblogging-stdlog or if it's ok to disable for now.

sample config is from chris.

I guess we are now going to see missing WANTLIB on idn all
across the tree ;)

Index: librelp/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/librelp/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- librelp/Makefile 16 Mar 2015 18:07:55 -0000 1.5
+++ librelp/Makefile 6 Mar 2016 12:34:54 -0000
@@ -1,20 +1,28 @@
-# $OpenBSD: Makefile,v 1.5 2015/03/16 18:07:55 naddy Exp $
+# $OpenBSD: Makefile.template,v 1.73 2016/01/11 09:17:22 sthen Exp $
 
 COMMENT = reliable event logging protocol library
 
-DISTNAME = librelp-1.0.1
+DISTNAME = librelp-1.2.9
+
+SHARED_LIBS +=  relp                      1.0 # 1.0
+
 CATEGORIES = sysutils
-MASTER_SITES = http://download.rsyslog.com/librelp/
+
 HOMEPAGE = http://www.librelp.com/
-REVISION = 0
 
 MAINTAINER = Todd T. Fries <[hidden email]>
 
-SHARED_LIBS +=  relp                      0.1 # 0.1
-
-# GPLv3
+# GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
 
+WANTLIB += ffi gmp gnutls hogweed iconv intl nettle p11-kit pthread
+WANTLIB += tasn1 z
+
+MASTER_SITES = http://download.rsyslog.com/librelp/
+
+SEPARATE_BUILD = Yes
 CONFIGURE_STYLE = gnu
+
+LIB_DEPENDS = security/gnutls
 
 .include <bsd.port.mk>
Index: librelp/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/librelp/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- librelp/distinfo 8 Jan 2013 17:36:39 -0000 1.2
+++ librelp/distinfo 6 Mar 2016 12:34:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (librelp-1.0.1.tar.gz) = drAQqpFJl2gC2qLl/aesAqiiJ7DIwNEGnuwtKmYpc5o=
-SIZE (librelp-1.0.1.tar.gz) = 355401
+SHA256 (librelp-1.2.9.tar.gz) = Ug3nuj3GiNxyxbAU3GHvGR6VKPd9FlHdylX8DBSdmKM=
+SIZE (librelp-1.2.9.tar.gz) = 415909
Index: rsyslog/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- rsyslog/Makefile 6 Mar 2016 12:18:31 -0000 1.26
+++ rsyslog/Makefile 6 Mar 2016 12:34:54 -0000
@@ -6,39 +6,40 @@ BROKEN-hppa = lack of atomic ops
 SHARED_ONLY = Yes
 
 COMMENT-main = syslog daemon supporting databases, TCP, SSL, RELP
-COMMENT-docs = additional html documentation for rsyslog
-COMMENT-mysql = mysql plugin for rsyslog
-COMMENT-pgsql = postgresql plugin for rsyslog
+COMMENT-mysql = MySQL plugin for rsyslog
+COMMENT-pgsql = Postgres plugin for rsyslog
 
-MULTI_PACKAGES = -main -docs -mysql -pgsql
+MULTI_PACKAGES = -main -mysql -pgsql
 
-V = 4.6.4
+V = 8.16.0
 DISTNAME = rsyslog-$V
 PKGNAME-main = rsyslog-$V
-PKGNAME-docs = rsyslog-docs-$V
 PKGNAME-mysql = rsyslog-mysql-$V
 PKGNAME-pgsql = rsyslog-pgsql-$V
 CATEGORIES = sysutils
 
-REVISION-main = 8
-REVISION-docs = 0
-REVISION-mysql = 6
-REVISION-pgsql = 3
-
 HOMEPAGE = http://www.rsyslog.com/
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
 
-MODULES = devel/gettext
+WANTLIB-main += ${MODGETTEXT_WANTLIB}
+WANTLIB-main += c estr ffi gcrypt gmp gnutls gpg-error hogweed idn
+WANTLIB-main += json-c nettle p11-kit pthread relp tasn1 uuid z
+
+WANTLIB-mysql += crypto m mysqlclient pthread ssl stdc++ z
 
-WANTLIB-main += c gmp hogweed nettle ffi gnutls pthread p11-kit
-WANTLIB-main += relp tasn1 z ${MODGETTEXT_WANTLIB}
-WANTLIB-mysql += crypto m mysqlclient ssl z pthread stdc++
 WANTLIB-pgsql += crypto pq ssl
 
-LIB_DEPENDS-main = security/gnutls \
- sysutils/librelp
+MODULES = devel/gettext
+
+LIB_DEPENDS-main = devel/json-c \
+ devel/libestr>=0.1.2 \
+ security/libgcrypt \
+ security/gnutls \
+ sysutils/librelp>=1.2.9
+# XXX should port to using libc UUID functions
+LIB_DEPENDS-main += sysutils/e2fsprogs
 LIB_DEPENDS-mysql = databases/mariadb
 RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main
 LIB_DEPENDS-pgsql = databases/postgresql
@@ -47,21 +48,22 @@ RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PK
 MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \
  http://download.rsyslog.com/rsyslog/
 
-CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.65
+CONFIGURE_STYLE = gnu
 LIBTOOL_FLAGS = --tag=disable-static
 CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
  --enable-pgsql \
  --enable-mysql \
  --enable-mail \
  --enable-gnutls \
- --enable-relp
+ --enable-relp \
+ --disable-liblogging-stdlog
 CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
 
 post-install:
+ rm ${PREFIX}/lib/rsyslog/*.la
  ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rsyslog
- ${INSTALL_DATA} ${WRKSRC}/rsyslog.conf \
-    ${PREFIX}/share/examples/rsyslog
+ ${SUBST_DATA} ${FILESDIR}/rsyslog.conf \
+    ${PREFIX}/share/examples/rsyslog/rsyslog.conf
  ${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql \
     ${PREFIX}/share/examples/rsyslog/createDB_mysql.sql
  ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \
Index: rsyslog/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- rsyslog/distinfo 18 Jan 2015 03:15:14 -0000 1.3
+++ rsyslog/distinfo 6 Mar 2016 12:34:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-4.6.4.tar.gz) = nXEtLKHutWkrlHvDN5dzqLHtGeddgwflhwuEaoOwac8=
-SIZE (rsyslog-4.6.4.tar.gz) = 2080038
+SHA256 (rsyslog-8.16.0.tar.gz) = T+T5fBCJkIbZi5QB1+jSvP9hx8P3zehieJHjb8bsG3Y=
+SIZE (rsyslog-8.16.0.tar.gz) = 2132012
Index: rsyslog/files/rsyslog.conf
===================================================================
RCS file: rsyslog/files/rsyslog.conf
diff -N rsyslog/files/rsyslog.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ rsyslog/files/rsyslog.conf 6 Mar 2016 12:34:54 -0000
@@ -0,0 +1,92 @@
+# $OpenBSD$
+
+# rsyslog configuration file
+# note that most of this config file uses old-style format,
+# because it is well-known AND quite suitable for simple cases
+# like we have with the default config. For more advanced
+# things, RainerScript configuration is suggested.
+#
+# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
+# or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html 
+# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
+
+#### MODULES ####
+
+module(load="imuxsock") # provides support for local system logging (e.g. via logger command)
+module(load="imklog")   # provides kernel logging support (previously done by rklogd)
+#module(load"immark")  # provides --MARK-- message capability
+
+# Provides UDP syslog reception
+# for parameters see http://www.rsyslog.com/doc/imudp.html
+#module(load="imudp") # needs to be done just once
+#input(type="imudp" port="514")
+
+# Provides TCP syslog reception
+# for parameters see http://www.rsyslog.com/doc/imtcp.html
+#module(load="imtcp") # needs to be done just once
+#input(type="imtcp" port="514")
+
+
+#### GLOBAL DIRECTIVES ####
+
+# Use default timestamp format
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# File syncing capability is disabled by default. This feature is usually not required,
+# not useful and an extreme performance hit
+#$ActionFileEnableSync on
+
+# Include all config files in /etc/rsyslog.d/
+$IncludeConfig ${SYSCONFDIR}/rsyslog.d/*.conf
+
+
+#### RULES ####
+
+*.notice;auth,authpriv,cron,ftp,kern,lpr,mail,user.none /var/log/messages
+
+kern.debug;syslog,user.info /var/log/messages
+
+auth.info /var/log/authlog
+
+authpriv.debug /var/log/secure
+
+cron.info /var/cron/log
+
+daemon.info /var/log/daemon
+
+ftp.info /var/log/xferlog
+
+lpr.debug /var/log/lpd-errs
+
+mail.info /var/log/maillog
+
+# Uncomment this to have all messages of notice level and higher
+# as well as all authentication messages sent to root.
+#*.notice;auth.debug root
+
+# Everybody gets emergency messages
+*.emerg                                                 :omusrmsg:*
+
+#uucp,news.crit /var/log/uucp
+
+# Uncomment this line to send "important" messages to the system
+# console: be aware that this could create lots of output.
+#*.err;auth.notice;authpriv.none;kern.debug;mail.crit /dev/console
+
+# ### begin forwarding rule ###
+# The statement between the begin ... end define a SINGLE forwarding
+# rule. They belong together, do NOT split them. If you create multiple
+# forwarding rules, duplicate the whole block!
+# Remote Logging (we use TCP for reliable delivery)
+#
+# An on-disk queue is created for this action. If the remote host is
+# down, messages are spooled to disk and sent when it is up again.
+#$WorkDirectory /var/lib/rsyslog # where to place spool files
+#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
+#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
+#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
+#$ActionQueueType LinkedList   # run asynchronously
+#$ActionResumeRetryCount -1    # infinite retries if host is down
+# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
+#*.* @@remote-host:514
+# ### end of the forwarding rule ###
Index: rsyslog/patches/patch-doc_Makefile_in
===================================================================
RCS file: rsyslog/patches/patch-doc_Makefile_in
diff -N rsyslog/patches/patch-doc_Makefile_in
--- rsyslog/patches/patch-doc_Makefile_in 9 Jan 2015 21:04:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1 2015/01/09 21:04:02 bluhm Exp $
---- doc/Makefile.in.orig Thu Aug  5 11:39:55 2010
-+++ doc/Makefile.in Fri Dec 26 22:53:16 2014
-@@ -521,3 +521,9 @@ uninstall-am:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+install-data-am:
-+ mkdir "$(DESTDIR)$(htmldir)"
-+.for f in $(html_files) $(grfx_files)
-+ $(INSTALL_DATA) $f "$(DESTDIR)$(htmldir)"
-+.endfor
Index: rsyslog/patches/patch-grammar_lexer_l
===================================================================
RCS file: rsyslog/patches/patch-grammar_lexer_l
diff -N rsyslog/patches/patch-grammar_lexer_l
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ rsyslog/patches/patch-grammar_lexer_l 6 Mar 2016 12:34:54 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- grammar/lexer.l.orig Thu Mar  3 13:18:38 2016
++++ grammar/lexer.l Thu Mar  3 13:18:52 2016
+@@ -97,7 +97,7 @@ extern int yydebug;
+ /* somehow, I need these prototype even though the headers are
+  * included. I guess that's some autotools magic I don't understand...
+  */
+-#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ int fileno(FILE *stream);
+ #endif
+
Index: rsyslog/patches/patch-plugins_imudp_imudp_c
===================================================================
RCS file: rsyslog/patches/patch-plugins_imudp_imudp_c
diff -N rsyslog/patches/patch-plugins_imudp_imudp_c
--- rsyslog/patches/patch-plugins_imudp_imudp_c 10 Jan 2015 11:48:04 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-plugins_imudp_imudp_c,v 1.1 2015/01/10 11:48:04 bluhm Exp $
-
-Without debug printing, the missing '\0' is added later in MsgSetRawMsg().
-
---- plugins/imudp/imudp.c.orig Thu Aug  5 11:33:54 2010
-+++ plugins/imudp/imudp.c Fri Jan  9 22:31:59 2015
-@@ -241,6 +241,8 @@ processSocket(int fd, struct sockaddr_storage *fromine
- }
- }
-
-+ if(Debug)
-+ pRcvBuf[lenRcvBuf] = '\0';
- DBGPRINTF("recv(%d,%d)/%s,acl:%d,msg:%s\n", fd, (int) lenRcvBuf, fromHost, *pbIsPermitted, pRcvBuf);
-
- if(*pbIsPermitted)  {
Index: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
===================================================================
RCS file: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
diff -N rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ rsyslog/patches/patch-plugins_mmexternal_mmexternal_c 6 Mar 2016 12:34:54 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- plugins/mmexternal/mmexternal.c.orig Thu Mar  3 13:19:44 2016
++++ plugins/mmexternal/mmexternal.c Thu Mar  3 13:19:51 2016
+@@ -31,7 +31,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #include <sys/wait.h>
+ #else
+ #include <wait.h>
Index: rsyslog/patches/patch-runtime_nsd_gtls_c
===================================================================
RCS file: rsyslog/patches/patch-runtime_nsd_gtls_c
diff -N rsyslog/patches/patch-runtime_nsd_gtls_c
--- rsyslog/patches/patch-runtime_nsd_gtls_c 6 Mar 2016 12:18:31 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-$OpenBSD: patch-runtime_nsd_gtls_c,v 1.2 2016/03/06 12:18:31 ajacoutot Exp $
-
-GnuTLS >= 2.12 does not depend on libgcrypt initialization any longer
-and may in fact not use libgcrypt at all.
-
-Fix build with GnuTLS 3.4.
-
---- runtime/nsd_gtls.c.orig Sat Mar  5 19:44:38 2016
-+++ runtime/nsd_gtls.c Sat Mar  5 19:45:38 2016
-@@ -29,7 +29,9 @@
- #include <string.h>
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
-+#if GNUTLS_VERSION_NUMBER <= 0x020b00
- #include <gcrypt.h>
-+#endif
- #include <errno.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -53,7 +55,9 @@
- #define CRLFILE "crl.pem"
-
-
-+#if GNUTLS_VERSION_NUMBER <= 0x020b00
- GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+#endif
- MODULE_TYPE_LIB
-
- /* static data */
-@@ -225,13 +229,13 @@ static int
- gtlsClientCertCallback(gnutls_session session,
-               __attribute__((unused)) const gnutls_datum* req_ca_rdn, int __attribute__((unused)) nreqs,
-               __attribute__((unused)) const gnutls_pk_algorithm* sign_algos, int __attribute__((unused)) sign_algos_length,
--              gnutls_retr_st *st)
-+              gnutls_retr2_st *st)
- {
- nsd_gtls_t *pThis;
-
- pThis = (nsd_gtls_t*) gnutls_session_get_ptr(session);
-
-- st->type = GNUTLS_CRT_X509;
-+ st->cert_type = GNUTLS_CRT_X509;
- st->ncerts = 1;
- st->cert.x509 = &pThis->ourCert;
- st->key.x509 = pThis->ourKey;
-@@ -559,8 +563,10 @@ gtlsGlblInit(void)
- uchar *cafile;
- DEFiRet;
-
-+#if GNUTLS_VERSION_NUMBER <= 0x020b00
- /* gcry_control must be called first, so that the thread system is correctly set up */
- gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-+#endif
- CHKgnutls(gnutls_global_init());
-
- /* X509 stuff */
-@@ -1610,7 +1616,7 @@ Connect(nsd_t *pNsd, int family, uchar *port, uchar *h
- gnutls_session_set_ptr(pThis->sess, (void*)pThis);
- iRet = gtlsLoadOurCertKey(pThis); /* first load .pem files */
- if(iRet == RS_RET_OK) {
-- gnutls_certificate_client_set_retrieve_function(xcred, gtlsClientCertCallback);
-+ gnutls_certificate_set_retrieve_function(xcred, gtlsClientCertCallback);
- } else if(iRet != RS_RET_CERTLESS) {
- FINALIZE; /* we have an error case! */
- }
Index: rsyslog/patches/patch-runtime_stringbuf_c
===================================================================
RCS file: rsyslog/patches/patch-runtime_stringbuf_c
diff -N rsyslog/patches/patch-runtime_stringbuf_c
--- rsyslog/patches/patch-runtime_stringbuf_c 25 Jan 2012 11:03:14 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-runtime_stringbuf_c,v 1.1 2012/01/25 11:03:14 ajacoutot Exp $
-
-CVE-2011-4623: http://secunia.com/advisories/47698/
-
---- runtime/stringbuf.c.orig Wed Jan 25 10:23:06 2012
-+++ runtime/stringbuf.c Wed Jan 25 10:23:24 2012
-@@ -156,7 +156,7 @@ rsRetVal
- rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded)
- {
- uchar *pNewBuf;
-- unsigned short iNewSize;
-+ size_t iNewSize;
- DEFiRet;
-
- /* first compute the new size needed */
Index: rsyslog/patches/patch-tools_Makefile_in
===================================================================
RCS file: rsyslog/patches/patch-tools_Makefile_in
diff -N rsyslog/patches/patch-tools_Makefile_in
--- rsyslog/patches/patch-tools_Makefile_in 14 Sep 2011 21:25:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.1 2011/09/14 21:25:39 naddy Exp $
---- tools/Makefile.in.orig Tue Sep 13 23:09:17 2011
-+++ tools/Makefile.in Tue Sep 13 23:11:24 2011
-@@ -141,7 +141,8 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CYGPATH_W = @CYGPATH_W@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" \
-+ -DCONFIGFILE=\"$(sysconfdir)/rsyslog.conf\"
- DEPDIR = @DEPDIR@
- DL_LIBS = @DL_LIBS@
- DSYMUTIL = @DSYMUTIL@
Index: rsyslog/patches/patch-tools_rsyslogd_c
===================================================================
RCS file: rsyslog/patches/patch-tools_rsyslogd_c
diff -N rsyslog/patches/patch-tools_rsyslogd_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ rsyslog/patches/patch-tools_rsyslogd_c 6 Mar 2016 12:34:54 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- tools/rsyslogd.c.orig Thu Mar  3 13:20:29 2016
++++ tools/rsyslogd.c Thu Mar  3 13:21:39 2016
+@@ -29,7 +29,7 @@
+ #ifdef HAVE_LIBLOGGING_STDLOG
+ #  include <liblogging/stdlog.h>
+ #endif
+-#ifdef OS_SOLARIS
++#if defined(OS_SOLARIS) || defined(__OpenBSD__)
+ # include <errno.h>
+ #else
+ # include <sys/errno.h>
Index: rsyslog/patches/patch-tools_syslogd_c
===================================================================
RCS file: rsyslog/patches/patch-tools_syslogd_c
diff -N rsyslog/patches/patch-tools_syslogd_c
--- rsyslog/patches/patch-tools_syslogd_c 5 Sep 2011 18:24:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-tools_syslogd_c,v 1.2 2011/09/05 18:24:08 jasper Exp $
-
-Last chunk:
-Security fix for CVE-2011-3200,
-rsyslog: parseLegacySyslogMsg off-by-two buffer overflow
-
-Patch from upstream via redhat: https://bugzilla.redhat.com/show_bug.cgi?id=727644
-
---- tools/syslogd.c.orig Thu Aug  5 11:33:54 2010
-+++ tools/syslogd.c Mon Sep  5 20:22:07 2011
-@@ -173,9 +173,8 @@ static rsRetVal GlobalClassExit(void);
- #endif
- #endif
-
--#ifndef _PATH_LOGCONF
--#define _PATH_LOGCONF "/etc/rsyslog.conf"
--#endif
-+#undef _PATH_LOGCONF
-+#define _PATH_LOGCONF CONFIGFILE
-
- #ifndef _PATH_MODDIR
- #       if defined(__FreeBSD__)
-@@ -1291,7 +1290,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
- * outputs so that only 32 characters max are used by default.
- */
- i = 0;
-- while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i < CONF_TAG_MAXSIZE) {
-+ while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i < CONF_TAG_MAXSIZE - 2) {
- bufParseTAG[i++] = *p2parse++;
- --lenMsg;
- }
Index: rsyslog/pkg/DESCR-docs
===================================================================
RCS file: rsyslog/pkg/DESCR-docs
diff -N rsyslog/pkg/DESCR-docs
--- rsyslog/pkg/DESCR-docs 9 Jan 2015 21:04:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Additional rsyslog documentation in HTML format.
Index: rsyslog/pkg/PLIST-docs
===================================================================
RCS file: rsyslog/pkg/PLIST-docs
diff -N rsyslog/pkg/PLIST-docs
--- rsyslog/pkg/PLIST-docs 9 Jan 2015 21:04:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,129 +0,0 @@
-@comment $OpenBSD: PLIST-docs,v 1.1 2015/01/09 21:04:02 bluhm Exp $
-share/doc/rsyslog/
-share/doc/rsyslog/bugs.html
-share/doc/rsyslog/build_from_repo.html
-share/doc/rsyslog/classes.dia
-share/doc/rsyslog/contributors.html
-share/doc/rsyslog/dataflow.png
-share/doc/rsyslog/debug.html
-share/doc/rsyslog/dev_queue.html
-share/doc/rsyslog/direct_queue0.png
-share/doc/rsyslog/direct_queue1.png
-share/doc/rsyslog/direct_queue2.png
-share/doc/rsyslog/direct_queue3.png
-share/doc/rsyslog/direct_queue_directq.png
-share/doc/rsyslog/direct_queue_rsyslog.png
-share/doc/rsyslog/direct_queue_rsyslog2.png
-share/doc/rsyslog/droppriv.html
-share/doc/rsyslog/expression.html
-share/doc/rsyslog/features.html
-share/doc/rsyslog/generic_design.html
-share/doc/rsyslog/gssapi.html
-share/doc/rsyslog/gssapi.png
-share/doc/rsyslog/history.html
-share/doc/rsyslog/how2help.html
-share/doc/rsyslog/im3195.html
-share/doc/rsyslog/imfile.html
-share/doc/rsyslog/imgssapi.html
-share/doc/rsyslog/imklog.html
-share/doc/rsyslog/imrelp.html
-share/doc/rsyslog/imtcp.html
-share/doc/rsyslog/imuxsock.html
-share/doc/rsyslog/index.html
-share/doc/rsyslog/install.html
-share/doc/rsyslog/ipv6.html
-share/doc/rsyslog/licensing.html
-share/doc/rsyslog/log_rotation_fix_size.html
-share/doc/rsyslog/manual.html
-share/doc/rsyslog/modules.html
-share/doc/rsyslog/multi_ruleset.html
-share/doc/rsyslog/netstream.html
-share/doc/rsyslog/ns_gtls.html
-share/doc/rsyslog/ns_ptcp.html
-share/doc/rsyslog/omlibdbi.html
-share/doc/rsyslog/ommail.html
-share/doc/rsyslog/ommysql.html
-share/doc/rsyslog/omoracle.html
-share/doc/rsyslog/omrelp.html
-share/doc/rsyslog/omsnmp.html
-share/doc/rsyslog/property_replacer.html
-share/doc/rsyslog/queueWorkerLogic.dia
-share/doc/rsyslog/queueWorkerLogic.jpg
-share/doc/rsyslog/queueWorkerLogic_small.jpg
-share/doc/rsyslog/queue_analogy_tv.png
-share/doc/rsyslog/queues.html
-share/doc/rsyslog/queues_analogy.html
-share/doc/rsyslog/rainerscript.html
-share/doc/rsyslog/rsconf1_actionexeconlywhenpreviousissuspended.html
-share/doc/rsyslog/rsconf1_actionresumeinterval.html
-share/doc/rsyslog/rsconf1_allowedsender.html
-share/doc/rsyslog/rsconf1_controlcharacterescapeprefix.html
-share/doc/rsyslog/rsconf1_debugprintcfsyslinehandlerlist.html
-share/doc/rsyslog/rsconf1_debugprintmodulelist.html
-share/doc/rsyslog/rsconf1_debugprinttemplatelist.html
-share/doc/rsyslog/rsconf1_dircreatemode.html
-share/doc/rsyslog/rsconf1_dirgroup.html
-share/doc/rsyslog/rsconf1_dirowner.html
-share/doc/rsyslog/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
-share/doc/rsyslog/rsconf1_droptrailinglfonreception.html
-share/doc/rsyslog/rsconf1_dynafilecachesize.html
-share/doc/rsyslog/rsconf1_escapecontrolcharactersonreceive.html
-share/doc/rsyslog/rsconf1_failonchownfailure.html
-share/doc/rsyslog/rsconf1_filecreatemode.html
-share/doc/rsyslog/rsconf1_filegroup.html
-share/doc/rsyslog/rsconf1_fileowner.html
-share/doc/rsyslog/rsconf1_generateconfiggraph.html
-share/doc/rsyslog/rsconf1_gssforwardservicename.html
-share/doc/rsyslog/rsconf1_gsslistenservicename.html
-share/doc/rsyslog/rsconf1_gssmode.html
-share/doc/rsyslog/rsconf1_includeconfig.html
-share/doc/rsyslog/rsconf1_mainmsgqueuesize.html
-share/doc/rsyslog/rsconf1_markmessageperiod.html
-share/doc/rsyslog/rsconf1_moddir.html
-share/doc/rsyslog/rsconf1_modload.html
-share/doc/rsyslog/rsconf1_repeatedmsgreduction.html
-share/doc/rsyslog/rsconf1_resetconfigvariables.html
-share/doc/rsyslog/rsconf1_umask.html
-share/doc/rsyslog/rscript_abnf.html
-share/doc/rsyslog/rsyslog-example.conf
-share/doc/rsyslog/rsyslog-vers.png
-share/doc/rsyslog/rsyslog_conf.html
-share/doc/rsyslog/rsyslog_conf_actions.html
-share/doc/rsyslog/rsyslog_conf_examples.html
-share/doc/rsyslog/rsyslog_conf_filter.html
-share/doc/rsyslog/rsyslog_conf_global.html
-share/doc/rsyslog/rsyslog_conf_modules.html
-share/doc/rsyslog/rsyslog_conf_nomatch.html
-share/doc/rsyslog/rsyslog_conf_output.html
-share/doc/rsyslog/rsyslog_conf_templates.html
-share/doc/rsyslog/rsyslog_confgraph_complex.png
-share/doc/rsyslog/rsyslog_confgraph_std.png
-share/doc/rsyslog/rsyslog_high_database_rate.html
-share/doc/rsyslog/rsyslog_mysql.html
-share/doc/rsyslog/rsyslog_ng_comparison.html
-share/doc/rsyslog/rsyslog_packages.html
-share/doc/rsyslog/rsyslog_pgsql.html
-share/doc/rsyslog/rsyslog_php_syslog_ng.html
-share/doc/rsyslog/rsyslog_recording_pri.html
-share/doc/rsyslog/rsyslog_reliable_forwarding.html
-share/doc/rsyslog/rsyslog_secure_tls.html
-share/doc/rsyslog/rsyslog_stunnel.html
-share/doc/rsyslog/rsyslog_tls.html
-share/doc/rsyslog/syslog_parsing.html
-share/doc/rsyslog/syslog_protocol.html
-share/doc/rsyslog/tls_cert.dia
-share/doc/rsyslog/tls_cert.jpg
-share/doc/rsyslog/tls_cert_100.jpg
-share/doc/rsyslog/tls_cert_ca.html
-share/doc/rsyslog/tls_cert_ca.jpg
-share/doc/rsyslog/tls_cert_client.html
-share/doc/rsyslog/tls_cert_errmsgs.html
-share/doc/rsyslog/tls_cert_machine.html
-share/doc/rsyslog/tls_cert_scenario.html
-share/doc/rsyslog/tls_cert_server.html
-share/doc/rsyslog/tls_cert_summary.html
-share/doc/rsyslog/tls_cert_udp_relay.html
-share/doc/rsyslog/troubleshoot.html
-share/doc/rsyslog/v3compatibility.html
-share/doc/rsyslog/v4compatibility.html
-share/doc/rsyslog/version_naming.html
Index: rsyslog/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- rsyslog/pkg/PLIST-main 29 Jul 2010 21:40:21 -0000 1.1.1.1
+++ rsyslog/pkg/PLIST-main 6 Mar 2016 12:34:54 -0000
@@ -1,40 +1,24 @@
 @comment $OpenBSD: PLIST-main,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
 lib/rsyslog/
-@comment lib/rsyslog/imklog.la
 lib/rsyslog/imklog.so
-@comment lib/rsyslog/immark.la
 lib/rsyslog/immark.so
-@comment lib/rsyslog/imrelp.la
 lib/rsyslog/imrelp.so
-@comment lib/rsyslog/imtcp.la
 lib/rsyslog/imtcp.so
-@comment lib/rsyslog/imudp.la
 lib/rsyslog/imudp.so
-@comment lib/rsyslog/imuxsock.la
 lib/rsyslog/imuxsock.so
-@comment lib/rsyslog/lmnet.la
+lib/rsyslog/lmcry_gcry.so
 lib/rsyslog/lmnet.so
-@comment lib/rsyslog/lmnetstrms.la
 lib/rsyslog/lmnetstrms.so
-@comment lib/rsyslog/lmnsd_gtls.la
 lib/rsyslog/lmnsd_gtls.so
-@comment lib/rsyslog/lmnsd_ptcp.la
 lib/rsyslog/lmnsd_ptcp.so
-@comment lib/rsyslog/lmregexp.la
 lib/rsyslog/lmregexp.so
-@comment lib/rsyslog/lmstrmsrv.la
 lib/rsyslog/lmstrmsrv.so
-@comment lib/rsyslog/lmtcpclt.la
 lib/rsyslog/lmtcpclt.so
-@comment lib/rsyslog/lmtcpsrv.la
 lib/rsyslog/lmtcpsrv.so
-@comment lib/rsyslog/lmzlibw.la
 lib/rsyslog/lmzlibw.so
-@comment lib/rsyslog/ommail.la
+lib/rsyslog/mmexternal.so
 lib/rsyslog/ommail.so
-@comment lib/rsyslog/omrelp.la
 lib/rsyslog/omrelp.so
-@comment lib/rsyslog/omtesting.la
 lib/rsyslog/omtesting.so
 @man man/man5/rsyslog.conf.5
 @man man/man8/rsyslogd.8
Index: rsyslog/pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-mysql,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-mysql
--- rsyslog/pkg/PLIST-mysql 29 Jul 2010 21:40:21 -0000 1.1.1.1
+++ rsyslog/pkg/PLIST-mysql 6 Mar 2016 12:34:54 -0000
@@ -1,4 +1,3 @@
 @comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
-@comment lib/rsyslog/ommysql.la
 lib/rsyslog/ommysql.so
 share/examples/rsyslog/createDB_mysql.sql
Index: rsyslog/pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-pgsql,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-pgsql
--- rsyslog/pkg/PLIST-pgsql 29 Jul 2010 21:40:21 -0000 1.1.1.1
+++ rsyslog/pkg/PLIST-pgsql 6 Mar 2016 12:34:54 -0000
@@ -1,4 +1,3 @@
 @comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
-@comment lib/rsyslog/ompgsql.la
 lib/rsyslog/ompgsql.so
 share/examples/rsyslog/createDB_pgsql.sql

Reply | Threaded
Open this post in threaded view
|

Re: rsyslog [Re: CVS: cvs.openbsd.org: ports]

Antoine Jacoutot-7
On Sun, Mar 06, 2016 at 12:35:45PM +0000, Stuart Henderson wrote:

> On 2016/03/06 05:18, Antoine Jacoutot wrote:
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: [hidden email] 2016/03/06 05:18:31
> >
> > Modified files:
> > sysutils/rsyslog: Makefile
> > sysutils/rsyslog/patches: patch-runtime_nsd_gtls_c
> >
> > Log message:
> > Fix build with GnuTLS >= 3.4
> > On a side note, this port could use an update...
> >
>
> chris@ asked about this the other day too. here's a possible diff,
> it builds but I haven't tried running it yet.

Ah cool. It'd be nice if people using it could give it a spin.

librelp needs the gettext MODULE.

> also since I don't use this I have no idea if we actually want
> liblogging-stdlog or if it's ok to disable for now.

No clue either.

> sample config is from chris.
>
> I guess we are now going to see missing WANTLIB on idn all
> across the tree ;)

Oh yeah baby :-)

> Index: librelp/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/librelp/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- librelp/Makefile 16 Mar 2015 18:07:55 -0000 1.5
> +++ librelp/Makefile 6 Mar 2016 12:34:54 -0000
> @@ -1,20 +1,28 @@
> -# $OpenBSD: Makefile,v 1.5 2015/03/16 18:07:55 naddy Exp $
> +# $OpenBSD: Makefile.template,v 1.73 2016/01/11 09:17:22 sthen Exp $
>  
>  COMMENT = reliable event logging protocol library
>  
> -DISTNAME = librelp-1.0.1
> +DISTNAME = librelp-1.2.9
> +
> +SHARED_LIBS +=  relp                      1.0 # 1.0
> +
>  CATEGORIES = sysutils
> -MASTER_SITES = http://download.rsyslog.com/librelp/
> +
>  HOMEPAGE = http://www.librelp.com/
> -REVISION = 0
>  
>  MAINTAINER = Todd T. Fries <[hidden email]>
>  
> -SHARED_LIBS +=  relp                      0.1 # 0.1
> -
> -# GPLv3
> +# GPLv3+
>  PERMIT_PACKAGE_CDROM = Yes
>  
> +WANTLIB += ffi gmp gnutls hogweed iconv intl nettle p11-kit pthread
> +WANTLIB += tasn1 z
> +
> +MASTER_SITES = http://download.rsyslog.com/librelp/
> +
> +SEPARATE_BUILD = Yes
>  CONFIGURE_STYLE = gnu
> +
> +LIB_DEPENDS = security/gnutls
>  
>  .include <bsd.port.mk>
> Index: librelp/distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/librelp/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- librelp/distinfo 8 Jan 2013 17:36:39 -0000 1.2
> +++ librelp/distinfo 6 Mar 2016 12:34:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (librelp-1.0.1.tar.gz) = drAQqpFJl2gC2qLl/aesAqiiJ7DIwNEGnuwtKmYpc5o=
> -SIZE (librelp-1.0.1.tar.gz) = 355401
> +SHA256 (librelp-1.2.9.tar.gz) = Ug3nuj3GiNxyxbAU3GHvGR6VKPd9FlHdylX8DBSdmKM=
> +SIZE (librelp-1.2.9.tar.gz) = 415909
> Index: rsyslog/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- rsyslog/Makefile 6 Mar 2016 12:18:31 -0000 1.26
> +++ rsyslog/Makefile 6 Mar 2016 12:34:54 -0000
> @@ -6,39 +6,40 @@ BROKEN-hppa = lack of atomic ops
>  SHARED_ONLY = Yes
>  
>  COMMENT-main = syslog daemon supporting databases, TCP, SSL, RELP
> -COMMENT-docs = additional html documentation for rsyslog
> -COMMENT-mysql = mysql plugin for rsyslog
> -COMMENT-pgsql = postgresql plugin for rsyslog
> +COMMENT-mysql = MySQL plugin for rsyslog
> +COMMENT-pgsql = Postgres plugin for rsyslog
>  
> -MULTI_PACKAGES = -main -docs -mysql -pgsql
> +MULTI_PACKAGES = -main -mysql -pgsql
>  
> -V = 4.6.4
> +V = 8.16.0
>  DISTNAME = rsyslog-$V
>  PKGNAME-main = rsyslog-$V
> -PKGNAME-docs = rsyslog-docs-$V
>  PKGNAME-mysql = rsyslog-mysql-$V
>  PKGNAME-pgsql = rsyslog-pgsql-$V
>  CATEGORIES = sysutils
>  
> -REVISION-main = 8
> -REVISION-docs = 0
> -REVISION-mysql = 6
> -REVISION-pgsql = 3
> -
>  HOMEPAGE = http://www.rsyslog.com/
>  
>  # GPLv3+
>  PERMIT_PACKAGE_CDROM = Yes
>  
> -MODULES = devel/gettext
> +WANTLIB-main += ${MODGETTEXT_WANTLIB}
> +WANTLIB-main += c estr ffi gcrypt gmp gnutls gpg-error hogweed idn
> +WANTLIB-main += json-c nettle p11-kit pthread relp tasn1 uuid z
> +
> +WANTLIB-mysql += crypto m mysqlclient pthread ssl stdc++ z
>  
> -WANTLIB-main += c gmp hogweed nettle ffi gnutls pthread p11-kit
> -WANTLIB-main += relp tasn1 z ${MODGETTEXT_WANTLIB}
> -WANTLIB-mysql += crypto m mysqlclient ssl z pthread stdc++
>  WANTLIB-pgsql += crypto pq ssl
>  
> -LIB_DEPENDS-main = security/gnutls \
> - sysutils/librelp
> +MODULES = devel/gettext
> +
> +LIB_DEPENDS-main = devel/json-c \
> + devel/libestr>=0.1.2 \
> + security/libgcrypt \
> + security/gnutls \
> + sysutils/librelp>=1.2.9
> +# XXX should port to using libc UUID functions
> +LIB_DEPENDS-main += sysutils/e2fsprogs
>  LIB_DEPENDS-mysql = databases/mariadb
>  RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main
>  LIB_DEPENDS-pgsql = databases/postgresql
> @@ -47,21 +48,22 @@ RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PK
>  MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \
>   http://download.rsyslog.com/rsyslog/
>  
> -CONFIGURE_STYLE = autoconf
> -AUTOCONF_VERSION = 2.65
> +CONFIGURE_STYLE = gnu
>  LIBTOOL_FLAGS = --tag=disable-static
>  CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
>   --enable-pgsql \
>   --enable-mysql \
>   --enable-mail \
>   --enable-gnutls \
> - --enable-relp
> + --enable-relp \
> + --disable-liblogging-stdlog
>  CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include"
>  
>  post-install:
> + rm ${PREFIX}/lib/rsyslog/*.la
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rsyslog
> - ${INSTALL_DATA} ${WRKSRC}/rsyslog.conf \
> -    ${PREFIX}/share/examples/rsyslog
> + ${SUBST_DATA} ${FILESDIR}/rsyslog.conf \
> +    ${PREFIX}/share/examples/rsyslog/rsyslog.conf
>   ${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql \
>      ${PREFIX}/share/examples/rsyslog/createDB_mysql.sql
>   ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \
> Index: rsyslog/distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- rsyslog/distinfo 18 Jan 2015 03:15:14 -0000 1.3
> +++ rsyslog/distinfo 6 Mar 2016 12:34:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (rsyslog-4.6.4.tar.gz) = nXEtLKHutWkrlHvDN5dzqLHtGeddgwflhwuEaoOwac8=
> -SIZE (rsyslog-4.6.4.tar.gz) = 2080038
> +SHA256 (rsyslog-8.16.0.tar.gz) = T+T5fBCJkIbZi5QB1+jSvP9hx8P3zehieJHjb8bsG3Y=
> +SIZE (rsyslog-8.16.0.tar.gz) = 2132012
> Index: rsyslog/files/rsyslog.conf
> ===================================================================
> RCS file: rsyslog/files/rsyslog.conf
> diff -N rsyslog/files/rsyslog.conf
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/files/rsyslog.conf 6 Mar 2016 12:34:54 -0000
> @@ -0,0 +1,92 @@
> +# $OpenBSD$
> +
> +# rsyslog configuration file
> +# note that most of this config file uses old-style format,
> +# because it is well-known AND quite suitable for simple cases
> +# like we have with the default config. For more advanced
> +# things, RainerScript configuration is suggested.
> +#
> +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
> +# or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html 
> +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
> +
> +#### MODULES ####
> +
> +module(load="imuxsock") # provides support for local system logging (e.g. via logger command)
> +module(load="imklog")   # provides kernel logging support (previously done by rklogd)
> +#module(load"immark")  # provides --MARK-- message capability
> +
> +# Provides UDP syslog reception
> +# for parameters see http://www.rsyslog.com/doc/imudp.html
> +#module(load="imudp") # needs to be done just once
> +#input(type="imudp" port="514")
> +
> +# Provides TCP syslog reception
> +# for parameters see http://www.rsyslog.com/doc/imtcp.html
> +#module(load="imtcp") # needs to be done just once
> +#input(type="imtcp" port="514")
> +
> +
> +#### GLOBAL DIRECTIVES ####
> +
> +# Use default timestamp format
> +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
> +
> +# File syncing capability is disabled by default. This feature is usually not required,
> +# not useful and an extreme performance hit
> +#$ActionFileEnableSync on
> +
> +# Include all config files in /etc/rsyslog.d/
> +$IncludeConfig ${SYSCONFDIR}/rsyslog.d/*.conf
> +
> +
> +#### RULES ####
> +
> +*.notice;auth,authpriv,cron,ftp,kern,lpr,mail,user.none /var/log/messages
> +
> +kern.debug;syslog,user.info /var/log/messages
> +
> +auth.info /var/log/authlog
> +
> +authpriv.debug /var/log/secure
> +
> +cron.info /var/cron/log
> +
> +daemon.info /var/log/daemon
> +
> +ftp.info /var/log/xferlog
> +
> +lpr.debug /var/log/lpd-errs
> +
> +mail.info /var/log/maillog
> +
> +# Uncomment this to have all messages of notice level and higher
> +# as well as all authentication messages sent to root.
> +#*.notice;auth.debug root
> +
> +# Everybody gets emergency messages
> +*.emerg                                                 :omusrmsg:*
> +
> +#uucp,news.crit /var/log/uucp
> +
> +# Uncomment this line to send "important" messages to the system
> +# console: be aware that this could create lots of output.
> +#*.err;auth.notice;authpriv.none;kern.debug;mail.crit /dev/console
> +
> +# ### begin forwarding rule ###
> +# The statement between the begin ... end define a SINGLE forwarding
> +# rule. They belong together, do NOT split them. If you create multiple
> +# forwarding rules, duplicate the whole block!
> +# Remote Logging (we use TCP for reliable delivery)
> +#
> +# An on-disk queue is created for this action. If the remote host is
> +# down, messages are spooled to disk and sent when it is up again.
> +#$WorkDirectory /var/lib/rsyslog # where to place spool files
> +#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
> +#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
> +#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
> +#$ActionQueueType LinkedList   # run asynchronously
> +#$ActionResumeRetryCount -1    # infinite retries if host is down
> +# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
> +#*.* @@remote-host:514
> +# ### end of the forwarding rule ###
> Index: rsyslog/patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: rsyslog/patches/patch-doc_Makefile_in
> diff -N rsyslog/patches/patch-doc_Makefile_in
> --- rsyslog/patches/patch-doc_Makefile_in 9 Jan 2015 21:04:02 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-doc_Makefile_in,v 1.1 2015/01/09 21:04:02 bluhm Exp $
> ---- doc/Makefile.in.orig Thu Aug  5 11:39:55 2010
> -+++ doc/Makefile.in Fri Dec 26 22:53:16 2014
> -@@ -521,3 +521,9 @@ uninstall-am:
> - # Tell versions [3.59,3.63) of GNU make to not export all variables.
> - # Otherwise a system limit (for SysV at least) may be exceeded.
> - .NOEXPORT:
> -+
> -+install-data-am:
> -+ mkdir "$(DESTDIR)$(htmldir)"
> -+.for f in $(html_files) $(grfx_files)
> -+ $(INSTALL_DATA) $f "$(DESTDIR)$(htmldir)"
> -+.endfor
> Index: rsyslog/patches/patch-grammar_lexer_l
> ===================================================================
> RCS file: rsyslog/patches/patch-grammar_lexer_l
> diff -N rsyslog/patches/patch-grammar_lexer_l
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/patches/patch-grammar_lexer_l 6 Mar 2016 12:34:54 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- grammar/lexer.l.orig Thu Mar  3 13:18:38 2016
> ++++ grammar/lexer.l Thu Mar  3 13:18:52 2016
> +@@ -97,7 +97,7 @@ extern int yydebug;
> + /* somehow, I need these prototype even though the headers are
> +  * included. I guess that's some autotools magic I don't understand...
> +  */
> +-#if !defined(__FreeBSD__)
> ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
> + int fileno(FILE *stream);
> + #endif
> +
> Index: rsyslog/patches/patch-plugins_imudp_imudp_c
> ===================================================================
> RCS file: rsyslog/patches/patch-plugins_imudp_imudp_c
> diff -N rsyslog/patches/patch-plugins_imudp_imudp_c
> --- rsyslog/patches/patch-plugins_imudp_imudp_c 10 Jan 2015 11:48:04 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-plugins_imudp_imudp_c,v 1.1 2015/01/10 11:48:04 bluhm Exp $
> -
> -Without debug printing, the missing '\0' is added later in MsgSetRawMsg().
> -
> ---- plugins/imudp/imudp.c.orig Thu Aug  5 11:33:54 2010
> -+++ plugins/imudp/imudp.c Fri Jan  9 22:31:59 2015
> -@@ -241,6 +241,8 @@ processSocket(int fd, struct sockaddr_storage *fromine
> - }
> - }
> -
> -+ if(Debug)
> -+ pRcvBuf[lenRcvBuf] = '\0';
> - DBGPRINTF("recv(%d,%d)/%s,acl:%d,msg:%s\n", fd, (int) lenRcvBuf, fromHost, *pbIsPermitted, pRcvBuf);
> -
> - if(*pbIsPermitted)  {
> Index: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
> ===================================================================
> RCS file: rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
> diff -N rsyslog/patches/patch-plugins_mmexternal_mmexternal_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/patches/patch-plugins_mmexternal_mmexternal_c 6 Mar 2016 12:34:54 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- plugins/mmexternal/mmexternal.c.orig Thu Mar  3 13:19:44 2016
> ++++ plugins/mmexternal/mmexternal.c Thu Mar  3 13:19:51 2016
> +@@ -31,7 +31,7 @@
> + #include <errno.h>
> + #include <unistd.h>
> + #include <fcntl.h>
> +-#if defined(__FreeBSD__)
> ++#if defined(__FreeBSD__) || defined(__OpenBSD__)
> + #include <sys/wait.h>
> + #else
> + #include <wait.h>
> Index: rsyslog/patches/patch-runtime_nsd_gtls_c
> ===================================================================
> RCS file: rsyslog/patches/patch-runtime_nsd_gtls_c
> diff -N rsyslog/patches/patch-runtime_nsd_gtls_c
> --- rsyslog/patches/patch-runtime_nsd_gtls_c 6 Mar 2016 12:18:31 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,65 +0,0 @@
> -$OpenBSD: patch-runtime_nsd_gtls_c,v 1.2 2016/03/06 12:18:31 ajacoutot Exp $
> -
> -GnuTLS >= 2.12 does not depend on libgcrypt initialization any longer
> -and may in fact not use libgcrypt at all.
> -
> -Fix build with GnuTLS 3.4.
> -
> ---- runtime/nsd_gtls.c.orig Sat Mar  5 19:44:38 2016
> -+++ runtime/nsd_gtls.c Sat Mar  5 19:45:38 2016
> -@@ -29,7 +29,9 @@
> - #include <string.h>
> - #include <gnutls/gnutls.h>
> - #include <gnutls/x509.h>
> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
> - #include <gcrypt.h>
> -+#endif
> - #include <errno.h>
> - #include <sys/stat.h>
> - #include <unistd.h>
> -@@ -53,7 +55,9 @@
> - #define CRLFILE "crl.pem"
> -
> -
> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
> - GCRY_THREAD_OPTION_PTHREAD_IMPL;
> -+#endif
> - MODULE_TYPE_LIB
> -
> - /* static data */
> -@@ -225,13 +229,13 @@ static int
> - gtlsClientCertCallback(gnutls_session session,
> -               __attribute__((unused)) const gnutls_datum* req_ca_rdn, int __attribute__((unused)) nreqs,
> -               __attribute__((unused)) const gnutls_pk_algorithm* sign_algos, int __attribute__((unused)) sign_algos_length,
> --              gnutls_retr_st *st)
> -+              gnutls_retr2_st *st)
> - {
> - nsd_gtls_t *pThis;
> -
> - pThis = (nsd_gtls_t*) gnutls_session_get_ptr(session);
> -
> -- st->type = GNUTLS_CRT_X509;
> -+ st->cert_type = GNUTLS_CRT_X509;
> - st->ncerts = 1;
> - st->cert.x509 = &pThis->ourCert;
> - st->key.x509 = pThis->ourKey;
> -@@ -559,8 +563,10 @@ gtlsGlblInit(void)
> - uchar *cafile;
> - DEFiRet;
> -
> -+#if GNUTLS_VERSION_NUMBER <= 0x020b00
> - /* gcry_control must be called first, so that the thread system is correctly set up */
> - gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
> -+#endif
> - CHKgnutls(gnutls_global_init());
> -
> - /* X509 stuff */
> -@@ -1610,7 +1616,7 @@ Connect(nsd_t *pNsd, int family, uchar *port, uchar *h
> - gnutls_session_set_ptr(pThis->sess, (void*)pThis);
> - iRet = gtlsLoadOurCertKey(pThis); /* first load .pem files */
> - if(iRet == RS_RET_OK) {
> -- gnutls_certificate_client_set_retrieve_function(xcred, gtlsClientCertCallback);
> -+ gnutls_certificate_set_retrieve_function(xcred, gtlsClientCertCallback);
> - } else if(iRet != RS_RET_CERTLESS) {
> - FINALIZE; /* we have an error case! */
> - }
> Index: rsyslog/patches/patch-runtime_stringbuf_c
> ===================================================================
> RCS file: rsyslog/patches/patch-runtime_stringbuf_c
> diff -N rsyslog/patches/patch-runtime_stringbuf_c
> --- rsyslog/patches/patch-runtime_stringbuf_c 25 Jan 2012 11:03:14 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-runtime_stringbuf_c,v 1.1 2012/01/25 11:03:14 ajacoutot Exp $
> -
> -CVE-2011-4623: http://secunia.com/advisories/47698/
> -
> ---- runtime/stringbuf.c.orig Wed Jan 25 10:23:06 2012
> -+++ runtime/stringbuf.c Wed Jan 25 10:23:24 2012
> -@@ -156,7 +156,7 @@ rsRetVal
> - rsCStrExtendBuf(cstr_t *pThis, size_t iMinNeeded)
> - {
> - uchar *pNewBuf;
> -- unsigned short iNewSize;
> -+ size_t iNewSize;
> - DEFiRet;
> -
> - /* first compute the new size needed */
> Index: rsyslog/patches/patch-tools_Makefile_in
> ===================================================================
> RCS file: rsyslog/patches/patch-tools_Makefile_in
> diff -N rsyslog/patches/patch-tools_Makefile_in
> --- rsyslog/patches/patch-tools_Makefile_in 14 Sep 2011 21:25:39 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-tools_Makefile_in,v 1.1 2011/09/14 21:25:39 naddy Exp $
> ---- tools/Makefile.in.orig Tue Sep 13 23:09:17 2011
> -+++ tools/Makefile.in Tue Sep 13 23:11:24 2011
> -@@ -141,7 +141,8 @@ CPP = @CPP@
> - CPPFLAGS = @CPPFLAGS@
> - CXX = @CXX@
> - CYGPATH_W = @CYGPATH_W@
> --DEFS = @DEFS@
> -+DEFS = @DEFS@ -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" \
> -+ -DCONFIGFILE=\"$(sysconfdir)/rsyslog.conf\"
> - DEPDIR = @DEPDIR@
> - DL_LIBS = @DL_LIBS@
> - DSYMUTIL = @DSYMUTIL@
> Index: rsyslog/patches/patch-tools_rsyslogd_c
> ===================================================================
> RCS file: rsyslog/patches/patch-tools_rsyslogd_c
> diff -N rsyslog/patches/patch-tools_rsyslogd_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ rsyslog/patches/patch-tools_rsyslogd_c 6 Mar 2016 12:34:54 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- tools/rsyslogd.c.orig Thu Mar  3 13:20:29 2016
> ++++ tools/rsyslogd.c Thu Mar  3 13:21:39 2016
> +@@ -29,7 +29,7 @@
> + #ifdef HAVE_LIBLOGGING_STDLOG
> + #  include <liblogging/stdlog.h>
> + #endif
> +-#ifdef OS_SOLARIS
> ++#if defined(OS_SOLARIS) || defined(__OpenBSD__)
> + # include <errno.h>
> + #else
> + # include <sys/errno.h>
> Index: rsyslog/patches/patch-tools_syslogd_c
> ===================================================================
> RCS file: rsyslog/patches/patch-tools_syslogd_c
> diff -N rsyslog/patches/patch-tools_syslogd_c
> --- rsyslog/patches/patch-tools_syslogd_c 5 Sep 2011 18:24:08 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,31 +0,0 @@
> -$OpenBSD: patch-tools_syslogd_c,v 1.2 2011/09/05 18:24:08 jasper Exp $
> -
> -Last chunk:
> -Security fix for CVE-2011-3200,
> -rsyslog: parseLegacySyslogMsg off-by-two buffer overflow
> -
> -Patch from upstream via redhat: https://bugzilla.redhat.com/show_bug.cgi?id=727644
> -
> ---- tools/syslogd.c.orig Thu Aug  5 11:33:54 2010
> -+++ tools/syslogd.c Mon Sep  5 20:22:07 2011
> -@@ -173,9 +173,8 @@ static rsRetVal GlobalClassExit(void);
> - #endif
> - #endif
> -
> --#ifndef _PATH_LOGCONF
> --#define _PATH_LOGCONF "/etc/rsyslog.conf"
> --#endif
> -+#undef _PATH_LOGCONF
> -+#define _PATH_LOGCONF CONFIGFILE
> -
> - #ifndef _PATH_MODDIR
> - #       if defined(__FreeBSD__)
> -@@ -1291,7 +1290,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags)
> - * outputs so that only 32 characters max are used by default.
> - */
> - i = 0;
> -- while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i < CONF_TAG_MAXSIZE) {
> -+ while(lenMsg > 0 && *p2parse != ':' && *p2parse != ' ' && i < CONF_TAG_MAXSIZE - 2) {
> - bufParseTAG[i++] = *p2parse++;
> - --lenMsg;
> - }
> Index: rsyslog/pkg/DESCR-docs
> ===================================================================
> RCS file: rsyslog/pkg/DESCR-docs
> diff -N rsyslog/pkg/DESCR-docs
> --- rsyslog/pkg/DESCR-docs 9 Jan 2015 21:04:02 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -Additional rsyslog documentation in HTML format.
> Index: rsyslog/pkg/PLIST-docs
> ===================================================================
> RCS file: rsyslog/pkg/PLIST-docs
> diff -N rsyslog/pkg/PLIST-docs
> --- rsyslog/pkg/PLIST-docs 9 Jan 2015 21:04:02 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,129 +0,0 @@
> -@comment $OpenBSD: PLIST-docs,v 1.1 2015/01/09 21:04:02 bluhm Exp $
> -share/doc/rsyslog/
> -share/doc/rsyslog/bugs.html
> -share/doc/rsyslog/build_from_repo.html
> -share/doc/rsyslog/classes.dia
> -share/doc/rsyslog/contributors.html
> -share/doc/rsyslog/dataflow.png
> -share/doc/rsyslog/debug.html
> -share/doc/rsyslog/dev_queue.html
> -share/doc/rsyslog/direct_queue0.png
> -share/doc/rsyslog/direct_queue1.png
> -share/doc/rsyslog/direct_queue2.png
> -share/doc/rsyslog/direct_queue3.png
> -share/doc/rsyslog/direct_queue_directq.png
> -share/doc/rsyslog/direct_queue_rsyslog.png
> -share/doc/rsyslog/direct_queue_rsyslog2.png
> -share/doc/rsyslog/droppriv.html
> -share/doc/rsyslog/expression.html
> -share/doc/rsyslog/features.html
> -share/doc/rsyslog/generic_design.html
> -share/doc/rsyslog/gssapi.html
> -share/doc/rsyslog/gssapi.png
> -share/doc/rsyslog/history.html
> -share/doc/rsyslog/how2help.html
> -share/doc/rsyslog/im3195.html
> -share/doc/rsyslog/imfile.html
> -share/doc/rsyslog/imgssapi.html
> -share/doc/rsyslog/imklog.html
> -share/doc/rsyslog/imrelp.html
> -share/doc/rsyslog/imtcp.html
> -share/doc/rsyslog/imuxsock.html
> -share/doc/rsyslog/index.html
> -share/doc/rsyslog/install.html
> -share/doc/rsyslog/ipv6.html
> -share/doc/rsyslog/licensing.html
> -share/doc/rsyslog/log_rotation_fix_size.html
> -share/doc/rsyslog/manual.html
> -share/doc/rsyslog/modules.html
> -share/doc/rsyslog/multi_ruleset.html
> -share/doc/rsyslog/netstream.html
> -share/doc/rsyslog/ns_gtls.html
> -share/doc/rsyslog/ns_ptcp.html
> -share/doc/rsyslog/omlibdbi.html
> -share/doc/rsyslog/ommail.html
> -share/doc/rsyslog/ommysql.html
> -share/doc/rsyslog/omoracle.html
> -share/doc/rsyslog/omrelp.html
> -share/doc/rsyslog/omsnmp.html
> -share/doc/rsyslog/property_replacer.html
> -share/doc/rsyslog/queueWorkerLogic.dia
> -share/doc/rsyslog/queueWorkerLogic.jpg
> -share/doc/rsyslog/queueWorkerLogic_small.jpg
> -share/doc/rsyslog/queue_analogy_tv.png
> -share/doc/rsyslog/queues.html
> -share/doc/rsyslog/queues_analogy.html
> -share/doc/rsyslog/rainerscript.html
> -share/doc/rsyslog/rsconf1_actionexeconlywhenpreviousissuspended.html
> -share/doc/rsyslog/rsconf1_actionresumeinterval.html
> -share/doc/rsyslog/rsconf1_allowedsender.html
> -share/doc/rsyslog/rsconf1_controlcharacterescapeprefix.html
> -share/doc/rsyslog/rsconf1_debugprintcfsyslinehandlerlist.html
> -share/doc/rsyslog/rsconf1_debugprintmodulelist.html
> -share/doc/rsyslog/rsconf1_debugprinttemplatelist.html
> -share/doc/rsyslog/rsconf1_dircreatemode.html
> -share/doc/rsyslog/rsconf1_dirgroup.html
> -share/doc/rsyslog/rsconf1_dirowner.html
> -share/doc/rsyslog/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
> -share/doc/rsyslog/rsconf1_droptrailinglfonreception.html
> -share/doc/rsyslog/rsconf1_dynafilecachesize.html
> -share/doc/rsyslog/rsconf1_escapecontrolcharactersonreceive.html
> -share/doc/rsyslog/rsconf1_failonchownfailure.html
> -share/doc/rsyslog/rsconf1_filecreatemode.html
> -share/doc/rsyslog/rsconf1_filegroup.html
> -share/doc/rsyslog/rsconf1_fileowner.html
> -share/doc/rsyslog/rsconf1_generateconfiggraph.html
> -share/doc/rsyslog/rsconf1_gssforwardservicename.html
> -share/doc/rsyslog/rsconf1_gsslistenservicename.html
> -share/doc/rsyslog/rsconf1_gssmode.html
> -share/doc/rsyslog/rsconf1_includeconfig.html
> -share/doc/rsyslog/rsconf1_mainmsgqueuesize.html
> -share/doc/rsyslog/rsconf1_markmessageperiod.html
> -share/doc/rsyslog/rsconf1_moddir.html
> -share/doc/rsyslog/rsconf1_modload.html
> -share/doc/rsyslog/rsconf1_repeatedmsgreduction.html
> -share/doc/rsyslog/rsconf1_resetconfigvariables.html
> -share/doc/rsyslog/rsconf1_umask.html
> -share/doc/rsyslog/rscript_abnf.html
> -share/doc/rsyslog/rsyslog-example.conf
> -share/doc/rsyslog/rsyslog-vers.png
> -share/doc/rsyslog/rsyslog_conf.html
> -share/doc/rsyslog/rsyslog_conf_actions.html
> -share/doc/rsyslog/rsyslog_conf_examples.html
> -share/doc/rsyslog/rsyslog_conf_filter.html
> -share/doc/rsyslog/rsyslog_conf_global.html
> -share/doc/rsyslog/rsyslog_conf_modules.html
> -share/doc/rsyslog/rsyslog_conf_nomatch.html
> -share/doc/rsyslog/rsyslog_conf_output.html
> -share/doc/rsyslog/rsyslog_conf_templates.html
> -share/doc/rsyslog/rsyslog_confgraph_complex.png
> -share/doc/rsyslog/rsyslog_confgraph_std.png
> -share/doc/rsyslog/rsyslog_high_database_rate.html
> -share/doc/rsyslog/rsyslog_mysql.html
> -share/doc/rsyslog/rsyslog_ng_comparison.html
> -share/doc/rsyslog/rsyslog_packages.html
> -share/doc/rsyslog/rsyslog_pgsql.html
> -share/doc/rsyslog/rsyslog_php_syslog_ng.html
> -share/doc/rsyslog/rsyslog_recording_pri.html
> -share/doc/rsyslog/rsyslog_reliable_forwarding.html
> -share/doc/rsyslog/rsyslog_secure_tls.html
> -share/doc/rsyslog/rsyslog_stunnel.html
> -share/doc/rsyslog/rsyslog_tls.html
> -share/doc/rsyslog/syslog_parsing.html
> -share/doc/rsyslog/syslog_protocol.html
> -share/doc/rsyslog/tls_cert.dia
> -share/doc/rsyslog/tls_cert.jpg
> -share/doc/rsyslog/tls_cert_100.jpg
> -share/doc/rsyslog/tls_cert_ca.html
> -share/doc/rsyslog/tls_cert_ca.jpg
> -share/doc/rsyslog/tls_cert_client.html
> -share/doc/rsyslog/tls_cert_errmsgs.html
> -share/doc/rsyslog/tls_cert_machine.html
> -share/doc/rsyslog/tls_cert_scenario.html
> -share/doc/rsyslog/tls_cert_server.html
> -share/doc/rsyslog/tls_cert_summary.html
> -share/doc/rsyslog/tls_cert_udp_relay.html
> -share/doc/rsyslog/troubleshoot.html
> -share/doc/rsyslog/v3compatibility.html
> -share/doc/rsyslog/v4compatibility.html
> -share/doc/rsyslog/version_naming.html
> Index: rsyslog/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-main
> --- rsyslog/pkg/PLIST-main 29 Jul 2010 21:40:21 -0000 1.1.1.1
> +++ rsyslog/pkg/PLIST-main 6 Mar 2016 12:34:54 -0000
> @@ -1,40 +1,24 @@
>  @comment $OpenBSD: PLIST-main,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
>  lib/rsyslog/
> -@comment lib/rsyslog/imklog.la
>  lib/rsyslog/imklog.so
> -@comment lib/rsyslog/immark.la
>  lib/rsyslog/immark.so
> -@comment lib/rsyslog/imrelp.la
>  lib/rsyslog/imrelp.so
> -@comment lib/rsyslog/imtcp.la
>  lib/rsyslog/imtcp.so
> -@comment lib/rsyslog/imudp.la
>  lib/rsyslog/imudp.so
> -@comment lib/rsyslog/imuxsock.la
>  lib/rsyslog/imuxsock.so
> -@comment lib/rsyslog/lmnet.la
> +lib/rsyslog/lmcry_gcry.so
>  lib/rsyslog/lmnet.so
> -@comment lib/rsyslog/lmnetstrms.la
>  lib/rsyslog/lmnetstrms.so
> -@comment lib/rsyslog/lmnsd_gtls.la
>  lib/rsyslog/lmnsd_gtls.so
> -@comment lib/rsyslog/lmnsd_ptcp.la
>  lib/rsyslog/lmnsd_ptcp.so
> -@comment lib/rsyslog/lmregexp.la
>  lib/rsyslog/lmregexp.so
> -@comment lib/rsyslog/lmstrmsrv.la
>  lib/rsyslog/lmstrmsrv.so
> -@comment lib/rsyslog/lmtcpclt.la
>  lib/rsyslog/lmtcpclt.so
> -@comment lib/rsyslog/lmtcpsrv.la
>  lib/rsyslog/lmtcpsrv.so
> -@comment lib/rsyslog/lmzlibw.la
>  lib/rsyslog/lmzlibw.so
> -@comment lib/rsyslog/ommail.la
> +lib/rsyslog/mmexternal.so
>  lib/rsyslog/ommail.so
> -@comment lib/rsyslog/omrelp.la
>  lib/rsyslog/omrelp.so
> -@comment lib/rsyslog/omtesting.la
>  lib/rsyslog/omtesting.so
>  @man man/man5/rsyslog.conf.5
>  @man man/man8/rsyslogd.8
> Index: rsyslog/pkg/PLIST-mysql
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-mysql,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-mysql
> --- rsyslog/pkg/PLIST-mysql 29 Jul 2010 21:40:21 -0000 1.1.1.1
> +++ rsyslog/pkg/PLIST-mysql 6 Mar 2016 12:34:54 -0000
> @@ -1,4 +1,3 @@
>  @comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
> -@comment lib/rsyslog/ommysql.la
>  lib/rsyslog/ommysql.so
>  share/examples/rsyslog/createDB_mysql.sql
> Index: rsyslog/pkg/PLIST-pgsql
> ===================================================================
> RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-pgsql,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-pgsql
> --- rsyslog/pkg/PLIST-pgsql 29 Jul 2010 21:40:21 -0000 1.1.1.1
> +++ rsyslog/pkg/PLIST-pgsql 6 Mar 2016 12:34:54 -0000
> @@ -1,4 +1,3 @@
>  @comment $OpenBSD: PLIST-pgsql,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $
> -@comment lib/rsyslog/ompgsql.la
>  lib/rsyslog/ompgsql.so
>  share/examples/rsyslog/createDB_pgsql.sql

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: rsyslog [Re: CVS: cvs.openbsd.org: ports]

Chris Cappuccio
In reply to this post by Stuart Henderson
Stuart Henderson [[hidden email]] wrote:

> On 2016/03/06 05:18, Antoine Jacoutot wrote:
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: [hidden email] 2016/03/06 05:18:31
> >
> > Modified files:
> > sysutils/rsyslog: Makefile
> > sysutils/rsyslog/patches: patch-runtime_nsd_gtls_c
> >
> > Log message:
> > Fix build with GnuTLS >= 3.4
> > On a side note, this port could use an update...
> >
>
> chris@ asked about this the other day too. here's a possible diff,
> it builds but I haven't tried running it yet.
>
> also since I don't use this I have no idea if we actually want
> liblogging-stdlog or if it's ok to disable for now.
>
> sample config is from chris.
>

Just an anecdotal report, this port has been working for me for
logging remote syslog to PostgreSQL.

Chris

Reply | Threaded
Open this post in threaded view
|

Re: rsyslog [Re: CVS: cvs.openbsd.org: ports]

Stuart Henderson
On 2016/03/13 15:07, Chris Cappuccio wrote:

> Stuart Henderson [[hidden email]] wrote:
> > On 2016/03/06 05:18, Antoine Jacoutot wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: [hidden email] 2016/03/06 05:18:31
> > >
> > > Modified files:
> > > sysutils/rsyslog: Makefile
> > > sysutils/rsyslog/patches: patch-runtime_nsd_gtls_c
> > >
> > > Log message:
> > > Fix build with GnuTLS >= 3.4
> > > On a side note, this port could use an update...
> > >
> >
> > chris@ asked about this the other day too. here's a possible diff,
> > it builds but I haven't tried running it yet.
> >
> > also since I don't use this I have no idea if we actually want
> > liblogging-stdlog or if it's ok to disable for now.
> >
> > sample config is from chris.
> >
>
> Just an anecdotal report, this port has been working for me for
> logging remote syslog to PostgreSQL.
>
> Chris
>

I think it probably makes sense to commit so we can get some
wider testing, if people run into problems they can always
reply here later.

Any objections?