Index: branches/2020Q3/net-mgmt/nsca-ng/Makefile =================================================================== --- branches/2020Q3/net-mgmt/nsca-ng/Makefile (revision 541228) +++ branches/2020Q3/net-mgmt/nsca-ng/Makefile (revision 541229) @@ -1,72 +1,68 @@ # Created by: Alexander Sulfrian # $FreeBSD$ PORTNAME= nsca-ng -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.6 +DISTVERSIONPREFIX=v CATEGORIES= net-mgmt -MASTER_SITES= https://www.nsca-ng.org/download/ http://www.nsca-ng.org/download/ MAINTAINER= alexander@sulfrian.net COMMENT= Nagios Service Check Acceptor LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libev.so:devel/libev - .if !defined(PKGNAMESUFFIX) LIB_DEPENDS+= libconfuse.so:devel/libconfuse .endif -CONFLICTS?= nsca-2.* nsca27-2.* - -USES= ssl +USES= ssl autoreconf GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var/spool/nagios CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} +USE_GITHUB= true +GH_ACCOUNT= weiss + .if !defined(PKGNAMESUFFIX) USE_RC_SUBR= nsca-ng CONFIGURE_ARGS+= --enable-server .endif +CONFLICTS?= nsca-2.* nsca27-2.* + PORTDOCS= NEWS COPYING README PROTOCOL TODO OPTIONS_DEFINE= DOCS EXAMPLES .include -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= cannot link with OpenSSL -BROKEN_FreeBSD_13= cannot link with OpenSSL -.endif - .if ${SSL_DEFAULT:Mlibressl*} -IGNORE= Requires PSK which is unsupported by the selected LibreSSL +IGNORE+= requires PSK which is unsupported by the selected LibreSSL .endif post-install: .if defined(PKGNAMESUFFIX) ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios/ ${LN} -s ${PREFIX}/sbin/send_nsca ${STAGEDIR}${PREFIX}/libexec/nagios/send_nsca ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/contrib && ${INSTALL_DATA} ${PORTEXAMPLES} \ ${STAGEDIR}${EXAMPLESDIR} cd ${STAGEDIR}${PREFIX}/etc && ${MV} send_nsca.cfg send_nsca.cfg.sample # remove files not used here cd ${STAGEDIR}${PREFIX} && ${RM} man/man8/nsca-ng.8 man/man5/nsca-ng.cfg.5 .else cd ${STAGEDIR}${PREFIX}/etc && ${MV} nsca-ng.cfg nsca-ng.cfg.sample # remove files not used here cd ${STAGEDIR}${PREFIX} && ${RM} etc/send_nsca.cfg man/man5/send_nsca.cfg.5 \ man/man8/send_nsca.8 sbin/send_nsca .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: branches/2020Q3/net-mgmt/nsca-ng/distinfo =================================================================== --- branches/2020Q3/net-mgmt/nsca-ng/distinfo (revision 541228) +++ branches/2020Q3/net-mgmt/nsca-ng/distinfo (revision 541229) @@ -1,2 +1,3 @@ -SHA256 (nsca-ng-1.4.tar.gz) = 25f8e0439104e72443325e5f2503ed39329dccb7928de162dbb7fe6df7196a29 -SIZE (nsca-ng-1.4.tar.gz) = 354012 +TIMESTAMP = 1591782852 +SHA256 (weiss-nsca-ng-v1.6_GH0.tar.gz) = 215e9e06293e46ca825d6dbc9f57e74180dc928d98d3f24b234086d3face75c2 +SIZE (weiss-nsca-ng-v1.6_GH0.tar.gz) = 233563 Index: branches/2020Q3/net-mgmt/nsca-ng/files/patch-src_common_tls.c =================================================================== --- branches/2020Q3/net-mgmt/nsca-ng/files/patch-src_common_tls.c (revision 541228) +++ branches/2020Q3/net-mgmt/nsca-ng/files/patch-src_common_tls.c (nonexistent) @@ -1,20 +0,0 @@ ---- src/common/tls.c.orig 2018-10-10 00:47:13 UTC -+++ src/common/tls.c -@@ -102,6 +102,7 @@ - #include - #include - #include -+#include - #include - - #include "log.h" -@@ -419,7 +420,9 @@ initialize_openssl(const SSL_METHOD *method, const cha - - (void)SSL_library_init(); - SSL_load_error_strings(); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - (void)atexit(ERR_free_strings); -+#endif - - /* - * In earlier versions, we called Property changes on: branches/2020Q3/net-mgmt/nsca-ng/files/patch-src_common_tls.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q3/net-mgmt/nsca-ng/pkg-descr =================================================================== --- branches/2020Q3/net-mgmt/nsca-ng/pkg-descr (revision 541228) +++ branches/2020Q3/net-mgmt/nsca-ng/pkg-descr (revision 541229) @@ -1,19 +1,19 @@ NSCA-ng provides a client-server pair which makes the Nagios command file accessible to remote systems. This allows for submitting passive check results, downtimes, and many other commands to Nagios or compatible monitoring solutions. The submitted data is queued by the NSCA-ng server if Nagios goes down. Multiple check results or commands can be submitted in one go, and multiline plugin output is fully supported. NSCA-ng uses TLS encryption and shared-secret authentication with per-client passwords, as well as fine-grained authorization control. This package contains the NSCA-ng server, which is written in C and uses an event-driven architecture. Disk I/O is avoided unless the data cannot be submitted in one go due to its size (on Linux, the threshold is 4kB). In this case, the data is handed over to Nagios via asynchronously written files. NSCA clients cannot talk to NSCA-ng servers (nor vice versa), but NSCA and NSCA-ng servers can happily run side by side. -WWW: http://www.nsca-ng.org/ +WWW: https://github.com/weiss/nsca-ng Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 541228) +++ branches/2020Q3 (revision 541229) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r541222