View | Details | Raw Unified | Return to bug 77478
Collapse All | Expand All

(-)nagios/Makefile (-31 / +10 lines)
Lines 6-16 Link Here
6
#
6
#
7
7
8
PORTNAME=	nagios
8
PORTNAME=	nagios
9
PORTVERSION=	1.2
9
PORTVERSION=	2.0.b2
10
PORTREVISION=	1
11
CATEGORIES=	net-mgmt
10
CATEGORIES=	net-mgmt
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=nagios
12
MASTER_SITE_SUBDIR=nagios
13
DISTNAME=	nagios-2.0b2
14
14
15
MAINTAINER=	blaz@si.FreeBSD.org
15
MAINTAINER=	blaz@si.FreeBSD.org
16
COMMENT=	Extremely powerful network monitoring system
16
COMMENT=	Extremely powerful network monitoring system
Lines 20-25 Link Here
20
20
21
USE_GETOPT_LONG=yes
21
USE_GETOPT_LONG=yes
22
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
23
USE_AUTOCONF_VER=       259
23
USE_RC_SUBR=	yes
24
USE_RC_SUBR=	yes
24
USE_PERL5_BUILD=yes
25
USE_PERL5_BUILD=yes
25
26
Lines 31-40 Link Here
31
NAGIOSGROUP?=	nagios
32
NAGIOSGROUP?=	nagios
32
NAGIOSDIR?=	/var/spool/nagios
33
NAGIOSDIR?=	/var/spool/nagios
33
34
34
OPTIONS=	MYSQL "MySQL suport" off \
35
		PGSQL "PostgreSQL suport" off \
36
		FILE_PERFDATA "Save performance data to files" off
37
38
.include <bsd.port.pre.mk>
35
.include <bsd.port.pre.mk>
39
36
40
CPPFLAGS=	-I${LOCALBASE}/include
37
CPPFLAGS=	-I${LOCALBASE}/include
Lines 43-52 Link Here
43
		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
40
		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
44
		LIBS="-L${LOCALBASE}/lib -lgd"
41
		LIBS="-L${LOCALBASE}/lib -lgd"
45
CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
42
CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
46
		--with-command-grp=www \
43
		--with-command-group=www \
47
		--with-nagios-user=${NAGIOSUSER} \
44
		--with-nagios-user=${NAGIOSUSER} \
48
		--with-nagios-grp=${NAGIOSGROUP} \
45
		--with-nagios-group=${NAGIOSGROUP} \
49
		--with-template-objects \
50
		--sbindir=${PREFIX}/share/nagios/cgi-bin \
46
		--sbindir=${PREFIX}/share/nagios/cgi-bin \
51
		--libexecdir=${PREFIX}/libexec/nagios \
47
		--libexecdir=${PREFIX}/libexec/nagios \
52
		--datadir=${PREFIX}/share/nagios \
48
		--datadir=${PREFIX}/share/nagios \
Lines 54-79 Link Here
54
		--localstatedir=${NAGIOSDIR} \
50
		--localstatedir=${NAGIOSDIR} \
55
		--prefix=${PREFIX}
51
		--prefix=${PREFIX}
56
52
57
.if defined(WITH_MYSQL)
58
USE_MYSQL=	yes
59
CONFIGURE_ARGS+=	--with-mysql-lib=${LOCALBASE}/lib/mysql \
60
		--with-mysql-inc=${LOCALBASE}/include/mysql \
61
		--with-mysql-xdata
62
.else
63
CONFIGURE_ARGS+=	--with-template-extinfo
64
.endif
65
66
.if defined(WITH_FILE_PERFDATA)
67
CONFIGURE_ARGS+=--with-file-perfdata
68
.endif
69
70
.if defined(WITH_PGSQL)
71
USE_PGSQL=	yes
72
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
73
		--with-pgsql-inc=${LOCALBASE}/pgsql \
74
		--with-pgsql-xdata
75
.endif
76
77
SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
53
SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
78
		-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
54
		-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
79
		-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
55
		-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
Lines 83-90 Link Here
83
INSTALL_TARGET=	all install config install-config install-commandmode
59
INSTALL_TARGET=	all install config install-config install-commandmode
84
60
85
pre-build:
61
pre-build:
86
	for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
