Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Jun 2019 05:34:30 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r505195 - in head/sysutils: . syslog-ng syslog-ng322 syslog-ng322/files
Message-ID:  <201906270534.x5R5YU3A069378@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Thu Jun 27 05:34:30 2019
New Revision: 505195
URL: https://svnweb.freebsd.org/changeset/ports/505195

Log:
  Accpet the new syslog-ng321 from our upstream Balabit, the company
  that authored and maintains syslog-ng.
  
  Peter suggested that this new port not become the default syslog-ng port
  for now until up two modules that fail to build on FreeBSD are fixed
  upstream.
  
  Submitted by:	Peter Czanik (CzP) <peter.czanik@balabit.com>
  		Balabit (a OneIdentity company) / syslog-ng upstream

Added:
  head/sysutils/syslog-ng322/
     - copied from r505139, head/sysutils/syslog-ng321/
Modified:
  head/sysutils/Makefile
  head/sysutils/syslog-ng/Makefile
  head/sysutils/syslog-ng322/Makefile
  head/sysutils/syslog-ng322/distinfo
  head/sysutils/syslog-ng322/files/syslog-ng.conf.sample
  head/sysutils/syslog-ng322/pkg-plist

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Thu Jun 27 03:37:10 2019	(r505194)
+++ head/sysutils/Makefile	Thu Jun 27 05:34:30 2019	(r505195)
@@ -1314,6 +1314,7 @@
     SUBDIR += syslog-ng319
     SUBDIR += syslog-ng320
     SUBDIR += syslog-ng321
+    SUBDIR += syslog-ng322
     SUBDIR += syslog-ng39
     SUBDIR += syslogger
     SUBDIR += sysrc

Modified: head/sysutils/syslog-ng/Makefile
==============================================================================
--- head/sysutils/syslog-ng/Makefile	Thu Jun 27 03:37:10 2019	(r505194)
+++ head/sysutils/syslog-ng/Makefile	Thu Jun 27 05:34:30 2019	(r505195)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-VERSIONS=		39 314 315 317 318 319 320 321
+VERSIONS=		39 314 315 317 318 319 320 321 322
 SYSLOG_NG_VERSION?=	321
 
 MASTERDIR=		${.CURDIR}/../syslog-ng${SYSLOG_NG_VERSION}

Modified: head/sysutils/syslog-ng322/Makefile
==============================================================================
--- head/sysutils/syslog-ng321/Makefile	Wed Jun 26 04:00:09 2019	(r505139)
+++ head/sysutils/syslog-ng322/Makefile	Thu Jun 27 05:34:30 2019	(r505195)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-DISTVERSION=	3.21.1
+DISTVERSION=	3.22.1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 .if !defined(MASTERDIR)
-PKGNAMESUFFIX=	321
+PKGNAMESUFFIX=	322
 .endif
 
 MAINTAINER=	cy@FreeBSD.org
@@ -26,7 +26,7 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST
 OPTIONS_DEFAULT=	CURL JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
@@ -42,6 +42,7 @@ CURL_DESC=		Build with Curl HTTP support
 AMQP_DESC=		Build with AMQP support
 RIEMANN_DESC=		Build with Riemann support
 KAFKA_DESC=		Build with Kafka (librdkafka) support
+SNMPDEST_DESC=		Build with SNMP destination (net-snmp) support
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
@@ -84,6 +85,10 @@ REDIS_CONFIGURE_ENABLE=		redis
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REDIS_PLIST_FILES=		lib/syslog-ng/libredis.so
 
+SNMPDEST_CONFIGURE_ENABLE=	snmp-dest
+SNMPDEST_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
+SNMPDEST_PLIST_FILES=		lib/syslog-ng/libsnmpdest.so
+
 SMTP_CONFIGURE_ON=		--with-libesmtp=${LOCALBASE} --enable-smtp
 SMTP_CONFIGURE_OFF=		--without-libesmtp --disable-smtp
 SMTP_LIB_DEPENDS=		libesmtp.so:mail/libesmtp
@@ -141,45 +146,45 @@ PYTHON_USES=			python:3.5+ 
 PYTHON_CONFIGURE_ON=		--enable-python 
 PYTHON_CONFIGURE_OFF=		--disable-python
 PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
-		%%PYTHON_SITELIBDIR%%/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
-		%%PYTHON_SITELIBDIR%%/syslogng/__init__.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__init__.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/choicecompleter.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/choicecompleter.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/commandlinelexer.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completer.py  \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completer.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/completerlang.py  \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/completerlang.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuggercli.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuggercli.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/debuglang.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/debuglang.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/getoptlexer.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/getoptlexer.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/langcompleter.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/langcompleter.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexer.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexer.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/lexertoken.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/lexertoken.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/macrocompleter.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/macrocompleter.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/readline.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/readline.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/syslognginternals.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/syslognginternals.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tablexer.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tablexer.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelang.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelang.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/templatelexer.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/templatelexer.cpython-${PYTHON_SUFFIX}.pyc \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/tflang.py \
-		%%PYTHON_SITELIBDIR%%/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
+		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
+		lib/syslog-ng/python/syslogng/__init__.py \
+		lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/__init__.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/choicecompleter.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/commandlinelexer.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/completer.py  \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/completerlang.py  \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/debuggercli.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/debuglang.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuglang.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/getoptlexer.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/getoptlexer.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/langcompleter.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/langcompleter.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/lexer.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexer.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/lexertoken.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexertoken.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/macrocompleter.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/macrocompleter.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/readline.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/readline.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/syslognginternals.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/syslognginternals.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/tablexer.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tablexer.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/templatelang.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/templatelexer.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-${PYTHON_SUFFIX}.pyc \
+		lib/syslog-ng/python/syslogng/debuggercli/tflang.py \
+		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl

