From owner-svn-ports-head@FreeBSD.ORG Wed Dec 17 22:07:57 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28F2C970; Wed, 17 Dec 2014 22:07:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 099F0696; Wed, 17 Dec 2014 22:07:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBHM7ugl035047; Wed, 17 Dec 2014 22:07:56 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBHM7str035036; Wed, 17 Dec 2014 22:07:54 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201412172207.sBHM7str035036@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Wed, 17 Dec 2014 22:07:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374876 - in head/sysutils/rsyslog8: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2014 22:07:57 -0000 Author: brd (doc committer) Date: Wed Dec 17 22:07:53 2014 New Revision: 374876 URL: https://svnweb.freebsd.org/changeset/ports/374876 QAT: https://qat.redports.org/buildarchive/r374876/ Log: Upgrade to 8.6.0 http://www.rsyslog.com/changelog-for-8-6-0-v8-stable/ 1: Enable omuxsock by default 2: Fix broken build with RFC3195 PR: 191327 [1], 191412 [2] Reviewed by: swills Added: head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c (contents, props changed) head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c (contents, props changed) head/sysutils/rsyslog8/files/patch-tools_rsyslogd.c (contents, props changed) Modified: head/sysutils/rsyslog8/Makefile head/sysutils/rsyslog8/distinfo head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c head/sysutils/rsyslog8/pkg-plist Modified: head/sysutils/rsyslog8/Makefile ============================================================================== --- head/sysutils/rsyslog8/Makefile Wed Dec 17 21:22:08 2014 (r374875) +++ head/sysutils/rsyslog8/Makefile Wed Dec 17 22:07:53 2014 (r374876) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 8.4.2 -PORTREVISION= 1 +PORTVERSION= 8.6.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -24,7 +23,7 @@ USE_AUTOTOOLS= autoconf PORTSCOUT= limit:^8\.2 PKGNAMESUFFIX= 8 -OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP +OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP DBI_DESC= LibDBI output module for rsyslog GNUTLS_DESC= GNUTLS module for rsyslog @@ -32,7 +31,6 @@ GSSAPI_DESC= GSS API input/output module 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= libtool pkgconfig @@ -90,14 +88,6 @@ PLIST_FILES+= lib/rsyslog/imrelp.so \ 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.so -.else -CONFIGURE_ARGS+=--disable-rfc3195 -.endif - .if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp @@ -136,7 +126,7 @@ CFLAGS+= ${CPPFLAGS} USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message -CONFIGURE_ARGS+= --enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --disable-testbench +CONFIGURE_ARGS+= --enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ @@ -147,7 +137,7 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: -.for l in imdiag imfile imklog immark impstats imtcp imudp imuxsock lmcry_gcry lmnet lmnetstrms lmnsd_ptcp lmregexp lmstrmsrv lmtcpclt lmtcpsrv lmzlibw mmexternal ommail omprog omstdout omtesting +.for l in im3195 imdiag imfile imklog immark impstats imtcp imudp imuxsock lmcry_gcry lmnet lmnetstrms lmnsd_ptcp lmregexp lmstrmsrv lmtcpclt lmtcpsrv lmzlibw mmexternal ommail omprog omstdout omtesting omuxsock ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so .endfor Modified: head/sysutils/rsyslog8/distinfo ============================================================================== --- head/sysutils/rsyslog8/distinfo Wed Dec 17 21:22:08 2014 (r374875) +++ head/sysutils/rsyslog8/distinfo Wed Dec 17 22:07:53 2014 (r374876) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-8.4.2.tar.gz) = 71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a -SIZE (rsyslog-8.4.2.tar.gz) = 1938563 +SHA256 (rsyslog-8.6.0.tar.gz) = 759f836be460c794a7649f2b5b5ef8d423388ec599bf3b49f51fded3f8c02431 +SIZE (rsyslog-8.6.0.tar.gz) = 1975854 Added: head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog8/files/patch-grammar_rainerscript.c Wed Dec 17 22:07:53 2014 (r374876) @@ -0,0 +1,10 @@ +--- grammar/rainerscript.c.orig 2014-12-02 10:15:16 UTC ++++ grammar/rainerscript.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include "rsyslog.h" + #include "rainerscript.h" + #include "conf.h" Modified: head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c ============================================================================== --- head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c Wed Dec 17 21:22:08 2014 (r374875) +++ head/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c Wed Dec 17 22:07:53 2014 (r374876) @@ -1,4 +1,4 @@ ---- plugins/mmexternal/mmexternal.c.orig 2014-09-30 16:57:35 UTC +--- plugins/mmexternal/mmexternal.c.orig 2014-11-25 15:45:35 UTC +++ plugins/mmexternal/mmexternal.c @@ -31,7 +31,7 @@ #include Modified: head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c ============================================================================== --- head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c Wed Dec 17 21:22:08 2014 (r374875) +++ head/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c Wed Dec 17 22:07:53 2014 (r374876) @@ -1,5 +1,5 @@ ---- plugins/omprog/omprog.c.orig 2014-11-15 15:26:55.633028880 -0600 -+++ plugins/omprog/omprog.c 2014-11-15 15:27:01.695054590 -0600 +--- plugins/omprog/omprog.c.orig 2014-11-25 15:45:35 UTC ++++ plugins/omprog/omprog.c @@ -36,7 +36,7 @@ #include #include Added: head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog8/files/patch-plugins_impstats_impstats.c Wed Dec 17 22:07:53 2014 (r374876) @@ -0,0 +1,10 @@ +--- plugins/impstats/impstats.c.orig 2014-12-10 15:46:20 UTC ++++ plugins/impstats/impstats.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include "dirty.h" + #include "cfsysline.h" Added: head/sysutils/rsyslog8/files/patch-tools_rsyslogd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rsyslog8/files/patch-tools_rsyslogd.c Wed Dec 17 22:07:53 2014 (r374876) @@ -0,0 +1,10 @@ +--- tools/rsyslogd.c.orig 2014-12-10 15:46:03 UTC ++++ tools/rsyslogd.c +@@ -32,6 +32,7 @@ + #else + # include + #endif ++#include + #include "sd-daemon.h" + + #include "wti.h" Modified: head/sysutils/rsyslog8/pkg-plist ============================================================================== --- head/sysutils/rsyslog8/pkg-plist Wed Dec 17 21:22:08 2014 (r374875) +++ head/sysutils/rsyslog8/pkg-plist Wed Dec 17 22:07:53 2014 (r374876) @@ -1,3 +1,4 @@ +lib/rsyslog/im3195.so lib/rsyslog/imdiag.so lib/rsyslog/imfile.so lib/rsyslog/imklog.so @@ -20,6 +21,7 @@ lib/rsyslog/ommail.so lib/rsyslog/omprog.so lib/rsyslog/omstdout.so lib/rsyslog/omtesting.so +lib/rsyslog/omuxsock.so man/man5/rsyslog.conf.5.gz man/man8/rsyslogd.8.gz sbin/rsyslogd