From bdb8b7bd3f8f19d6b9d5bcc15c619f3b3917079d Mon Sep 17 00:00:00 2001 From: Wesley Shields Date: Mon, 13 Jul 2009 14:48:38 +0000 Subject: - Update to 3.1.2 PR: ports/136374 Submitted by: Jarrod Sayers Security: 3ebd4cb5-657f-11de-883a-00e0815b8da8 --- net-mgmt/nagios-devel/Makefile | 4 +-- net-mgmt/nagios-devel/distinfo | 6 ++-- net-mgmt/nagios-devel/files/patch-base__utils.c | 38 ---------------------- net-mgmt/nagios-devel/files/patch-configure.in | 12 ------- .../nagios-devel/files/patch-html__Makefile.in | 10 ++++-- .../files/patch-html__docs__configcgi.html | 22 ++++++------- net-mgmt/nagios-devel/pkg-plist | 2 ++ 7 files changed, 25 insertions(+), 69 deletions(-) delete mode 100644 net-mgmt/nagios-devel/files/patch-base__utils.c (limited to 'net-mgmt/nagios-devel') diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile index b16ada7c05a7..860166febe58 100644 --- a/net-mgmt/nagios-devel/Makefile +++ b/net-mgmt/nagios-devel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nagios -PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTVERSION= 3.1.2 CATEGORIES= net-mgmt MASTER_SITES= SF PKGNAMESUFFIX= -devel @@ -59,6 +58,7 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-cgiurl=${NAGIOSCGIURL} \ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ + --datarootdir=${PREFIX}/${NAGIOSWWWDIR} \ --datadir=${PREFIX}/${NAGIOSWWWDIR} \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${NAGIOSDIR} \ diff --git a/net-mgmt/nagios-devel/distinfo b/net-mgmt/nagios-devel/distinfo index 8f71ecfb7f44..85f714b4f345 100644 --- a/net-mgmt/nagios-devel/distinfo +++ b/net-mgmt/nagios-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (nagios-3.1.0.tar.gz) = 02d3b0e13f772481d0ac9e00bdc3e979 -SHA256 (nagios-3.1.0.tar.gz) = 30b81eb7943805b129d1db18bb67386feb998f9e6464cb2efbea0756499b2651 -SIZE (nagios-3.1.0.tar.gz) = 2724545 +MD5 (nagios-3.1.2.tar.gz) = f3c60428cba14264c709749182b8d93e +SHA256 (nagios-3.1.2.tar.gz) = 216800ea2ad1f8b1adccc2dccfa6bbdf63223ffe5109d18bea71ffb9a126b846 +SIZE (nagios-3.1.2.tar.gz) = 3172982 diff --git a/net-mgmt/nagios-devel/files/patch-base__utils.c b/net-mgmt/nagios-devel/files/patch-base__utils.c deleted file mode 100644 index bb8e2a150879..000000000000 --- a/net-mgmt/nagios-devel/files/patch-base__utils.c +++ /dev/null @@ -1,38 +0,0 @@ ---- base/utils.c.orig 2009-01-26 01:12:34.000000000 +1030 -+++ base/utils.c 2009-05-03 11:59:28.000000000 +0930 -@@ -3660,7 +3660,7 @@ - /* initializes embedded perl interpreter */ - int init_embedded_perl(char **env){ - #ifdef EMBEDDEDPERL -- char *embedding[]={ "", "" }; -+ char **embedding = NULL; - int exitstatus=0; - char *temp_buffer=NULL; - int argc=2; -@@ -3676,6 +3676,17 @@ - - else{ - -+ embedding = malloc(argc * sizeof(char *)); -+ if (embedding == NULL) { -+ use_embedded_perl = FALSE; -+ logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n"); -+ } else { -+ embedding[0] = malloc(sizeof(char)); -+ if (embedding[0] == NULL) { -+ use_embedded_perl = FALSE; -+ logit(NSLOG_RUNTIME_ERROR, TRUE, "Error: Unable to allocate memory for embedded Perl interpreter! (see ports/131993)\n"); -+ } else { -+ *embedding[0] = '\0'; - embedding[1]=p1_file; - - use_embedded_perl=TRUE; -@@ -3687,6 +3698,8 @@ - logit(NSLOG_RUNTIME_ERROR,TRUE,"Error: Could not allocate memory for embedded Perl interpreter!\n"); - } - } -+ } -+ } - - /* a fatal error occurred... */ - if(use_embedded_perl==FALSE){ diff --git a/net-mgmt/nagios-devel/files/patch-configure.in b/net-mgmt/nagios-devel/files/patch-configure.in index 58ac6002360c..f8601c6c3afe 100644 --- a/net-mgmt/nagios-devel/files/patch-configure.in +++ b/net-mgmt/nagios-devel/files/patch-configure.in @@ -41,18 +41,6 @@ AC_SUBST(INSTALL_OPTS) AC_ARG_WITH(command_user,--with-command-user= sets user name for command access,command_user=$withval,command_user=$nagios_user) -@@ -520,9 +528,9 @@ - fi - - dnl Try and locate glib --GLIB_INCLUDE=`pkg-config --cflags glib-2.0` -+GLIB_INCLUDE="" - AC_SUBST(GLIB_INCLUDE) --GLIB_LIBS=`pkg-config --libs glib-2.0` -+GLIB_LIBS="" - AC_SUBST(GLIB_LIBS) - if test x$GLIB_LIBS != x; then - AC_DEFINE_UNQUOTED(HAVE_GLIB) @@ -667,6 +675,9 @@ AC_DEFINE_UNQUOTED(EMBEDDEDPERL) diff --git a/net-mgmt/nagios-devel/files/patch-html__Makefile.in b/net-mgmt/nagios-devel/files/patch-html__Makefile.in index f6b60db75a2b..12516ac1b168 100644 --- a/net-mgmt/nagios-devel/files/patch-html__Makefile.in +++ b/net-mgmt/nagios-devel/files/patch-html__Makefile.in @@ -1,6 +1,6 @@ ---- html/Makefile.in.orig 2008-12-15 04:30:46.000000000 +1030 -+++ html/Makefile.in 2009-02-25 10:02:59.000000000 +1030 -@@ -33,42 +33,42 @@ +--- html/Makefile.in.orig 2009-06-17 13:27:21.000000000 +0930 ++++ html/Makefile.in 2009-07-06 19:27:38.000000000 +0930 +@@ -33,46 +33,46 @@ devclean: distclean install: @@ -28,6 +28,10 @@ + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi + $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs + # Remove old HTML files (PHP files are used now) + rm -f $(DESTDIR)$(HTMLDIR)/index.html + rm -f $(DESTDIR)$(HTMLDIR)/main.html + rm -f $(DESTDIR)$(HTMLDIR)/side.html for file in *.php; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done + do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done diff --git a/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html b/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html index 26ae4d890eaf..e7161eb5b3e6 100644 --- a/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html +++ b/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html @@ -1,11 +1,11 @@ ---- html/docs/configcgi.html.orig 2008-11-04 17:28:39.000000000 -0500 -+++ html/docs/configcgi.html 2009-02-25 11:51:11.993677834 -0500 -@@ -616,7 +616,7 @@ - - - Example: --ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$ -+ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$ - - - +--- html/docs/configcgi.html.orig 2009-06-18 00:43:52.000000000 +0930 ++++ html/docs/configcgi.html 2009-07-06 19:33:10.000000000 +0930 +@@ -1250,7 +1250,7 @@ + + Example: + +-ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$ ++ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$ + + + diff --git a/net-mgmt/nagios-devel/pkg-plist b/net-mgmt/nagios-devel/pkg-plist index 5078b28117a4..8fef3cb8d518 100644 --- a/net-mgmt/nagios-devel/pkg-plist +++ b/net-mgmt/nagios-devel/pkg-plist @@ -192,6 +192,8 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/docs/images/multiple-templates1.png %%NAGIOSWWWDIR%%/docs/images/multiple-templates2.png %%NAGIOSWWWDIR%%/docs/images/nagios.jpg +%%NAGIOSWWWDIR%%/docs/images/nagiosexchange.png +%%NAGIOSWWWDIR%%/docs/images/nagiossupport.png %%NAGIOSWWWDIR%%/docs/images/ndoutils.png %%NAGIOSWWWDIR%%/docs/images/network-outage1.png %%NAGIOSWWWDIR%%/docs/images/network-outage2.png -- cgit v1.2.3