Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Sep 2017 06:29:52 +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: r449326 - in head/sysutils: . syslog-ng syslog-ng311 syslog-ng311/files
Message-ID:  <201709060629.v866TqgG090893@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Sep  6 06:29:52 2017
New Revision: 449326
URL: https://svnweb.freebsd.org/changeset/ports/449326

Log:
  Welcome the new syslog-ng 3.11.1.
  
  Submitted by:	Peter Czanik (CzP) <peter.czanik@balabit.com>
  		Balabit / syslog-ng upstream

Added:
  head/sysutils/syslog-ng311/
     - copied from r448889, head/sysutils/syslog-ng310/
Deleted:
  head/sysutils/syslog-ng311/files/patch-lfs
Modified:
  head/sysutils/Makefile
  head/sysutils/syslog-ng/Makefile
  head/sysutils/syslog-ng311/Makefile
  head/sysutils/syslog-ng311/distinfo
  head/sysutils/syslog-ng311/files/syslog-ng.conf.sample
  head/sysutils/syslog-ng311/pkg-plist

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Wed Sep  6 05:50:12 2017	(r449325)
+++ head/sysutils/Makefile	Wed Sep  6 06:29:52 2017	(r449326)
@@ -1144,6 +1144,7 @@
     SUBDIR += syslog-ng37
     SUBDIR += syslog-ng39
     SUBDIR += syslog-ng310
+    SUBDIR += syslog-ng311
     SUBDIR += syslogger
     SUBDIR += sysrc
     SUBDIR += system-tools-backends

Modified: head/sysutils/syslog-ng/Makefile
==============================================================================
--- head/sysutils/syslog-ng/Makefile	Wed Sep  6 05:50:12 2017	(r449325)
+++ head/sysutils/syslog-ng/Makefile	Wed Sep  6 06:29:52 2017	(r449326)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-VERSIONS=		36 37 39 310
-SYSLOG_NG_VERSION?=	37
+VERSIONS=		36 37 39 310 311
+SYSLOG_NG_VERSION?=	311
 
 MASTERDIR=		${.CURDIR}/../syslog-ng${SYSLOG_NG_VERSION}
 

Modified: head/sysutils/syslog-ng311/Makefile
==============================================================================
--- head/sysutils/syslog-ng310/Makefile	Mon Aug 28 22:23:57 2017	(r448889)
+++ head/sysutils/syslog-ng311/Makefile	Wed Sep  6 06:29:52 2017	(r449326)
@@ -2,37 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-DISTVERSION=	3.10.1
+DISTVERSION=	3.11.1
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
-PKGNAMESUFFIX=	310
+PKGNAMESUFFIX=	311
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
-LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
-		libpcre.so:devel/pcre \
+LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libuuid.so:misc/e2fsprogs-libuuid \
-		libbson-1.0.so:devel/libbson
+		libbson-1.0.so:devel/libbson \
+		libevtlog.so:sysutils/eventlog
 
 BROKEN_powerpc64=	fails to link: Internal error: Segmentation fault (program ld)
 BROKEN_sparc64=		fails to link: Internal error: Segmentation fault (program ld)
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
-		syslog-ng-devel-[0-9]*
+		syslog-ng-devel-[0-9]* eventlog*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD
 OPTIONS_DEFAULT=	JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
 SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
-GEOIP_DESC=		Build with GeoIP support
+GEOIP_DESC=		Build with GeoIP support (depreciated)
+GEOIP2_DESC=		Build with geoip2 (MaxMindDB) support
 REDIS_DESC=		Build with Redis support
 JAVA_DESC=		Build with Java support (no modules)
 JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
@@ -40,9 +41,11 @@ PYTHON_DESC=		Build with Python 2.7 support
 CURL_DESC=		Build with Curl HTTP support
 
 USES=		autoreconf:build gmake libtool pathfix pkgconfig ssl \
-		gettext-runtime
+		gettext-runtime python shebangfix
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
+SHEBANG_FILES=	lib/merge-grammar.py
+SHEBANG_LANG=	python
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
@@ -71,6 +74,11 @@ GEOIP_CONFIGURE_ENABLE=		geoip
 GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_ENV=		GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
 GEOIP_PLIST_FILES=		lib/syslog-ng/libgeoip-plugin.so
