Date: Mon, 6 Jul 2009 20:28:35 +0930 (CST) From: Jarrod Sayers <jarrod@netleader.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/136374: [maintainer-update] net-mgmt/nagios-devel: Update to 3.1.2 Message-ID: <200907061058.n66AwZIu026849@manhattan.netleader.com.au> Resent-Message-ID: <200907061120.n66BK212022628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136374 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios-devel: Update to 3.1.2 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 06 11:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 7.2-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD manhattan.netleader.com.au 7.2-RELEASE-p2 FreeBSD 7.2-RELEASE-p2 #17: Sun Jun 28 13:45:03 CST 2009 root@manhattan.netleader.com.au:/usr/obj/usr/src/sys/MANHATTAN i386 >Description: Update to Nagios 3.1.2. Files modified: - ports/net-mgmt/nagios-devel/Makefile - ports/net-mgmt/nagios-devel/distinfo - ports/net-mgmt/nagios-devel/files/patch-configure.in - ports/net-mgmt/nagios-devel/files/patch-html__Makefile.in - ports/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html - ports/net-mgmt/nagios-devel/pkg-plist Files removed: - ports/net-mgmt/nagios-devel/files/patch-base__utils.c >How-To-Repeat: >Fix: Downloadable diff: http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-devel-3.1.2.diff --- net-mgmt-nagios-devel-3.1.2.diff begins here --- diff -ruN ports/net-mgmt/nagios-devel.orig/Makefile ports/net-mgmt/nagios-devel/Makefile --- ports/net-mgmt/nagios-devel.orig/Makefile 2009-05-10 09:47:54.000000000 +0930 +++ ports/net-mgmt/nagios-devel/Makefile 2009-07-06 19:50:50.000000000 +0930 @@ -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 @@ --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 -ruN ports/net-mgmt/nagios-devel.orig/distinfo ports/net-mgmt/nagios-devel/distinfo --- ports/net-mgmt/nagios-devel.orig/distinfo 2009-02-26 10:27:03.000000000 +1030 +++ ports/net-mgmt/nagios-devel/distinfo 2009-07-06 19:19:49.000000000 +0930 @@ -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 -ruN ports/net-mgmt/nagios-devel.orig/files/patch-base__utils.c ports/net-mgmt/nagios-devel/files/patch-base__utils.c --- ports/net-mgmt/nagios-devel.orig/files/patch-base__utils.c 2009-05-03 11:59:44.000000000 +0930 +++ ports/net-mgmt/nagios-devel/files/patch-base__utils.c 1970-01-01 09:30:00.000000000 +0930 @@ -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 -ruN ports/net-mgmt/nagios-devel.orig/files/patch-configure.in ports/net-mgmt/nagios-devel/files/patch-configure.in --- ports/net-mgmt/nagios-devel.orig/files/patch-configure.in 2008-01-20 06:14:28.000000000 +1030 +++ ports/net-mgmt/nagios-devel/files/patch-configure.in 2009-07-06 19:25:39.000000000 +0930 @@ -41,18 +41,6 @@ AC_SUBST(INSTALL_OPTS) AC_ARG_WITH(command_user,--with-command-user=<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 -ruN ports/net-mgmt/nagios-devel.orig/files/patch-html__Makefile.in ports/net-mgmt/nagios-devel/files/patch-html__Makefile.in --- ports/net-mgmt/nagios-devel.orig/files/patch-html__Makefile.in 2009-02-26 10:27:03.000000000 +1030 +++ ports/net-mgmt/nagios-devel/files/patch-html__Makefile.in 2009-07-06 19:28:00.000000000 +0930 @@ -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 -ruN ports/net-mgmt/nagios-devel.orig/files/patch-html__docs__configcgi.html ports/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html --- ports/net-mgmt/nagios-devel.orig/files/patch-html__docs__configcgi.html 2009-02-26 10:27:03.000000000 +1030 +++ ports/net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html 2009-07-06 19:33:41.000000000 +0930 @@ -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 @@ - </tr> - <tr> - <td valign=top>Example:</td> --<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td> -+<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td> - </tr> - </table> - +--- 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 @@ + + <td valign=top>Example:</td> + +-<td><font color="red"><strong>ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$</strong></font></td> ++<td><font color="red"><strong>ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$</strong></font></td> + + </tr> + diff -ruN ports/net-mgmt/nagios-devel.orig/pkg-plist ports/net-mgmt/nagios-devel/pkg-plist --- ports/net-mgmt/nagios-devel.orig/pkg-plist 2009-02-26 10:27:03.000000000 +1030 +++ ports/net-mgmt/nagios-devel/pkg-plist 2009-07-06 19:56:39.000000000 +0930 @@ -192,6 +192,8 @@ %%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 --- net-mgmt-nagios-devel-3.1.2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907061058.n66AwZIu026849>