cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nagios 2.0b5, mostly bug fixes

Browse Source
This commit is contained in:
sturm 2005-11-20 21:20:25 +00:00
parent 697b54ec3c
commit 6cf6a767aa
4 changed files with 81 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/nagios/nagios/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2005/11/18 16:45:55 sturm Exp $
# $OpenBSD: Makefile,v 1.9 2005/11/20 21:20:25 sturm Exp $
COMMENT= "host and service monitor"
COMMENT-web= "cgis and webpages for nagios"
V= 2.0b4
V= 2.0b5
DISTNAME= nagios-${V}
PKGNAME= ${DISTNAME}p2
PKGNAME-web= nagios-web-${V}p1
PKGNAME-web= nagios-web-${V}
CATEGORIES= net
HOMEPAGE= http://www.nagios.org/
@ -25,6 +24,7 @@ SUBPACKAGE?=
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
BUILD_DEPENDS= :gd-*:graphics/gd
LIB_DEPENDS= ltdl.4::devel/libtool,-ltdl
RUN_DEPENDS= :nagios-plugins-*:net/nagios/plugins
CONFIGURE_STYLE=gnu
@ -58,10 +58,11 @@ PREFIX= /var/www
# overwrite RUN_DEPENDS in order to only depend on the base package
. if ${FLAVOR:L:Mchroot}
WANTLIB=
LIB_DEPENDS=
RUN_DEPENDS= nagios:nagios-${V}-chroot:net/nagios/nagios,chroot
. else
MODULES+= converters/libiconv
LIB_DEPENDS+= gd::graphics/gd
WANTLIB+= fontconfig freetype jpeg png z
LIB_DEPENDS= gd::graphics/gd
RUN_DEPENDS= nagios:nagios-${V}-!chroot:net/nagios/nagios
. endif
. else

8
net/nagios/nagios/distinfo
View File

@ -1,4 +1,4 @@
MD5 (nagios-2.0b4.tar.gz) = 206ea26230d1360cc8871c0fee80b4c4
RMD160 (nagios-2.0b4.tar.gz) = 8e27fd13f51b80114894565d60ed53718bd55f8f
SHA1 (nagios-2.0b4.tar.gz) = 72ba370b1987c27cab4708320837a69b1beec545
SIZE (nagios-2.0b4.tar.gz) = 1710293
MD5 (nagios-2.0b5.tar.gz) = 52e05ac1a2d1ab1e6869183912c9d27f
RMD160 (nagios-2.0b5.tar.gz) = 3d10c6b1a3d16014dbc14ea1f867880332c52b4c
SHA1 (nagios-2.0b5.tar.gz) = cd0eddb3dd206a50e72a252ed033aceb42d0d209
SIZE (nagios-2.0b5.tar.gz) = 1729378

103
net/nagios/nagios/patches/patch-configure
View File

@ -1,66 +1,89 @@
$OpenBSD: patch-configure,v 1.3 2005/11/18 16:45:56 sturm Exp $
--- configure.orig Wed Aug 3 01:58:24 2005
+++ configure Thu Nov 17 08:44:41 2005
@@ -371,7 +371,7 @@ EOF
$OpenBSD: patch-configure,v 1.4 2005/11/20 21:20:25 sturm Exp $
--- configure.orig Tue Nov 15 05:23:35 2005
+++ configure Sat Nov 19 19:49:54 2005
@@ -571,7 +571,7 @@ do
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir="$ac_optarg" ;;
+ sysconfdir="$ac_optarg/nagios" ;;
- sysconfdir=$ac_optarg ;;
+ sysconfdir=$ac_optarg/nagios ;;
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
@@ -1834,14 +1834,14 @@ if test $ac_cv_lib_cma_pthread_create =
ac_prev=target_alias ;;
@@ -4283,13 +4283,13 @@ if test $ac_cv_lib_cma_pthread_create =
have_pthreads="yes"
fi
-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1839: checking for pthread_create in -lpthread" >&5
+echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
+echo "configure:1839: checking for pthread_create in -pthread" >&5
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_save_LIBS="$LIBS"
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1847 "configure"
#include "confdefs.h"
@@ -1869,7 +1869,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4348,19 +4348,19 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
if test $ac_cv_lib_pthread_pthread_create = yes; then
- THREADLIBS="$THREADLIBS -lpthread"
+ THREADLIBS="$THREADLIBS -pthread"
else
echo "$ac_t""no" 1>&6
fi
@@ -2151,7 +2151,7 @@ cat >> confdefs.h <<EOF
if test $ac_cv_lib_pthread_pthread_create = yes; then
have_pthreads="yes"
else
- echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
+echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4419,7 +4419,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6
if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
- THREADLIBS="$THREADLIBS -lpthread"
+ THREADLIBS="$THREADLIBS -pthread"
fi
if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
@@ -4809,7 +4809,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$nagios_grp"
EOF
_ACEOF
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS=""
# Check whether --with-command_user or --without-command_user was given.
@@ -2446,7 +2446,7 @@ echo "configure:2444: checking for gdIma
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5132,7 +5132,7 @@ echo $ECHO_N "checking for gdImagePng in
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_save_LIBS="$LIBS"
- LIBS="-lgd -lttf -lpng -ljpeg -lz -lm $LIBS"
+ LIBS="-lgd $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2452 "configure"
#include "confdefs.h"
@@ -2476,7 +2476,7 @@ fi
echo "$ac_t""yes" 1>&6
+ LIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5191,7 +5191,7 @@ fi
echo "${ECHO_T}yes" >&6
GDLIBFOUND=yep
- GDLIBS="-lgd -lttf -lpng -ljpeg -lz -lm"
+ GDLIBS="-lgd"
+ GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm"
else
echo "$ac_t""no" 1>&6
echo "$as_me:$LINENO: result: no" >&5

14
net/nagios/nagios/patches/patch-include_config_h_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-include_config_h_in,v 1.1 2005/08/07 10:48:01 sturm Exp $
--- include/config.h.in.orig Wed Aug 3 10:55:04 2005
+++ include/config.h.in Wed Aug 3 10:56:30 2005
@@ -108,11 +108,6 @@
#include <stdio.h>
#include <stdlib.h>
$OpenBSD: patch-include_config_h_in,v 1.2 2005/11/20 21:20:25 sturm Exp $
--- include/config.h.in.orig Fri Aug 12 00:15:25 2005
+++ include/config.h.in Sat Nov 19 19:48:05 2005
@@ -115,11 +115,6 @@
#endif
#endif
-#undef HAVE_SYS_RESOURCE_H
-#ifdef HAVE_SYS_RESOURCE_H
@ -13,7 +13,7 @@ $OpenBSD: patch-include_config_h_in,v 1.1 2005/08/07 10:48:01 sturm Exp $
#undef HAVE_PWD_H
#ifdef HAVE_PWD_H
#include <pwd.h>
@@ -195,6 +190,11 @@
@@ -188,6 +183,11 @@
#undef HAVE_SYS_TIMEB_H
#if HAVE_SYS_TIMEB_H
#include <sys/timeb.h>