OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 14-Mar-2003 21:53:21
Branch: HEAD Handle: 2003031420531603
Modified files:
openpkg-re/vcheck vc.nagios
openpkg-src/nagios fsl.nagios nagios.spec rc.nagios
openpkg-web news.txt
Log:
cleanup and bugfix package
Summary:
Revision Changes Path
1.3 +1 -1 openpkg-re/vcheck/vc.nagios
1.2 +2 -2 openpkg-src/nagios/fsl.nagios
1.2 +40 -109 openpkg-src/nagios/nagios.spec
1.2 +3 -6 openpkg-src/nagios/rc.nagios
1.3681 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.nagios
============================================================================
$ cvs diff -u -r1.2 -r1.3 vc.nagios
--- openpkg-re/vcheck/vc.nagios 14 Mar 2003 19:30:38 -0000 1.2
+++ openpkg-re/vcheck/vc.nagios 14 Mar 2003 20:53:16 -0000 1.3
@@ -3,7 +3,7 @@
prog nagios = {
version = 1.0
- url = http://switch.dl.sorceforge.net/sorceforge/nagios/
+ url = http://osdn.dl.sourceforge.net/sourceforge/nagios/
regex = nagios-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/fsl.nagios
============================================================================
$ cvs diff -u -r1.1 -r1.2 fsl.nagios
--- openpkg-src/nagios/fsl.nagios 14 Mar 2003 15:06:47 -0000 1.1
+++ openpkg-src/nagios/fsl.nagios 14 Mar 2003 20:53:19 -0000 1.2
@@ -1,8 +1,8 @@
##
-## fsl.nagios -- OSSP fsl configuration for nagios
+## fsl.nagios -- OSSP fsl configuration for Nagios
##
-ident nagio q{
+ident (nagio)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 nagios.spec
--- openpkg-src/nagios/nagios.spec 14 Mar 2003 15:06:47 -0000 1.1
+++ openpkg-src/nagios/nagios.spec 14 Mar 2003 20:53:19 -0000 1.2
@@ -25,9 +25,9 @@
# package information
Name: nagios
-Summary: Nagios� is a system and network monitoring application.
-URL: http://www.nagios.org
-Vendor: Ethan Galstad
+Summary: System and Network Monitoring
+URL: http://www.nagios.org/
+Vendor: Ethan Galstad
Packager: The OpenPKG Project
Distribution: OpenPKG [EVAL]
Group: Network
@@ -36,8 +36,9 @@
Release: 20030314
# list of sources
-Source0:
http://switch.dl.sorceforge.net/sorceforge/nagios/nagios-%{version}.tar.gz
-#Source1: rc.arpd
+Source0:
http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-%{version}.tar.gz
+Source1: rc.nagios
+Patch0: fsl.nagios
# build information
Prefix: %{l_prefix}
@@ -48,89 +49,42 @@
AutoReqProv: no
%description
- Nagios� is a system and network monitoring application. It watches hosts and
services
- that you specify, alerting you when things go bad and when they get better.
- Nagios was originally designed to run under Linux, although it should work
under most
- other unices as well.
- Some of the many features of Nagios� include:
- * Monitoring of network services (SMTP, POP3, HTTP, NNTP, PING, etc.)
- * Monitoring of host resources (processor load, disk usage, etc.)
- * Simple plugin design that allows users to easily develop their own service
checks
- * Parallelized service checks
- * Ability to define network host hierarchy using "parent" hosts, allowing
detection of
- and distinction between hosts that are down and those that are unreachable
- * Contact notifications when service or host problems occur and get resolved
- (via email, pager, or user-defined method)
- * Ability to define event handlers to be run during service or host events for
proactive
- problem resolution
- * Automatic log file rotation
- * Support for implementing redundant monitoring hosts
- * Optional web interface for viewing current network status, notification and
problem history,
- log file, etc.
-
-
+ Nagios is a system and network monitoring application. It watches
+ hosts and services that you specify, alerting you when things go bad
+ and when they get better.
%prep
%setup -q
%build
- %{l_shtool} subst \
- -e
's;localstatedir=.\${prefix}/var.;localstatedir="'%{l_prefix}'/var/nagios";g' \
- -e
's;datadir=.\${prefix}/share.;datadir="'%{l_prefix}'/share/nagios";g' \
- -e
's;sysconfdir=.\${prefix}/etc.;sysconfdir="'%{l_prefix}'/etc/nagios";g' \
- -e
's;libexecdir=.\${prefix}/libexec.;libexecdir="'%{l_prefix}'/libexec/nagios";g' \
- configure
-
- # Preconfigure the Path to traceroute
- (
- echo
"ac_cv_path_PATH_TO_TRACEROUTE=\${ac_cv_path_PATH_TO_TRACEROUTE=%{l_prefix}/sbin/traceroute}"
- ) >config.cache
-
-# %{l_shtool} subst \
-#-e
's;ac_cv_path_PATH_TO_TRACEROUTE=${ac_cv_path_PATH_TO_TRACEROUTE=/usr/sbin/traceroute};ac_cv_path_PATH_TO_TRACEROUTE=${ac_cv_path_PATH_TO_TRACEROUTE='%{l_prefix}'/sbin/traceroute};g'
\
-# config.cache
-
-
-# -e 's;GDLIBS="[^"]*";GDLIBS="-lgd -lz -lm -lpng -ljpeg";g' \
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- LDFLAGS="%{l_ldflags}" \
- ./configure \
- --prefix=%{l_prefix} \
- --with-cgiurl=%{l_prefix}/cgi/nagios \
- --with-htmurl=%{l_prefix}/share/nagios \
- --with-nagios-user=%{l_musr} \
- --with-nagios-grp=%{l_mgrp} \
- --with-gd-lib=%{l_prefix}/lib \
- --with-gd-inc=%{l_prefix}/include \
- --with-lockfile=%{l_prefix}/var/nagios/nagios.lock
-# %{l_shtool} subst \
-# -e 's;/var/run/arpd.pid;%{l_prefix}/var/arpd/arpd.pid;' \
-# arpd.c
-
-# %{l_shtool} subst \
-# -e 's;/var/run/arpd.pid;%{l_prefix}/var/arpd/arpd.pid;' \
-# arpd.8
-
-# CC="%{l_cc}" \
-# CFLAGS="%{l_cflags -O}"
-# ./configure \
-# --prefix=%{l_prefix} \
-# --with-libdnet=%{l_prefix} \
-# --with-libpcap=%{l_prefix} \
-# --with-libevent=%{l_prefix}
-# %{l_shtool} subst \
-# -e "s;^\\(arpd_LDADD.*\\)$;\\1 `%{l_prefix}/bin/fsl-config --all --ldflags
--libs`;" \
-# Makefile
+ %{l_shtool} subst \
+ -e
's;localstatedir=.\${prefix}/var.;localstatedir="'%{l_prefix}'/var/nagios";g' \
+ -e 's;datadir=.\${prefix}/share.;datadir="'%{l_prefix}'/share/nagios";g' \
+ -e 's;sysconfdir=.\${prefix}/etc.;sysconfdir="'%{l_prefix}'/etc/nagios";g' \
+ -e
's;libexecdir=.\${prefix}/libexec.;libexecdir="'%{l_prefix}'/libexec/nagios";g' \
+ configure
+ echo "ac_cv_path_PATH_TO_TRACEROUTE=%{l_prefix}/sbin/traceroute}" >config.cache
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --with-cgiurl=%{l_prefix}/cgi/nagios \
+ --with-htmurl=%{l_prefix}/share/nagios \
+ --with-nagios-user=%{l_musr} \
+ --with-nagios-grp=%{l_mgrp} \
+ --with-gd-lib=%{l_prefix}/lib \
+ --with-gd-inc=%{l_prefix}/include \
+ --with-lockfile=%{l_prefix}/var/nagios/nagios.lock
+
%{l_make} all %{l_mflags} \
- GDLIBS="-lgd -lm -lpng -lz -ljpeg" \
+ GDLIBS="-lgd -lm -lpng -lz -ljpeg" \
LOGDIR=%{l_prefix}/var/nagios \
CFGDIR=%{l_prefix}/etc/nagios \
BINDIR=%{l__prefix}/bin \
CGIDIR=%{l_prefix}/cgi/nagios \
HTMLDIR=%{l_prefix}/share/nagios \
-
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
@@ -148,14 +102,6 @@
$RPM_BUILD_ROOT%{l_prefix}/share/nagios/images/logos \
$RPM_BUILD_ROOT%{l_prefix}/share/nagios/ssi
-# %{l_make} install %{l_mflags} \
-# INSTALL=%{l_shtool}' install -c'
-
-# %{l_make} install-html %{l_mflags} \
-
-
- # install files
-
# install nagios
%{l_shtool} install -c -s -m 755 \
base/nagios $RPM_BUILD_ROOT%{l_prefix}/sbin/
@@ -176,11 +122,8 @@
%{l_shtool} install -c -m 644 \
html/docs/images/*.* $RPM_BUILD_ROOT%{l_prefix}/share/nagios/docs/images/
%{l_shtool} install -c -m 644 \
- html/images/*.gif $RPM_BUILD_ROOT%{l_prefix}/share/nagios/images/
- %{l_shtool} install -c -m 644 \
- html/images/*.jpg $RPM_BUILD_ROOT%{l_prefix}/share/nagios/images/
- %{l_shtool} install -c -m 644 \
- html/images/*.png $RPM_BUILD_ROOT%{l_prefix}/share/nagios/images/
+ html/images/*.gif html/images/*.jpg html/images/*.png \
+ $RPM_BUILD_ROOT%{l_prefix}/share/nagios/images/
%{l_shtool} install -c -m 644 \
html/images/logos/*.* $RPM_BUILD_ROOT%{l_prefix}/share/nagios/images/logos/
@@ -188,7 +131,7 @@
%{l_shtool} install -c -s -m 755 \
cgi/*.cgi $RPM_BUILD_ROOT%{l_prefix}/cgi/nagios/
- # install sample config
+ # install sample config
%{l_shtool} install -c -m 644 \
sample-config/nagios.cfg $RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
%{l_shtool} install -c -m 644 \
@@ -201,10 +144,8 @@
sample-config/template-object/contactgroups.cfg
$RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
%{l_shtool} install -c -m 644 \
sample-config/template-object/contacts.cfg
$RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
-# %{l_shtool} install -c -m 644 \
-# sample-config/template-object/dependencies.cfg
$RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
-# instead of using the depencies.cfg
- touch $RPM_BUILD_ROOT%{l_prefix}/etc/nagios/dependencies.cfg
+ %{l_shtool} install -c -m 644 \
+ /dev/null $RPM_BUILD_ROOT%{l_prefix}/etc/nagios/dependencies.cfg
%{l_shtool} install -c -m 644 \
sample-config/template-object/escalations.cfg
$RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
%{l_shtool} install -c -m 644 \
@@ -218,7 +159,6 @@
%{l_shtool} install -c -m 644 \
sample-config/template-object/timeperiods.cfg
$RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
-
# install start script
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
@@ -227,21 +167,12 @@
# install fsl
%{l_shtool} install -c -m 644 \
- -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE fsl.nagios} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
-# %{l_shtool} install -c -m 755 \
-# -e 's;@l_prefix@;%{l_prefix};g' \
-# -e 's;@l_susr@;%{l_susr};g' \
-# %{SOURCE rc.arpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-# %{l_shtool} install -c -m 644 \
-# -e 's;@l_prefix@;%{l_prefix};g' \
-# %{SOURCE fsl.arpd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-# %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
-# %{l_make} install-config %{l_mflags}
-
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE fsl.nagios} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/etc/fsl'
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/rc.nagios
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.nagios
--- openpkg-src/nagios/rc.nagios 14 Mar 2003 15:06:47 -0000 1.1
+++ openpkg-src/nagios/rc.nagios 14 Mar 2003 20:53:19 -0000 1.2
@@ -1,6 +1,6 @@
[EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
##
-## rc.nagios -- Run-Commands for nagios
+## rc.nagios -- Run-Commands for Nagios
##
%config
@@ -9,8 +9,7 @@
%start -p 200
opServiceEnabled nagios || exit 0
- @l_prefix@/sbin/nagios -d @l_prefix@/etc/nagios/$nagios_cfg \
- >/dev/null 2>&1
+ @l_prefix@/sbin/nagios -d @l_prefix@/etc/nagios/$nagios_cfg >/dev/null 2>&1
%stop -p 200
opServiceEnabled nagios || exit 0
@@ -24,9 +23,7 @@
kill -TERM `cat @l_prefix@/var/nagios/nagios.lock`
sleep 2
fi
- @l_prefix@/bin/nagios \
- -d @l_prefix@/etc/nagios/$nagios_cfg \
- >/dev/null 2>&1
+ @l_prefix@/bin/nagios -d @l_prefix@/etc/nagios/$nagios_cfg >/dev/null 2>&1
%reload -u @l_susr@
opServiceEnabled nagios || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3680 -r1.3681 news.txt
--- openpkg-web/news.txt 14 Mar 2003 20:17:21 -0000 1.3680
+++ openpkg-web/news.txt 14 Mar 2003 20:53:17 -0000 1.3681
@@ -1,3 +1,4 @@
+14-Mar-2003: Upgraded package: P<nagios-1.0-20030314>
14-Mar-2003: Upgraded package: P<arpd-0.2-20030314>
13-Mar-2003: Upgraded package: P<xterm-1.75-20030313>
13-Mar-2003: Upgraded package: P<screen-3.9.15-20030313>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
