OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Apr-2004 16:25:55
Branch: HEAD Handle: 2004040115255500
Added files:
openpkg-src/nagios etc.tar
Modified files:
openpkg-src/nagios nagios.spec rc.nagios
Log:
import contributions from Cyrus Hamidi; add/require/fix OpenLDAP
support
Summary:
Revision Changes Path
1.1 BLOB openpkg-src/nagios/etc.tar
1.27 +15 -5 openpkg-src/nagios/nagios.spec
1.14 +1 -1 openpkg-src/nagios/rc.nagios
____________________________________________________________________________
(cd openpkg-src/nagios && \
uudecode <<'@@ .' && \
xdelta patch etc.tar.xdelta /dev/null etc.tar && \
rm -f etc.tar.xdelta)
Index: openpkg-src/nagios/etc.tar
============================================================================
begin 664 etc.tar.xdelta
M)5A$6C`P-"4````(`!$`$`````````````````````!S:&EE;&$N-3,R-#8N
M;G5L;'-H:65L82XU,S(T-BYA;&[EMAIL PROTECTED]"```
M``````-C8&[EMAIL PROTECTED]@,[EMAIL PROTECTED]&SAEO?CC5`<[EMAIL PROTECTED]<````````
)52581%HP,#0E
`
end
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/nagios.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 nagios.spec
--- openpkg-src/nagios/nagios.spec 9 Mar 2004 09:40:19 -0000 1.26
+++ openpkg-src/nagios/nagios.spec 1 Apr 2004 14:25:55 -0000 1.27
@@ -38,7 +38,7 @@
Group: Network
License: GNU
Version: %{V_nagios}
-Release: 20040309
+Release: 20040401
# package options
%option with_eperl yes
@@ -47,14 +47,15 @@
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-%{V_nagios}.tar.gz
Source1:
http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-%{V_nagios_plugins}.tar.gz
-Source2: rc.nagios
-Source3: fsl.nagios
+Source2: etc.tar
+Source3: rc.nagios
+Source4: fsl.nagios
Patch0: nagios.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, traceroute, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040130, traceroute, gcc, openldap
PreReq: OpenPKG, openpkg >= 20040130, traceroute, apache, MTA
BuildPreReq: zlib, jpeg, png, gd
PreReq: zlib, jpeg, png, gd
@@ -87,7 +88,12 @@
%prep
%setup -q
%setup -q -T -D -a 1
+ %setup -q -T -D -a 2
%patch -p0
+ %{l_shtool} subst \
+ -e 's;LDAPLIBS=.*-lldap.*;LDAPLIBS="-lldap -llber -lssl -lcrypto";' \
+ -e 's;LDAPINCLUDE=.*-I.*;LDAPINCLUDE="-I/%{l_prefix}/include";' \
+ nagios-plugins-1.3.1/configure
%build
CC="%{l_cc}" \
@@ -152,6 +158,10 @@
%{l_make} install DESTDIR="$RPM_BUILD_ROOT"
) || exit $?
+ # install default configuration
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ etc/* $RPM_BUILD_ROOT%{l_prefix}/etc/nagios/
+
# install start script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.nagios} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ -185,7 +195,7 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} nagios stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/nagios/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/nagios/log/*.log* >/dev/null 2>&1 || true
rm -f $RPM_INSTALL_PREFIX/var/nagios/status.sav >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nagios/rc.nagios
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.nagios
--- openpkg-src/nagios/rc.nagios 27 Nov 2003 14:02:39 -0000 1.13
+++ openpkg-src/nagios/rc.nagios 1 Apr 2004 14:25:55 -0000 1.14
@@ -43,7 +43,7 @@
%start -u @l_musr@
rcService nagios enable yes || exit 0
rcService nagios active yes && exit 0
- @l_prefix@/sbin/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
%stop -u @l_musr@
rcService nagios enable yes || exit 0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
