Index: branches/2017Q4/net-mgmt/nsca/Makefile =================================================================== --- branches/2017Q4/net-mgmt/nsca/Makefile (revision 453279) +++ branches/2017Q4/net-mgmt/nsca/Makefile (revision 453280) @@ -1,68 +1,69 @@ # Created by: Paul Dlug # $FreeBSD$ PORTNAME= nsca PORTVERSION= 2.9.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/nsca-2.x/nsca-${PORTVERSION} MAINTAINER= mm@FreeBSD.org COMMENT= Nagios Service Check Acceptor LICENSE= GPLv2 #.if !defined(_BUILDING_NSCA_CLIENT) #RUN_DEPENDS= nagios:net-mgmt/nagios #.endif LIB_DEPENDS= libmcrypt.so:security/libmcrypt .if !defined(_BUILDING_NSCA_CLIENT) CONFLICTS= nsca-2.7.* nsca27-* .else PKGNAMESUFFIX= -client CONFLICTS= nsca-client-2.7.* nsca27-* .endif GNU_CONFIGURE= yes USES= perl5 CONFIGURE_ARGS= --prefix=${PREFIX} --localstatedir=/var/spool/nagios DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= DOCS .if !defined(_BUILDING_NSCA_CLIENT) USE_RC_SUBR= nsca PLIST_SUB+= SERVER="" WITHOUT_CLIENT= yes PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES+= pkg-message .else PLIST_SUB+= SERVER="@comment " PKGMESSAGE= ${WRKDIR}/pkg-message.client SUB_FILES+= pkg-message.client .endif .if defined(_BUILDING_NSCA_CLIENT) PLIST_SUB+= CLIENT="" .else PLIST_SUB+= CLIENT="@comment " .endif DOCS= Changelog LEGAL README SECURITY do-install: .if defined(_BUILDING_NSCA_CLIENT) ${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${STAGEDIR}${PREFIX}/sbin/send_nsca ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios ${INSTALL_DATA} ${WRKSRC}/sample-config/send_nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/send_nsca.cfg-sample .else ${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${STAGEDIR}${PREFIX}/sbin/nsca ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios ${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg ${STAGEDIR}${PREFIX}/etc/nagios/nsca.cfg-sample .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include Index: branches/2017Q4/net-mgmt/nsca/files/patch-src_nsca.c =================================================================== --- branches/2017Q4/net-mgmt/nsca/files/patch-src_nsca.c (nonexistent) +++ branches/2017Q4/net-mgmt/nsca/files/patch-src_nsca.c (revision 453280) @@ -0,0 +1,11 @@ +--- src/nsca.c.orig 2017-04-20 16:25:28 UTC ++++ src/nsca.c +@@ -917,7 +917,7 @@ static void accept_connection(int sock, + return; + + /* try and handle temporary errors */ +- if(errno==EWOULDBLOCK || errno==EINTR || errno==ECHILD){ ++ if(errno==EWOULDBLOCK || errno==EINTR || errno==ECHILD || errno==ECONNABORTED){ + if(mode==MULTI_PROCESS_DAEMON) + sleep(1); + else Property changes on: branches/2017Q4/net-mgmt/nsca/files/patch-src_nsca.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 453279) +++ branches/2017Q4 (revision 453280) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r453279