mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00
Code Issues Releases Activity

- Update to 3.1.2

Browse Source 
PR:		ports/136374
Submitted by:	Jarrod Sayers <jarrod@netleader.com.au>
Security:	3ebd4cb5-657f-11de-883a-00e0815b8da8
This commit is contained in:
Wesley Shields 2009-07-13 14:48:38 +00:00
parent d982725c51
commit bdb8b7bd3f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=237692
7 changed files with 25 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net-mgmt/nagios-devel/Makefile
View File

@ -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} \

6
net-mgmt/nagios-devel/distinfo
View File

@ -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

38
net-mgmt/nagios-devel/files/patch-base__utils.c
View File

@ -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){

12
net-mgmt/nagios-devel/files/patch-configure.in
View File

@ -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)

10
net-mgmt/nagios-devel/files/patch-html__Makefile.in
View File

@ -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

22
net-mgmt/nagios-devel/files/patch-html__docs__configcgi.html
View File

@ -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>

2
net-mgmt/nagios-devel/pkg-plist
View File

@ -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