diff options
| author | Wesley Shields <wxs@FreeBSD.org> | 2009-05-04 15:36:05 +0000 |
|---|---|---|
| committer | Wesley Shields <wxs@FreeBSD.org> | 2009-05-04 15:36:05 +0000 |
| commit | ce03a68eef1882d8f468fc69548754f164053527 (patch) | |
| tree | 83e6fcebd3d329521c0305a12997aea9487d8b1f /net-mgmt/nagios2 | |
| parent | 3c713d889cdb2f47ab7f519e4519de5c89e69f7a (diff) | |
| download | ports-ce03a68eef1882d8f468fc69548754f164053527.tar.gz ports-ce03a68eef1882d8f468fc69548754f164053527.zip | |
Notes
Diffstat (limited to 'net-mgmt/nagios2')
| -rw-r--r-- | net-mgmt/nagios2/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/nagios2/files/patch-base-utils.c | 42 |
2 files changed, 45 insertions, 1 deletions
diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile index 11a2477fa873..5436664077e4 100644 --- a/net-mgmt/nagios2/Makefile +++ b/net-mgmt/nagios2/Makefile @@ -7,7 +7,7 @@ PORTNAME= nagios PORTVERSION= 2.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -72,6 +72,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LIBS="-L${LOCALBASE}/lib" \ PERL=${PERL} +MAKE_JOBS_UNSAFE= yes + INSTALL_TARGET= install install-commandmode install-config PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ diff --git a/net-mgmt/nagios2/files/patch-base-utils.c b/net-mgmt/nagios2/files/patch-base-utils.c new file mode 100644 index 000000000000..6ef4e98ad12d --- /dev/null +++ b/net-mgmt/nagios2/files/patch-base-utils.c @@ -0,0 +1,42 @@ +--- base/utils.c.orig 2008-02-11 03:50:10.000000000 +1030 ++++ base/utils.c 2009-05-03 11:58:03.000000000 +0930 +@@ -4553,7 +4553,7 @@ + /* initializes embedded perl interpreter */ + int init_embedded_perl(char **env){ + #ifdef EMBEDDEDPERL +- char *embedding[] = { "", "" }; ++ char **embedding = NULL; + int exitstatus = 0; + char buffer[MAX_INPUT_BUFFER]; + int argc = 2; +@@ -4571,6 +4571,21 @@ + + else{ + ++ embedding = malloc(argc * sizeof(char *)); ++ if (embedding == NULL) { ++ use_embedded_perl = FALSE; ++ snprintf(buffer, sizeof(buffer), "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n"); ++ buffer[sizeof(buffer) - 1] = '\0'; ++ write_to_logs_and_console(buffer, NSLOG_RUNTIME_ERROR, TRUE); ++ } else { ++ embedding[0] = malloc(sizeof(char)); ++ if (embedding[0] == NULL) { ++ use_embedded_perl = FALSE; ++ snprintf(buffer, sizeof(buffer), "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n"); ++ buffer[sizeof(buffer) - 1] = '\0'; ++ write_to_logs_and_console(buffer, NSLOG_RUNTIME_ERROR, TRUE); ++ } else { ++ *embedding[0] = '\0'; + embedding[1]=p1_file; + + use_embedded_perl=TRUE; +@@ -4584,6 +4599,8 @@ + write_to_logs_and_console(buffer,NSLOG_RUNTIME_ERROR,TRUE); + } + } ++ } ++ } + + /* a fatal error occurred... */ + if(use_embedded_perl==FALSE){ |