62
	for myfile in nagios.sh INSTALL DEINSTALL MESSAGE; do \
87
		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
63
		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${myfile}.tmpl >${WRKDIR}/$${myfile}; \
88
	done
64
	done
89
65
90
pre-install:
66
pre-install:
Lines 92-97 Link Here
92
68
93
post-install:
69
post-install:
94
	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
70
	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
71
	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw
72
	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives
73
	@${CHOWN} ${NAGIOSUSER}:www ${NAGIOSDIR}/rw
95
	@${CAT} ${PKGMESSAGE}
74
	@${CAT} ${PKGMESSAGE}
96
75
97
.include <bsd.port.post.mk>
76
.include <bsd.port.post.mk>
(-)nagios/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f
1
MD5 (nagios-2.0b2.tar.gz) = 72d21f961b28519529e8c96c35051fbc
2
SIZE (nagios-1.2.tar.gz) = 1625322
2
SIZE (nagios-2.0b2.tar.gz) = 1703671
(-)nagios/files/nagios.sh.tmpl (-2 / +2 lines)
Lines 20-26 Link Here
20
20
21
NagiosBin=${prefix}/bin/nagios
21
NagiosBin=${prefix}/bin/nagios
22
NagiosCfg=${prefix}/etc/nagios/nagios.cfg
22
NagiosCfg=${prefix}/etc/nagios/nagios.cfg
23
NagiosVar=/var/spool/nagios
23
NagiosVar=%%NAGIOSDIR%%
24
NagiosLog=${NagiosVar}/status.log
24
NagiosLog=${NagiosVar}/status.log
25
NagiosTmp=${NagiosVar}/nagios.tmp
25
NagiosTmp=${NagiosVar}/nagios.tmp
26
NagiosSav=${NagiosVar}/status.sav
26
NagiosSav=${NagiosVar}/status.sav
Lines 30-36 Link Here
30
pidfile=${NagiosRun}
30
pidfile=${NagiosRun}
31
command=${NagiosBin}
31
command=${NagiosBin}
32
command_args="-d $NagiosCfg"
32
command_args="-d $NagiosCfg"
33
nagios_user=nagios
33
nagios_user=%%NAGIOSUSER%%
34
34
35
start_precmd=start_precmd
35
start_precmd=start_precmd
36
stop_postcmd=stop_postcmd
36
stop_postcmd=stop_postcmd
(-)nagios/files/patch-Makefile.in (+25 lines)
Line 0 Link Here
1
--- Makefile.in.orig	Thu Dec 16 02:15:24 2004
2
+++ Makefile.in	Sat Feb 12 13:52:19 2005
3
@@ -204,14 +204,14 @@
4
 
5
 
6
 install-config:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
