diff options
-rw-r--r-- | sysutils/syslog-ng/Makefile | 7 | ||||
-rw-r--r-- | sysutils/syslog-ng/Makefile.common | 4 | ||||
-rw-r--r-- | sysutils/syslog-ng/PLIST | 13 | ||||
-rw-r--r-- | sysutils/syslog-ng/distinfo | 13 | ||||
-rw-r--r-- | sysutils/syslog-ng/patches/patch-configure | 96 | ||||
-rw-r--r-- | sysutils/syslog-ng/patches/patch-modules_afsocket_socket-options-inet.c | 14 |
6 files changed, 30 insertions, 117 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index eacad09b0c2..950e1e226a5 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2016/08/21 20:22:30 fhajny Exp $ +# $NetBSD: Makefile,v 1.29 2017/01/10 18:54:15 fhajny Exp $ .include "../../sysutils/syslog-ng/Makefile.common" @@ -34,6 +34,11 @@ PLIST_VARS+= systemd PLIST.systemd= yes .endif +PKGCONFIG_OVERRIDE= libtest/syslog-ng-test.pc.in \ + syslog-ng-add-contextual-data.pc.in \ + syslog-ng-native-connector.pc.in \ + syslog-ng.pc.in + post-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DESTDIR}${DOCDIR} diff --git a/sysutils/syslog-ng/Makefile.common b/sysutils/syslog-ng/Makefile.common index 6444e1b1063..2e596df7490 100644 --- a/sysutils/syslog-ng/Makefile.common +++ b/sysutils/syslog-ng/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.4 2016/08/21 21:31:24 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.5 2017/01/10 18:54:15 fhajny Exp $ # used by sysutils/syslog-ng/Makefile # used by sysutils/syslog-ng/Makefile.module -DISTNAME= syslog-ng-3.8.1 +DISTNAME= syslog-ng-3.9.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=balabit/} diff --git a/sysutils/syslog-ng/PLIST b/sysutils/syslog-ng/PLIST index a30e8c67a5e..a2fefcc801c 100644 --- a/sysutils/syslog-ng/PLIST +++ b/sysutils/syslog-ng/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2016/08/21 20:18:30 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.10 2017/01/10 18:54:15 fhajny Exp $ bin/dqtool bin/loggen bin/pdbtool @@ -24,6 +24,7 @@ include/syslog-ng/compat/compat.h include/syslog-ng/compat/getutent.h include/syslog-ng/compat/glib.h include/syslog-ng/compat/lfs.h +include/syslog-ng/compat/openssl_support.h include/syslog-ng/compat/pio.h include/syslog-ng/compat/socket.h include/syslog-ng/compat/string.h @@ -105,6 +106,13 @@ include/syslog-ng/memtrace.h include/syslog-ng/messages.h include/syslog-ng/ml-batched-timer.h include/syslog-ng/module-config.h +include/syslog-ng/modules/add-contextual-data/add-contextual-data-parser.h +include/syslog-ng/modules/add-contextual-data/add-contextual-data-selector.h +include/syslog-ng/modules/add-contextual-data/add-contextual-data-template-selector.h +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/msg-format.h include/syslog-ng/parse-number.h include/syslog-ng/parser/parser-expr-parser.h @@ -144,6 +152,8 @@ include/syslog-ng/stats/stats-registry.h include/syslog-ng/stats/stats-syslog.h include/syslog-ng/stats/stats.h include/syslog-ng/str-format.h +include/syslog-ng/str-repr/decode.h +include/syslog-ng/str-repr/encode.h include/syslog-ng/str-utils.h include/syslog-ng/string-list.h include/syslog-ng/syslog-names.h @@ -180,6 +190,7 @@ include/syslog-ng/value-pairs/value-pairs.h include/syslog-ng/versioning.h lib/libsyslog-ng-native-connector.a lib/libsyslog-ng.la +lib/pkgconfig/syslog-ng-add-contextual-data.pc lib/pkgconfig/syslog-ng-native-connector.pc lib/pkgconfig/syslog-ng-test.pc lib/pkgconfig/syslog-ng.pc diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index 3dd47035459..9b748d7a459 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.7 2016/08/21 20:18:30 fhajny Exp $ +$NetBSD: distinfo,v 1.8 2017/01/10 18:54:15 fhajny Exp $ -SHA1 (syslog-ng-3.8.1.tar.gz) = e66cc7538eec245b80dda4624671a61932c856c3 -RMD160 (syslog-ng-3.8.1.tar.gz) = 67357d1eeef54be78ceac16ae4eff0ce66ef65a6 -SHA512 (syslog-ng-3.8.1.tar.gz) = cdd07427e7ddf4aebc1e4ed9512a1d7718d49d5c0deadccdeb0b1d7762eae178c3018b2b48b475ff8c7aec999b75d1f1cc424fca823b543f607f4fc8872070a5 -Size (syslog-ng-3.8.1.tar.gz) = 8328391 bytes +SHA1 (syslog-ng-3.9.1.tar.gz) = 1ca437393d8895654452bef8ac0b996fe73284f8 +RMD160 (syslog-ng-3.9.1.tar.gz) = 20bbcab38d02c369aa964c364fa2acdcfa86a673 +SHA512 (syslog-ng-3.9.1.tar.gz) = aade44fa6dffa7e84fc951aa20f0e40db2ee6438f46108c95244e465b1fafc08e6f9afab12c057576d601cc51dd7cefb16370183ca036af0d68046fdb29fdd02 +Size (syslog-ng-3.9.1.tar.gz) = 8312677 bytes SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8 -SHA1 (patch-configure) = b68b36f8f443149f97c538571d95e894da7deb80 +SHA1 (patch-configure) = 2d8ef2285de44de016f44e51be47cd4c1178dfdb SHA1 (patch-lib_ivykis_src_iv__fd__port.c) = a6b1feafd7c8031a1ed7d2cb0abc57ca3633fb5a -SHA1 (patch-modules_afsocket_socket-options-inet.c) = a23103caea1c46dd2e405bd1a668fde0d3ceeeae SHA1 (patch-modules_system-source_system-source.c) = f51ed8d2e6d603744b3e6636eeb9c68382e5cda6 diff --git a/sysutils/syslog-ng/patches/patch-configure b/sysutils/syslog-ng/patches/patch-configure index 0e06b9ac12d..5141262a3bd 100644 --- a/sysutils/syslog-ng/patches/patch-configure +++ b/sysutils/syslog-ng/patches/patch-configure @@ -1,98 +1,10 @@ -$NetBSD: patch-configure,v 1.2 2016/08/21 20:18:30 fhajny Exp $ +$NetBSD: patch-configure,v 1.3 2017/01/10 18:54:15 fhajny Exp $ Portability. ---- configure.orig 2016-08-19 11:18:46.000000000 +0000 +--- configure.orig 2016-12-21 15:00:32.000000000 +0000 +++ configure -@@ -15496,12 +15496,12 @@ if test -n "$LIBMONGO_CFLAGS"; then - pkg_cv_LIBMONGO_CFLAGS="$LIBMONGO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null` -+ pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15513,12 +15513,12 @@ if test -n "$LIBMONGO_LIBS"; then - pkg_cv_LIBMONGO_LIBS="$LIBMONGO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null` -+ pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15539,9 +15539,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1` -+ LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1` - else -- LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1` -+ LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBMONGO_PKG_ERRORS" >&5 -@@ -15568,12 +15568,12 @@ if test -n "$LIBMONGO_CFLAGS"; then - pkg_cv_LIBMONGO_CFLAGS="$LIBMONGO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null` -+ pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15585,12 +15585,12 @@ if test -n "$LIBMONGO_LIBS"; then - pkg_cv_LIBMONGO_LIBS="$LIBMONGO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null` -+ pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -15611,9 +15611,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1` -+ LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1` - else -- LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1` -+ LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBMONGO_PKG_ERRORS" >&5 -@@ -16367,7 +16367,7 @@ $as_echo_n "checking for JAVA_VERSION... +@@ -16463,7 +16463,7 @@ $as_echo_n "checking for JAVA_VERSION... JAVA_HOME_CHECKER="/usr/libexec/java_home" if test "x$JAVAC_BIN" != "x"; then @@ -101,7 +13,7 @@ Portability. JAVAC_BIN=` READLINK_TARGET=$JAVAC_BIN cd $(dirname "$READLINK_TARGET") -@@ -16474,7 +16474,7 @@ $as_echo_n "checking for JAVA_VERSION... +@@ -16570,7 +16570,7 @@ $as_echo_n "checking for JAVA_VERSION... JAVA_HOME_CHECKER="/usr/libexec/java_home" if test "x$JAVAC_BIN" != "x"; then diff --git a/sysutils/syslog-ng/patches/patch-modules_afsocket_socket-options-inet.c b/sysutils/syslog-ng/patches/patch-modules_afsocket_socket-options-inet.c deleted file mode 100644 index 77706cedfff..00000000000 --- a/sysutils/syslog-ng/patches/patch-modules_afsocket_socket-options-inet.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-modules_afsocket_socket-options-inet.c,v 1.1 2015/10/29 16:34:13 fhajny Exp $ - -Need netinet/in.h. - ---- modules/afsocket/socket-options-inet.c.orig 2014-12-15 14:48:45.000000000 +0000 -+++ modules/afsocket/socket-options-inet.c -@@ -25,6 +25,7 @@ - #include "messages.h" - - #include <string.h> -+#include <netinet/in.h> - - #ifndef SOL_IP - #define SOL_IP IPPROTO_IP |