+
+GEOIP2_CONFIGURE_ENABLE=	geoip2
+GEOIP2_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb                                
+GEOIP2_LDFLAGS=			-L${LOCALBASE}/lib
+GEOIP2_PLIST_FILES=		lib/syslog-ng/libgeoip2-plugin.so
 
 REDIS_CONFIGURE_ENABLE=		redis
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis

Modified: head/sysutils/syslog-ng311/distinfo
==============================================================================
--- head/sysutils/syslog-ng310/distinfo	Mon Aug 28 22:23:57 2017	(r448889)
+++ head/sysutils/syslog-ng311/distinfo	Wed Sep  6 06:29:52 2017	(r449326)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498475519
-SHA256 (syslog-ng-3.10.1.tar.gz) = a905fe7bad09dcf40bf03650ef1c287b511bf262d004464b8993a28ce58c9136
-SIZE (syslog-ng-3.10.1.tar.gz) = 8465976
+TIMESTAMP = 1504528897
+SHA256 (syslog-ng-3.11.1.tar.gz) = 64099dc39d2d760f8fd24db44054df7874862949dbcf773fc18fe83ce00a45e9
+SIZE (syslog-ng-3.11.1.tar.gz) = 8523684

Modified: head/sysutils/syslog-ng311/files/syslog-ng.conf.sample
==============================================================================
--- head/sysutils/syslog-ng310/files/syslog-ng.conf.sample	Mon Aug 28 22:23:57 2017	(r448889)
+++ head/sysutils/syslog-ng311/files/syslog-ng.conf.sample	Wed Sep  6 06:29:52 2017	(r449326)
@@ -1,4 +1,4 @@
-@version:3.9
+@version:3.11
 @include "scl.conf"
 
 #

Modified: head/sysutils/syslog-ng311/pkg-plist
==============================================================================
--- head/sysutils/syslog-ng310/pkg-plist	Mon Aug 28 22:23:57 2017	(r448889)
+++ head/sysutils/syslog-ng311/pkg-plist	Wed Sep  6 06:29:52 2017	(r449326)
@@ -6,6 +6,10 @@ bin/pdbtool
 bin/loggen
 bin/update-patterndb
 bin/dqtool
+include/syslog-ng/evtlog.h
+include/syslog-ng/evtmaps.h
+include/syslog-ng/libtest/license_module_mock.h
+include/syslog-ng/pe-versioning.h
 include/syslog-ng/ivykis/iv_avl.h
 include/syslog-ng/ivykis/iv_event.h
 include/syslog-ng/ivykis/iv_event_raw.h
@@ -225,9 +229,11 @@ include/syslog-ng/stats/stats-cluster-single.h
 include/syslog-ng/stats/stats-control.h
 include/syslog-ng/stats/stats-query-commands.h
 include/syslog-ng/stats/stats-query.h
-include/syslog-ng/stats/stats-views.h
-lib/libsyslog-ng-3.10.so.0.0.0
-lib/libsyslog-ng-3.10.so.0
+lib/libevtlog-3.11.so.0
+lib/libevtlog-3.11.so.0.0.0
+lib/libevtlog.so
+lib/libsyslog-ng-3.11.so.0.0.0
+lib/libsyslog-ng-3.11.so.0
 lib/libsyslog-ng.so
 lib/libsyslog-ng-native-connector.a
 lib/syslog-ng/libtest/libsyslog-ng-test.a
@@ -265,6 +271,9 @@ man/man1/pdbtool.1.gz
 man/man1/syslog-ng-ctl.1.gz
 man/man5/syslog-ng.conf.5.gz
 man/man8/syslog-ng.8.gz
+man/man1/dqtool.1.gz
+man/man1/syslog-ng-debun.1.gz
+sbin/syslog-ng-debun
 sbin/syslog-ng
 sbin/syslog-ng-ctl
 share/syslog-ng/include/scl/system/plugin.conf
@@ -286,9 +295,10 @@ share/syslog-ng/include/scl/loggly/loggly.conf
 share/syslog-ng/include/scl/logmatic/logmatic.conf
 share/syslog-ng/include/scl/cisco/plugin.conf
 share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf
+share/syslog-ng/include/scl/osquery/plugin.conf
 share/syslog-ng/tools/lex-rules.am
 share/syslog-ng/tools/cfg-grammar.y
-share/syslog-ng/tools/merge-grammar.pl
+share/syslog-ng/tools/merge-grammar.py
 share/syslog-ng/tools/system-expand.sh
 share/syslog-ng/xsd/patterndb-1.xsd
 share/syslog-ng/xsd/patterndb-2.xsd



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