This is my attempt to update rsyslog to 6.2.0 Can users of rsyslog give this a try?
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/Makefile,v retrieving revision 1.10 diff -N -u -p Makefile --- Makefile 16 Sep 2011 11:41:40 -0000 1.10 +++ Makefile 16 Jan 2012 17:56:34 -0000 @@ -8,17 +8,13 @@ COMMENT-pgsql = postgresql plugin for rsyslog MULTI_PACKAGES = -main -mysql -pgsql -V = 4.6.4 +V = 6.2.0 DISTNAME = rsyslog-$V PKGNAME-main = rsyslog-$V PKGNAME-mysql = rsyslog-mysql-$V PKGNAME-pgsql = rsyslog-pgsql-$V CATEGORIES = sysutils -REVISION-main = 3 -REVISION-mysql = 1 -REVISION-pgsql = 1 - HOMEPAGE = http://www.rsyslog.com/ # GPLv3+ @@ -29,12 +25,15 @@ PERMIT_DISTFILES_FTP = Yes MODULES = devel/gettext -WANTLIB-main += c gmp hogweed nettle gnutls pthread +WANTLIB-main += c ee estr gmp hogweed nettle gnutls p11-kit pthread WANTLIB-main += relp tasn1 z ${MODGETTEXT_WANTLIB} WANTLIB-mysql += crypto m mysqlclient ssl z WANTLIB-pgsql += crypto com_err pq ssl -LIB_DEPENDS-main = security/gnutls \ +LIB_DEPENDS-main = devel/libee \ + devel/libestr \ + security/gnutls \ + security/p11-kit \ sysutils/librelp LIB_DEPENDS-mysql = databases/mysql RUN_DEPENDS-mysql = ${PKGNAME-main}:${PKGPATH},-main @@ -44,8 +43,7 @@ RUN_DEPENDS-pgsql = ${PKGNAME-main}:${PKGPATH},-main MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \ http://download.rsyslog.com/rsyslog/ -CONFIGURE_STYLE = autoconf -AUTOCONF_VERSION = 2.65 +CONFIGURE_STYLE = gnu USE_LIBTOOL = Yes LIBTOOL_FLAGS = --tag=disable-static USE_GROFF = Yes Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/distinfo,v retrieving revision 1.2 diff -N -u -p distinfo --- distinfo 26 Aug 2010 21:28:58 -0000 1.2 +++ distinfo 16 Jan 2012 17:56:34 -0000 @@ -1,5 +1,5 @@ -MD5 (rsyslog-4.6.4.tar.gz) = nNMu7BmEplarh56JtX2Adg== -RMD160 (rsyslog-4.6.4.tar.gz) = qumwkHVsehiXSYTgS8fAhq5T8ck= -SHA1 (rsyslog-4.6.4.tar.gz) = AzM3E7kz3PjhromMYsVicEg7UIc= -SHA256 (rsyslog-4.6.4.tar.gz) = nXEtLKHutWkrlHvDN5dzqLHtGeddgwflhwuEaoOwac8= -SIZE (rsyslog-4.6.4.tar.gz) = 2080038 +MD5 (rsyslog-6.2.0.tar.gz) = A+I3q6pdR/ksbmVfkvIlMg== +RMD160 (rsyslog-6.2.0.tar.gz) = wM1VLLSxyvLX3EPECAhGnGbZAeE= +SHA1 (rsyslog-6.2.0.tar.gz) = yqIJJu/g/3KR/IXDJC+0HIXylJo= +SHA256 (rsyslog-6.2.0.tar.gz) = +IaaHCXQ3Z/wRGh0OWn/yf+JxvevowRvd/kcOYJUPME= +SIZE (rsyslog-6.2.0.tar.gz) = 2411196 Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/patches/patch-configure_ac,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-configure_ac --- patches/patch-configure_ac 29 Jul 2010 21:40:21 -0000 1.1.1.1 +++ patches/patch-configure_ac 16 Jan 2012 17:56:34 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2010/07/29 21:40:21 steven Exp $ ---- configure.ac.orig Fri Jul 23 22:03:50 2010 -+++ configure.ac Fri Jul 23 22:04:32 2010 -@@ -247,6 +247,7 @@ if test "x$enable_pthreads" != "xno"; then +--- configure.ac.orig Mon Jan 9 09:05:44 2012 ++++ configure.ac Mon Jan 16 12:15:12 2012 +@@ -269,6 +269,7 @@ if test "x$enable_pthreads" != "xno"; then PTHREADS_LIBS="-lpthread" case "${os_type}" in solaris) PTHREADS_CFLAGS="-pthreads" ;; Index: patches/patch-plugins_imuxsock_imuxsock_c =================================================================== RCS file: patches/patch-plugins_imuxsock_imuxsock_c diff -N -u -p patches/patch-plugins_imuxsock_imuxsock_c --- /dev/null 16 Jan 2012 10:56:34 -0000 +++ patches/patch-plugins_imuxsock_imuxsock_c 16 Jan 2012 17:56:34 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- plugins/imuxsock/imuxsock.c.orig Mon Jan 9 09:07:02 2012 ++++ plugins/imuxsock/imuxsock.c Mon Jan 16 12:15:46 2012 +@@ -35,6 +35,7 @@ + #include <errno.h> + #include <unistd.h> + #include <sys/stat.h> ++#include <sys/uio.h> + #include <sys/un.h> + #include <sys/socket.h> + #include "dirty.h" Index: patches/patch-plugins_ompgsql_createDB_sql =================================================================== RCS file: patches/patch-plugins_ompgsql_createDB_sql diff -N -u -p patches/patch-plugins_ompgsql_createDB_sql --- /dev/null 16 Jan 2012 10:56:34 -0000 +++ patches/patch-plugins_ompgsql_createDB_sql 16 Jan 2012 17:56:34 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- plugins/ompgsql/createDB.sql.orig Thu Dec 1 05:26:19 2011 ++++ plugins/ompgsql/createDB.sql Mon Jan 16 12:49:18 2012 +@@ -1,5 +1,5 @@ +-CREATE DATABASE 'Syslog' WITH ENCODING 'SQL_ASCII'; +-\c Syslog; ++CREATE DATABASE syslog WITH ENCODING 'SQL_ASCII'; ++\c syslog; + CREATE TABLE SystemEvents + ( + ID serial not null primary key, Index: patches/patch-runtime_nsd_gtls_c =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/patches/patch-runtime_nsd_gtls_c,v retrieving revision 1.1 diff -N -u -p patches/patch-runtime_nsd_gtls_c --- patches/patch-runtime_nsd_gtls_c 14 Sep 2011 21:25:39 -0000 1.1 +++ patches/patch-runtime_nsd_gtls_c 16 Jan 2012 17:56:34 -0000 @@ -3,8 +3,8 @@ $OpenBSD: patch-runtime_nsd_gtls_c,v 1.1 2011/09/14 21 GnuTLS >= 2.12 does not depend on libgcrypt initialization any longer and may in fact not use libgcrypt at all. ---- runtime/nsd_gtls.c.orig Wed Sep 14 03:05:03 2011 -+++ runtime/nsd_gtls.c Wed Sep 14 03:06:21 2011 +--- runtime/nsd_gtls.c.orig Mon Jan 9 09:05:45 2012 ++++ runtime/nsd_gtls.c Mon Jan 16 12:15:12 2012 @@ -29,7 +29,9 @@ #include <string.h> #include <gnutls/gnutls.h> @@ -23,9 +23,9 @@ and may in fact not use libgcrypt at all. GCRY_THREAD_OPTION_PTHREAD_IMPL; +#endif MODULE_TYPE_LIB + MODULE_TYPE_KEEP - /* static data */ -@@ -559,8 +563,10 @@ gtlsGlblInit(void) +@@ -564,8 +568,10 @@ gtlsGlblInit(void) uchar *cafile; DEFiRet; Index: patches/patch-tools_Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/patches/patch-tools_Makefile_in,v retrieving revision 1.1 diff -N -u -p patches/patch-tools_Makefile_in --- patches/patch-tools_Makefile_in 14 Sep 2011 21:25:39 -0000 1.1 +++ patches/patch-tools_Makefile_in 16 Jan 2012 17:56:34 -0000 @@ -1,9 +1,9 @@ $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@ +--- tools/Makefile.in.orig Mon Jan 9 09:15:51 2012 ++++ tools/Makefile.in Mon Jan 16 12:15:12 2012 +@@ -160,7 +160,8 @@ CFLAGS = @CFLAGS@ + CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ +DEFS = @DEFS@ -DSYSLOGD_PIDNAME=\"rsyslogd.pid\" \ Index: patches/patch-tools_syslogd_c =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/patches/patch-tools_syslogd_c,v retrieving revision 1.2 diff -N -u -p patches/patch-tools_syslogd_c --- patches/patch-tools_syslogd_c 5 Sep 2011 18:24:08 -0000 1.2 +++ patches/patch-tools_syslogd_c 16 Jan 2012 17:56:34 -0000 @@ -6,26 +6,17 @@ rsyslog: parseLegacySyslogMsg off-by-two buffer overfl 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 +--- tools/syslogd.c.orig Mon Jan 9 09:05:45 2012 ++++ tools/syslogd.c Mon Jan 16 12:15:12 2012 +@@ -156,9 +156,8 @@ DEFobjCurrIf(net) /* TODO: make go away! */ + static rsRetVal GlobalClassExit(void); + -#ifndef _PATH_LOGCONF -#define _PATH_LOGCONF "/etc/rsyslog.conf" -#endif -+#undef _PATH_LOGCONF -+#define _PATH_LOGCONF CONFIGFILE ++#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: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/sysutils/rsyslog/pkg/PLIST-main,v retrieving revision 1.1.1.1 diff -N -u -p pkg/PLIST-main --- pkg/PLIST-main 29 Jul 2010 21:40:21 -0000 1.1.1.1 +++ pkg/PLIST-main 16 Jan 2012 17:56:34 -0000 @@ -34,6 +34,8 @@ lib/rsyslog/lmzlibw.so lib/rsyslog/ommail.so @comment lib/rsyslog/omrelp.la lib/rsyslog/omrelp.so +lib/rsyslog/omruleset.la +lib/rsyslog/omruleset.so @comment lib/rsyslog/omtesting.la lib/rsyslog/omtesting.so @man man/man5/rsyslog.conf.5
