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

update to nagios 2.0b4

Browse Source
This commit is contained in:
sturm 2005-08-07 10:48:01 +00:00
parent 697f94b2db
commit ceeceb2866
5 changed files with 49 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/nagios/nagios/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.2 2005/07/25 19:23:47 sturm Exp $
# $OpenBSD: Makefile,v 1.3 2005/08/07 10:48:01 sturm Exp $
COMMENT= "host and service monitor"
COMMENT-web= "cgis and webpages for nagios"
V= 2.0b3
V= 2.0b4
DISTNAME= nagios-${V}
PKGNAME= ${DISTNAME}p0
PKGNAME-web= nagios-web-${V}p0
PKGNAME= ${DISTNAME}
PKGNAME-web= nagios-web-${V}
CATEGORIES= net
HOMEPAGE= http://www.nagios.org/
@ -25,7 +25,7 @@ SUBPACKAGE?=
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
BUILD_DEPENDS= :gd-*:graphics/gd
RUN_DEPENDS= ::net/nagios/plugins
RUN_DEPENDS= :nagios-plugins-*:net/nagios/plugins
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--datadir=/var/www/nagios \

8
net/nagios/nagios/distinfo
View File

@ -1,4 +1,4 @@
MD5 (nagios-2.0b3.tar.gz) = 051760458d961b6ee015b5932a8437c4
RMD160 (nagios-2.0b3.tar.gz) = 8f84a4406e1f4d5bd10d55a6fccbe58e01af489a
SHA1 (nagios-2.0b3.tar.gz) = 2bb8a58f68ba68f9e2914cd4a267bb9335b374d7
SIZE (nagios-2.0b3.tar.gz) = 1704070
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

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
--- configure.orig Tue Dec 14 03:18:58 2004
+++ configure Sun Jan 30 17:47:03 2005
$OpenBSD: patch-configure,v 1.2 2005/08/07 10:48:01 sturm Exp $
--- configure.orig Wed Aug 3 01:58:24 2005
+++ configure Wed Aug 3 12:38:09 2005
@@ -371,7 +371,7 @@ EOF
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
@ -10,23 +10,14 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
@@ -1901,7 +1901,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- THREADLIBS="$THREADLIBS -lpthread"
+ THREADLIBS="$THREADLIBS -pthread"
else
echo "$ac_t""no" 1>&6
fi
@@ -1910,14 +1910,14 @@ if test $ac_cv_lib_cma_pthread_create =
@@ -1834,14 +1834,14 @@ 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:1915: checking for pthread_create in -lpthread" >&5
-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:1915: checking for pthread_create in -pthread" >&5
+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
@ -35,9 +26,9 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1923 "configure"
#line 1847 "configure"
#include "confdefs.h"
@@ -1945,7 +1945,7 @@ LIBS="$ac_save_LIBS"
@@ -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
@ -46,34 +37,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
else
echo "$ac_t""no" 1>&6
fi
@@ -1953,14 +1953,14 @@ fi
if test $ac_cv_lib_pthread_pthread_create = yes; then
have_pthreads="yes"
else
- echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:1958: checking for pthread_mutex_init in -lpthread" >&5
+ echo $ac_n "checking for pthread_mutex_init in -pthread""... $ac_c" 1>&6
+echo "configure:1958: checking for pthread_mutex_init in -pthread" >&5
ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1966 "configure"
#include "confdefs.h"
@@ -1988,7 +1988,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- THREADLIBS="$THREADLIBS -lpthread"
+ THREADLIBS="$THREADLIBS -pthread"
else
echo "$ac_t""no" 1>&6
fi
@@ -2227,7 +2227,7 @@ cat >> confdefs.h <<EOF
@@ -2151,7 +2151,7 @@ cat >> confdefs.h <<EOF
#define DEFAULT_NAGIOS_GROUP "$nagios_grp"
EOF

27
net/nagios/nagios/patches/patch-include_config_h_in Normal file
View File

@ -0,0 +1,27 @@
$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>
-#undef HAVE_SYS_RESOURCE_H
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-
#undef HAVE_PWD_H
#ifdef HAVE_PWD_H
#include <pwd.h>
@@ -195,6 +190,11 @@
#undef HAVE_SYS_TIMEB_H
#if HAVE_SYS_TIMEB_H
#include <sys/timeb.h>
+#endif
+
+#undef HAVE_SYS_RESOURCE_H
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
#endif
#undef HAVE_SYS_IPC_H

6
net/nagios/nagios/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/07/25 16:32:06 sturm Exp $
@comment $OpenBSD: PLIST,v 1.2 2005/08/07 10:48:01 sturm Exp $
@newgroup _nagios:542
@newuser _nagios:542:_nagios:daemon:Nagios user:/var/www/nagios:/sbin/nologin
bin/nagiostats
@ -23,8 +23,10 @@ share/examples/nagios/resource.cfg
@sample ${CHROOT}/var/log/nagios/
@sample ${CHROOT}/var/log/nagios/archives/
@sample ${CHROOT}/var/nagios/
@sample ${CHROOT}/var/nagios/rw/
@sample /var/run/nagios/
@mode 775
@group www
@sample ${CHROOT}/var/nagios/rw/
@mode
@owner
@group