switch to icinga's fork of NSCA; some fixes & v6 support

- drop urandom->arandom patch, not needed now all /dev/*random act the same
This commit is contained in:
sthen 2011-08-16 08:35:07 +00:00
parent c6b57c5fa7
commit 8750aab166
5 changed files with 20 additions and 43 deletions

View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2010/11/19 22:31:35 espie Exp $
# $OpenBSD: Makefile,v 1.7 2011/08/16 08:35:07 sthen Exp $
COMMENT-main= nagios service check acceptor
COMMENT-client= nagios service check acceptor - client
VERSION= 2.7.2
DISTNAME= nsca-${VERSION}
# packaged from Icinga git repo.
VERSION= 2.8pre20100831
DISTNAME= icinga-nsca-${VERSION}
WRKDIST= ${WRKDIR}/icinga-nsca
PKGNAME-main= nsca-${VERSION}
PKGNAME-client= nsca-client-${VERSION}
CATEGORIES= net
@ -17,7 +19,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
MASTER_SITES= http://spacehopper.org/mirrors/
WANTLIB= c mcrypt>=8
LIB_DEPENDS= security/libmcrypt

View File

@ -1,5 +1,5 @@
MD5 (nsca-2.7.2.tar.gz) = M6mOeXX2M6lInXqJOO1hMQ==
RMD160 (nsca-2.7.2.tar.gz) = lRqp0AjwCO6TJXfOA8hIppaVVks=
SHA1 (nsca-2.7.2.tar.gz) = leB3hYCyNe1H8ClKue9mnDf5ct0=
SHA256 (nsca-2.7.2.tar.gz) = +0HjtTZzUjUFZkP7EhhzVcZWG5FImWwJPo+t3U/O1XE=
SIZE (nsca-2.7.2.tar.gz) = 104953
MD5 (icinga-nsca-2.8pre20100831.tar.gz) = gnOUYjiF86EPpfulUFKwcA==
RMD160 (icinga-nsca-2.8pre20100831.tar.gz) = 2/2xiNQpWzdrTY9kNtp8ffbwub4=
SHA1 (icinga-nsca-2.8pre20100831.tar.gz) = vVAaffSr8HbDbPdKkIdBDIghobU=
SHA256 (icinga-nsca-2.8pre20100831.tar.gz) = 7iDpPeYq/kLV7AApBQrtaerg9/roFfv+JJMSEiKU3NQ=
SIZE (icinga-nsca-2.8pre20100831.tar.gz) = 108995

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_nsca_c,v 1.2 2007/09/05 20:28:44 sturm Exp $
--- src/nsca.c.orig Tue Jul 3 21:57:28 2007
+++ src/nsca.c Sat Sep 1 08:29:23 2007
@@ -26,7 +26,7 @@ static int server_port=DEFAULT_SERVER_PORT;
static char server_address[16]="0.0.0.0";
$OpenBSD: patch-src_nsca_c,v 1.3 2011/08/16 08:35:07 sthen Exp $
--- src/nsca.c.orig Tue Aug 31 13:47:57 2010
+++ src/nsca.c Thu Apr 21 12:31:16 2011
@@ -28,7 +28,7 @@ char *server_address=NULL;
static int socket_timeout=DEFAULT_SOCKET_TIMEOUT;
static int log_facility=LOG_DAEMON;
-static char config_file[MAX_INPUT_BUFFER]="nsca.cfg";
+static char config_file[MAX_INPUT_BUFFER]="%%SYSCONFDIR%%/nsca.cfg";

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_send_nsca_c,v 1.1.1.1 2006/03/13 18:18:22 bernd Exp $
--- src/send_nsca.c.orig Fri Feb 3 13:09:00 2006
+++ src/send_nsca.c Fri Feb 3 13:09:14 2006
$OpenBSD: patch-src_send_nsca_c,v 1.2 2011/08/16 08:35:07 sthen Exp $
--- src/send_nsca.c.orig Tue Aug 31 13:47:57 2010
+++ src/send_nsca.c Thu Apr 21 12:31:16 2011
@@ -25,7 +25,7 @@ time_t start_time,end_time;
int server_port=DEFAULT_SERVER_PORT;
char *server_port=DEFAULT_SERVER_PORT;
char server_name[MAX_HOST_ADDRESS_LENGTH];
char password[MAX_INPUT_BUFFER]="";
-char config_file[MAX_INPUT_BUFFER]="send_nsca.cfg";

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_utils_c,v 1.2 2007/09/05 20:28:44 sturm Exp $
--- src/utils.c.orig Thu Feb 2 19:45:06 2006
+++ src/utils.c Sat Sep 1 08:29:23 2007
@@ -278,8 +278,8 @@ static void generate_transmitted_iv(char *transmitted_
/* fill IV buffer with data that's as random as possible */
/*********************************************************/
- /* try to get seed value from /dev/urandom, as its a better source of entropy */
- fp=fopen("/dev/urandom","r");
+ /* try to get seed value from /dev/arandom, as its a better source of entropy */
+ fp=fopen("/dev/arandom","r");
if(fp!=NULL){
seed=fgetc(fp);
fclose(fp);
@@ -409,8 +409,8 @@ void randomize_buffer(char *buffer,int buffer_size){
ends and the rest of the buffer (padded randomly) starts.
***************************************************************/
- /* try to get seed value from /dev/urandom, as its a better source of entropy */
- fp=fopen("/dev/urandom","r");
+ /* try to get seed value from /dev/arandom, as its a better source of entropy */
+ fp=fopen("/dev/arandom","r");
if(fp!=NULL){
seed=fgetc(fp);
fclose(fp);