Modified: head/sysutils/syslog-ng322/distinfo
==============================================================================
--- head/sysutils/syslog-ng321/distinfo	Wed Jun 26 04:00:09 2019	(r505139)
+++ head/sysutils/syslog-ng322/distinfo	Thu Jun 27 05:34:30 2019	(r505195)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557708145
-SHA256 (syslog-ng-3.21.1.tar.gz) = 8d163da5ad79cf3a5f043b2ed0fe18a4888d0d740542703bf2508f0b9996cd25
-SIZE (syslog-ng-3.21.1.tar.gz) = 4912298
+TIMESTAMP = 1561534638
+SHA256 (syslog-ng-3.22.1.tar.gz) = 0656443776fa554320cb81bbebeac72bdf871298dd2ebef7413c393aec4d74c8
+SIZE (syslog-ng-3.22.1.tar.gz) = 4981746

Modified: head/sysutils/syslog-ng322/files/syslog-ng.conf.sample
==============================================================================
--- head/sysutils/syslog-ng321/files/syslog-ng.conf.sample	Wed Jun 26 04:00:09 2019	(r505139)
+++ head/sysutils/syslog-ng322/files/syslog-ng.conf.sample	Thu Jun 27 05:34:30 2019	(r505195)
@@ -1,4 +1,4 @@
-@version:3.21
+@version:3.22
 @include "scl.conf"
 
 #

Modified: head/sysutils/syslog-ng322/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng321/pkg-plist	Wed Jun 26 04:00:09 2019	(r505139)
+++ head/sysutils/syslog-ng322/pkg-plist	Thu Jun 27 05:34:30 2019	(r505195)
@@ -148,9 +148,7 @@ include/syslog-ng/uuid.h
 include/syslog-ng/userdb.h
 include/syslog-ng/utf8utils.h
 include/syslog-ng/versioning.h
-include/syslog-ng/bookmark.h
 include/syslog-ng/ringbuffer.h
-include/syslog-ng/ack_tracker.h
 include/syslog-ng/rewrite/rewrite-expr.h
 include/syslog-ng/rewrite/rewrite-set-tag.h
 include/syslog-ng/rewrite/rewrite-set.h
@@ -205,7 +203,6 @@ include/syslog-ng/modules/add-contextual-data/add-cont
 include/syslog-ng/modules/add-contextual-data/add-contextual-data.h
 include/syslog-ng/modules/add-contextual-data/context-info-db.h
 include/syslog-ng/modules/add-contextual-data/contextual-data-record-scanner.h
-include/syslog-ng/modules/add-contextual-data/csv-contextual-data-record-scanner.h
 include/syslog-ng/str-repr/encode.h
 include/syslog-ng/compat/pcre.h
 include/syslog-ng/control/control-commands.h
@@ -231,7 +228,6 @@ include/syslog-ng/misc.h
 include/syslog-ng/nondumpable-allocator.h
 include/syslog-ng/secret-storage.h
 include/syslog-ng/atomic-gssize.h
-include/syslog-ng/late_ack_tracker.h
 include/syslog-ng/loggen_helper.h
 include/syslog-ng/loggen_plugin.h
 include/syslog-ng/transport/multitransport.h
@@ -247,7 +243,6 @@ include/syslog-ng/msg-stats.h
 include/syslog-ng/scanner/xml-scanner/xml-scanner.h
 include/syslog-ng/timeutils/cache.h
 include/syslog-ng/timeutils/names.h
-include/syslog-ng/timeutils/strptime-tz.h
 include/syslog-ng/timeutils/zoneinfo.h
 include/syslog-ng/logthrdest/logthrdestdrv.h
 include/syslog-ng/str-repr/decode.h
@@ -258,21 +253,27 @@ include/syslog-ng/timeutils/scan-timestamp.h
 include/syslog-ng/timeutils/unixtime.h
 include/syslog-ng/timeutils/wallclocktime.h
 include/syslog-ng/value-pairs/internals.h
+include/syslog-ng/ack-tracker/ack_tracker.h
+include/syslog-ng/ack-tracker/bookmark.h
+include/syslog-ng/ack-tracker/late_ack_record_container.h
+include/syslog-ng/ack-tracker/late_ack_tracker.h
+include/syslog-ng/dynamic-window-pool.h
+include/syslog-ng/dynamic-window.h
 lib/libsecret-storage.so
 lib/libsecret-storage.so.0
 lib/libsecret-storage.so.0.0.0
-lib/libevtlog-3.21.so.0
-lib/libevtlog-3.21.so.0.0.0
+lib/libevtlog-3.22.so.0
+lib/libevtlog-3.22.so.0.0.0
 lib/libevtlog.so
-lib/libsyslog-ng-3.21.so.0.0.0
-lib/libsyslog-ng-3.21.so.0
+lib/libsyslog-ng-3.22.so.0.0.0
+lib/libsyslog-ng-3.22.so.0
 lib/libsyslog-ng.so
 lib/libsyslog-ng-native-connector.a
-lib/libloggen_helper-3.21.so.0
-lib/libloggen_helper-3.21.so.0.0.0
+lib/libloggen_helper-3.22.so.0
+lib/libloggen_helper-3.22.so.0.0.0
 lib/libloggen_helper.so
-lib/libloggen_plugin-3.21.so.0
-lib/libloggen_plugin-3.21.so.0.0.0
+lib/libloggen_plugin-3.22.so.0
+lib/libloggen_plugin-3.22.so.0.0.0
 lib/libloggen_plugin.so
 lib/syslog-ng/loggen/libloggen_socket_plugin.so
 lib/syslog-ng/loggen/libloggen_ssl_plugin.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906270534.x5R5YU3A069378>