8
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
9
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
10
-	$(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
11
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
12
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
13
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
14
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
15
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
16
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
17
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
18
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
19
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
20
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
21
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
22
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
23
 
24
 	@echo ""
25
 	@echo "*** Sample config file installed ***"
(-)nagios/files/patch-aa (-37 lines)
Lines 1-37 Link Here
1
--- Makefile.in.orig	Sat Oct 26 02:47:15 2002
2
+++ Makefile.in	Tue Nov 26 13:58:29 2002
3
@@ -28,7 +28,7 @@
4
 INSTALL_OPTS=@INSTALL_OPTS@
5
 COMMAND_OPTS=@COMMAND_OPTS@
6
 INIT_DIR=@init_dir@
7
-INIT_OPTS=-o root -g root
8
+INIT_OPTS=-o root -g wheel
9
 CGICFGDIR=$(CGIDIR)
10
 PERLDIR=@PERLDIR@
11
 
12
@@ -196,6 +196,8 @@
13
 	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
14
 	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample
15
 	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample
16
+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample
17
+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample
18
 
19
 	@echo ""
20
 	@echo "*** Sample config file installed ***"
21
@@ -215,7 +217,7 @@
22
 
23
 install-daemoninit:
24
 	$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
25
-	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
26
+	$(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
27
 
28
 	@echo ""
29
 	@echo "*** Init script installed ***"
30
@@ -238,7 +240,6 @@
31
 
32
 install-commandmode:
33
 	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
34
-	chmod g+s $(DESTDIR)$(LOGDIR)/rw
35
 
36
 	@echo ""
37
 	@echo "*** External command directory configured ***"
(-)nagios/files/patch-ab (-10 lines)
Lines 1-10 Link Here
1
--- base/Makefile.in.orig	Mon Nov 11 04:52:13 2002
2
+++ base/Makefile.in	Tue Nov 26 13:46:41 2002
3
@@ -105,7 +105,6 @@
4
 devclean: clean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
8
 	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
9
 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
10
 
(-)nagios/files/patch-ad (-69 lines)
Lines 1-69 Link Here
1
--- configure.orig	Tue Feb  3 05:45:08 2004
2
+++ configure	Wed Feb  4 21:26:46 2004
3
@@ -11,7 +11,7 @@
4
 ac_help=
5
 ac_default_prefix=/usr/local
6
 # Any additions from configure.in:
7
-ac_default_prefix=/usr/local/nagios
8
+#ac_default_prefix=/usr/local/nagios
9
 ac_help="$ac_help
10
 --with-nagios-user=<user> sets user name to run nagios"
11
 ac_help="$ac_help
12
@@ -576,9 +576,9 @@
13
 # Prefer explicitly selected file to automatically selected ones.
14
 if test -z "$CONFIG_SITE"; then
15
   if test "x$prefix" != xNONE; then
16
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
17
+    CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
18
   else
19
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
20
+    CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
21
   fi
22
 fi
23
 for ac_site_file in $CONFIG_SITE; do
24
@@ -2608,6 +2608,9 @@
25
 	LDFLAGS="${LDFLAGS} -L${withval}"
26
 	LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
27
 	
28
+else
29
+	LDFLAGS="${LDFLAGS} -L/usr/local/lib"
30
+	LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
31
 fi
32
 
33
 # Check whether --with-gd-inc or --without-gd-inc was given.
34
@@ -2615,6 +2618,8 @@
35
   withval="$with_gd_inc"
36
   
37
 	CFLAGS="${CFLAGS} -I${withval}"
38
+else
39
+	CFLAGS="${CFLAGS} -I/usr/local/include/gd"
40
 	
41
 fi
42
 
43
@@ -2692,14 +2697,14 @@
44
 
45
 
46
 	
47
-		echo $ac_n "checking for gdImagePng in -lgd (order 1)""... $ac_c" 1>&6
48
-echo "configure:2697: checking for gdImagePng in -lgd (order 1)" >&5
49
+		echo $ac_n "checking for gdImagePng in -lgd1 (order 1)""... $ac_c" 1>&6
50
+echo "configure:2697: checking for gdImagePng in -lgd1 (order 1)" >&5
51
 					ac_lib_var=`echo gd'_'gdImagePng'_'1 | sed 'y%./+-%__p_%'`
52
 	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53
   echo $ac_n "(cached) $ac_c" 1>&6
54
 else
55
   ac_save_LIBS="$LIBS"
56
-	LIBS="-lgd $ICONV -lz -lm -lpng -ljpeg $LIBS"
57
+	LIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg $LIBS"
58
 	cat > conftest.$ac_ext <<EOF
59
 #line 2705 "configure"
60
 #include "confdefs.h"
61
@@ -2729,7 +2734,7 @@
62
 	  echo "$ac_t""yes" 1>&6
63
 	  
64
 			GDLIBFOUND=yep
65
-			GDLIBS="-lgd $ICONV -lz -lm -lpng -ljpeg"
66
+			GDLIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg"
67
 	        	
68
 	else
69
 	  echo "$ac_t""no" 1>&6
(-)nagios/files/patch-ae (-11 lines)
Lines 1-11 Link Here
1
--- configure.in.orig	Mon Apr 30 17:22:35 2001
2
+++ configure.in	Tue May  1 19:36:54 2001
3
@@ -1,7 +1,7 @@
4
 dnl Process this -*-m4-*- file with autoconf to produce a configure script.
5
 AC_INIT(base/nagios.c)
6
 AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
7
-AC_PREFIX_DEFAULT(/usr/local/nagios)
8
+AC_PREFIX_DEFAULT(/usr/local)
9
 
10
 dnl Figure out how to invoke "install" and what install options to use.
11
 AC_PROG_INSTALL
(-)nagios/files/patch-ag (-31 lines)
Lines 1-31 Link Here
1
--- functions	Fri Apr  7 11:11:34 2000
2
+++ functions.new	Sat Jun 10 13:31:31 2000
3
@@ -11,7 +11,7 @@
4
 #
5
 
6
 # First set up a default search path.
7
-PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
8
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
9
 export PATH
10
 
11
 # Get a sane screen width
12
@@ -174,7 +174,7 @@
13
 #	fi
14
 
15
 	# Finally try to extract it from ps
16
-	pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
17
+	pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
18
 	if [ "$pid" != "" ] ; then
19
 	        echo $pid
20
 	        return 0
21
@@ -206,8 +206,8 @@
22
 	        fi
23
 	fi
24
 
25
-	# See if /var/lock/subsys/$1 exists
26
-	if [ -f /var/lock/subsys/$1 ]; then
27
+	# See if /var/spool/lock/$1 exists
28
+	if [ -f /var/spool/lock/$1 ]; then
29
 		echo "$1 dead but subsys locked"
30
 		return 2
31
 	fi
(-)nagios/files/patch-ai (-25 lines)
Lines 1-25 Link Here
1
--- daemon-init.in.orig	Thu Apr 18 06:27:13 2002
2
+++ daemon-init.in	Sun May 19 08:39:29 2002
3
@@ -68,11 +68,8 @@
4
 
5
 
6
 # Source function library
7
-# Solaris doesn't have an rc.d directory, so do a test first
8
-if [ -f /etc/rc.d/init.d/functions ]; then
9
-	. /etc/rc.d/init.d/functions
10
-elif [ -f /etc/init.d/functions ]; then
11
-	. /etc/init.d/functions
12
+if [ -f @sysconfdir@/functions ]; then
13
+. @sysconfdir@/functions
14
 fi
15
 
16
 prefix=@prefix@
17
@@ -102,7 +99,7 @@
18
 
19
 	start)
20
 		echo "Starting network monitor: nagios"
21
-		su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
22
+		su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
23
 		rm -f $NagiosCmd
24
 		$NagiosBin -d $NagiosCfg
25
 		if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi
(-)nagios/files/patch-base-Makefile.in (+16 lines)
Line 0 Link Here
1
--- base/Makefile.in.orig	Thu Dec  9 07:48:33 2004
2
+++ base/Makefile.in	Sat Feb 12 13:59:24 2005
3
@@ -181,10 +181,10 @@
4
 devclean: distclean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
8
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
9
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
10
+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
11
 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
12
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
13
+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
14
 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
15
 
16
 
(-)nagios/files/patch-cgi-Makefile.in (+14 lines)
Line 0 Link Here
1
--- cgi/Makefile.in.orig	Mon Oct 25 07:05:54 2004
2
+++ cgi/Makefile.in	Sat Feb 12 13:56:57 2005
3
@@ -191,9 +191,9 @@
4
 devclean: distclean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
8
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
9
 	for file in *.cgi; do \
10
-		$(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
11
+		$(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
12
 		$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
13
 	done
14
 
(-)nagios/files/patch-configure.in (+19 lines)
Line 0 Link Here
1
--- configure.in.orig	Thu Feb 10 02:00:10 2005
2
+++ configure.in	Sat Feb 12 14:11:54 2005
3
@@ -6,7 +6,6 @@
4
 
5
 AC_INIT(base/nagios.c)
6
 AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h)
7
-AC_PREFIX_DEFAULT(/usr/local/nagios)
8
 
9
 PKG_NAME=nagios
10
 PKG_VERSION="2.0b2"
11
@@ -137,7 +136,7 @@
12
 AC_SUBST(nagios_grp)
13
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
14
 AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
15
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
16
+INSTALL_OPTS="-o root -g wheel"
17
 AC_SUBST(INSTALL_OPTS)
18
 
19
 AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)
(-)nagios/files/patch-html-Makefile.in (+61 lines)
Line 0 Link Here
1
--- html/Makefile.in.orig	Thu Apr 10 05:46:02 2003
2
+++ html/Makefile.in	Sat Feb 12 13:53:16 2005
3
@@ -33,37 +33,37 @@
4
 devclean: distclean
5
 
6
 install:
7
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
8
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
9
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
10
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
11
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
12
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
13
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
14
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
15
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
16
-	$(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
17
-	$(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
18
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
19
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
20
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
21
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
22
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
23
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
24
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
25
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
26
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
27
+	$(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
28
+	$(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
29
 	for file in *.html; \
30
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
31
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
32
 	for file in media/*.wav; \
33
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
34
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
35
 	for file in stylesheets/*.css; \
36
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
37
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
38
 	for file in contexthelp/*.html; \
39
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
40
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
41
 	for file in docs/*.html; \
42
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
43
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
44
 	for file in docs/images/*.*; \
45
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
46
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
47
 	for file in images/*.gif; \
48
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
49
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
50
 	for file in images/*.jpg; \
51
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
52
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
53
 	for file in images/*.png; \
54
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
55
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
56
 	for file in images/logos/*.*; \
57
-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
58
+	do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
59
 
60
 
61
 
(-)nagios/files/patch-xcddb.c (-11 lines)
Lines 1-11 Link Here
1
--- xdata/xcddb.c.orig	Thu May 16 04:46:11 2002
2
+++ xdata/xcddb.c	Thu Mar  6 23:14:25 2003
3
@@ -51,7 +51,7 @@
4
 #endif
5
 
6
 #ifdef USE_XCDPGSQL
7
-#include <pgsql/libpq-fe.h>
8
+#include <libpq-fe.h>
9
 #endif
10
 
11
 
(-)nagios/files/patch-xdddb.c (-11 lines)
Lines 1-11 Link Here
1
--- xdata/xdddb.c.orig	Thu May 16 04:46:11 2002
2
+++ xdata/xdddb.c	Thu Mar  6 23:15:54 2003
3
@@ -51,7 +51,7 @@
4
 #endif
5
 
6
 #ifdef USE_XDDPGSQL
7
-#include <pgsql/libpq-fe.h>
8
+#include <libpq-fe.h>
9
 #endif
10
 
11
 
(-)nagios/files/patch-xeddb.c (-11 lines)
Lines 1-11 Link Here
1
--- xdata/xeddb.c.orig	Tue Feb 26 05:04:09 2002
2
+++ xdata/xeddb.c	Thu Mar  6 23:16:01 2003
3
@@ -44,7 +44,7 @@
4
 #endif
5
 
6
 #ifdef USE_XEDPGSQL
7
-#include <pgsql/libpq-fe.h>
8
+#include <libpq-fe.h>
9
 #endif
10
 
11
 
(-)nagios/files/patch-xrddb.c (-11 lines)
Lines 1-11 Link Here
1
--- xdata/xrddb.c.orig	Thu May 16 04:46:11 2002
2
+++ xdata/xrddb.c	Thu Mar  6 23:16:14 2003
3
@@ -43,7 +43,7 @@
4
 #endif
5
 
6
 #ifdef USE_XRDPGSQL
7
-#include <pgsql/libpq-fe.h>
8
+#include <libpq-fe.h>
9
 #endif
10
 
11
 
(-)nagios/files/patch-xsddb.c (-11 lines)
Lines 1-11 Link Here
1
--- xdata/xsddb.c.orig	Thu Nov 14 03:51:34 2002
2
+++ xdata/xsddb.c	Thu Mar  6 23:16:27 2003
3
@@ -48,7 +48,7 @@
4
 #endif
5
 
6
 #ifdef USE_XSDPGSQL
7
-#include <pgsql/libpq-fe.h>
8
+#include <libpq-fe.h>
9
 #endif
10
 
11
 
(-)nagios/pkg-plist (-22 / +12 lines)
Lines 3-25 Link Here
3
@exec mkdir -p /var/spool/nagios/rw
3
@exec mkdir -p /var/spool/nagios/rw
4
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
4
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
5
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
5
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
6
@exec chown nagios:nogroup /var/spool/nagios/rw
6
@exec chown nagios:www /var/spool/nagios/rw
7
bin/nagios
7
bin/nagios
8
bin/nagiostats
9
etc/nagios/bigger.cfg-sample
8
etc/nagios/cgi.cfg-sample
10
etc/nagios/cgi.cfg-sample
9
etc/nagios/checkcommands.cfg-sample
11
etc/nagios/checkcommands.cfg-sample
10
etc/nagios/contactgroups.cfg-sample
12
etc/nagios/minimal.cfg-sample
11
etc/nagios/contacts.cfg-sample
12
etc/nagios/dependencies.cfg-sample
13
etc/nagios/escalations.cfg-sample
14
etc/nagios/hostextinfo.cfg-sample
15
etc/nagios/hostgroups.cfg-sample
16
etc/nagios/hosts.cfg-sample
17
etc/nagios/misccommands.cfg-sample
13
etc/nagios/misccommands.cfg-sample
18
etc/nagios/nagios.cfg-sample
14
etc/nagios/nagios.cfg-sample
19
etc/nagios/resource.cfg-sample
15
etc/nagios/resource.cfg-sample
20
etc/nagios/serviceextinfo.cfg-sample
21
etc/nagios/services.cfg-sample
22
etc/nagios/timeperiods.cfg-sample
23
etc/rc.d/nagios.sh
16
etc/rc.d/nagios.sh
24
share/nagios/cgi-bin/avail.cgi
17
share/nagios/cgi-bin/avail.cgi
25
share/nagios/cgi-bin/cmd.cgi
18
share/nagios/cgi-bin/cmd.cgi
Lines 71-76 Link Here
71
share/nagios/contexthelp/I6.html
64
share/nagios/contexthelp/I6.html
72
share/nagios/contexthelp/I7.html
65
share/nagios/contexthelp/I7.html
73
share/nagios/contexthelp/I8.html
66
share/nagios/contexthelp/I8.html
67
share/nagios/contexthelp/I9.html
74
share/nagios/contexthelp/J1.html
68
share/nagios/contexthelp/J1.html
75
share/nagios/contexthelp/K1.html
69
share/nagios/contexthelp/K1.html
76
share/nagios/contexthelp/L1.html
70
share/nagios/contexthelp/L1.html
Lines 133-138 Link Here
133
share/nagios/docs/images/interleaved2.png
127
share/nagios/docs/images/interleaved2.png
134
share/nagios/docs/images/interleaved3.png
128
share/nagios/docs/images/interleaved3.png
135
share/nagios/docs/images/logofullsize.png
129
share/nagios/docs/images/logofullsize.png
130
share/nagios/docs/images/mrtgstats.png
136
share/nagios/docs/images/network-heirarchy.png
131
share/nagios/docs/images/network-heirarchy.png
137
share/nagios/docs/images/network-outage1.png
132
share/nagios/docs/images/network-outage1.png
138
share/nagios/docs/images/network-outage2.png
133
share/nagios/docs/images/network-outage2.png
Lines 147-152 Link Here
147
share/nagios/docs/images/statetransitions2.png
142
share/nagios/docs/images/statetransitions2.png
148
share/nagios/docs/about.html
143
share/nagios/docs/about.html
149
share/nagios/docs/addons.html
144
share/nagios/docs/addons.html
145
share/nagios/docs/adaptive.html
150
share/nagios/docs/beginners.html
146
share/nagios/docs/beginners.html
151
share/nagios/docs/cgiauth.html
147
share/nagios/docs/cgiauth.html
152
share/nagios/docs/cgiincludes.html
148
share/nagios/docs/cgiincludes.html
Lines 166-172 Link Here
166
share/nagios/docs/escalations.html
162
share/nagios/docs/escalations.html
167
share/nagios/docs/eventhandlers.html
163
share/nagios/docs/eventhandlers.html
168
share/nagios/docs/extcommands.html
164
share/nagios/docs/extcommands.html
169
share/nagios/docs/faqs.html
170
share/nagios/docs/flapping.html
165
share/nagios/docs/flapping.html
171
share/nagios/docs/freshness.html
166
share/nagios/docs/freshness.html
172
share/nagios/docs/funstuff.html
167
share/nagios/docs/funstuff.html
Lines 174-183 Link Here
174
share/nagios/docs/indirectchecks.html
169
share/nagios/docs/indirectchecks.html
175
share/nagios/docs/installing.html
170
share/nagios/docs/installing.html
176
share/nagios/docs/installweb.html
171
share/nagios/docs/installweb.html
177
share/nagios/docs/int-portsentry.html
178
share/nagios/docs/int-snmptrap.html
172
share/nagios/docs/int-snmptrap.html
179
share/nagios/docs/int-tcpwrappers.html
173
share/nagios/docs/int-tcpwrappers.html
180
share/nagios/docs/macros.html
174
share/nagios/docs/macros.html
175
share/nagios/docs/nagiostats.html
181
share/nagios/docs/networkoutages.html
176
share/nagios/docs/networkoutages.html
182
share/nagios/docs/networkreachability.html
177
share/nagios/docs/networkreachability.html
183
share/nagios/docs/notifications.html
178
share/nagios/docs/notifications.html
Lines 201-214 Link Here
201
share/nagios/docs/verifyconfig.html
196
share/nagios/docs/verifyconfig.html
202
share/nagios/docs/volatileservices.html
197
share/nagios/docs/volatileservices.html
203
share/nagios/docs/whatsnew.html
198
share/nagios/docs/whatsnew.html
204
share/nagios/docs/xdata-db.html
205
share/nagios/docs/xeddefault.html
206
share/nagios/docs/xedtemplate.html
207
share/nagios/docs/xoddefault.html
208
share/nagios/docs/xodtemplate.html
199
share/nagios/docs/xodtemplate.html
209
share/nagios/docs/xpddefault.html
200
share/nagios/docs/xpddefault.html
210
share/nagios/docs/xpdfile.html
201
share/nagios/docs/xpdfile.html
211
share/nagios/images/ack.gif
202
share/nagios/images/ack.gif
203
share/nagios/images/action.gif
212
share/nagios/images/command.png
204
share/nagios/images/command.png
213
share/nagios/images/comment.gif
205
share/nagios/images/comment.gif
214
share/nagios/images/contexthelp1.gif
206
share/nagios/images/contexthelp1.gif
Lines 216-221 Link Here
216
share/nagios/images/critical.png
208
share/nagios/images/critical.png
217
share/nagios/images/delay.gif
209
share/nagios/images/delay.gif
218
share/nagios/images/delete.gif
210
share/nagios/images/delete.gif
211
share/nagios/images/detail.gif
219
share/nagios/images/disabled.gif
212
share/nagios/images/disabled.gif
220
share/nagios/images/down.gif
213
share/nagios/images/down.gif
221
share/nagios/images/downtime.gif
214
share/nagios/images/downtime.gif
Lines 247-257 Link Here
247
share/nagios/images/redundancy.png
240
share/nagios/images/redundancy.png
248
share/nagios/images/restart.gif
241
share/nagios/images/restart.gif
249
share/nagios/images/right.gif
242
share/nagios/images/right.gif
250
share/nagios/images/sbconfig.png
251
share/nagios/images/sbgeneral.png
252
share/nagios/images/sblogo.jpg
243
share/nagios/images/sblogo.jpg
253
share/nagios/images/sbmonitor.png
254
share/nagios/images/sbreport.png
255
share/nagios/images/serviceevent.gif
244
share/nagios/images/serviceevent.gif
256
share/nagios/images/start.gif
245
share/nagios/images/start.gif
257
share/nagios/images/status.gif
246
share/nagios/images/status.gif
Lines 285-290 Link Here
285
share/nagios/stylesheets/avail.css
274
share/nagios/stylesheets/avail.css
286
share/nagios/stylesheets/checksanity.css
275
share/nagios/stylesheets/checksanity.css
287
share/nagios/stylesheets/cmd.css
276
share/nagios/stylesheets/cmd.css
277
share/nagios/stylesheets/common.css
288
share/nagios/stylesheets/config.css
278
share/nagios/stylesheets/config.css
289
share/nagios/stylesheets/extinfo.css
279
share/nagios/stylesheets/extinfo.css
290
share/nagios/stylesheets/histogram.css
280
share/nagios/stylesheets/histogram.css
Lines 308-314 Link Here
308
@dirrm share/nagios/media
298
@dirrm share/nagios/media
309
@dirrm share/nagios/ssi
299
@dirrm share/nagios/ssi
310
@dirrm share/nagios/stylesheets
300
@dirrm share/nagios/stylesheets
311
@dirrm share/nagios
301
@unexec rmdir %D/share/nagios 2>/dev/null || true
312
@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true
302
@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true
313
@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true
303
@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true
314
@unexec rmdir /var/spool/nagios 2>/dev/null || true
304
@unexec rmdir /var/spool/nagios 2>/dev/null || true

Return to bug 77478