rpms/nrpe/F-9 import.log, NONE, 1.1 nrpe-read-extra-conf.patch, NONE, 1.1 nrpe.sysconfig, NONE, 1.1 .cvsignore, 1.3, 1.4 nrpe.spec, 1.7, 1.8
Peter Lemenkov
peter at fedoraproject.org
Mon Feb 2 16:11:00 UTC 2009
- Previous message (by thread): rpms/nrpe/F-10 import.log, NONE, 1.1 nrpe-read-extra-conf.patch, NONE, 1.1 nrpe.sysconfig, NONE, 1.1 .cvsignore, 1.3, 1.4 nrpe.spec, 1.7, 1.8
- Next message (by thread): rpms/rhm/F-10 .cvsignore, 1.11, 1.12 rhm.spec, 1.34, 1.35 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/nrpe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18394/F-9
Modified Files:
.cvsignore nrpe.spec
Added Files:
import.log nrpe-read-extra-conf.patch nrpe.sysconfig
Log Message:
Fixed bz# 449174
--- NEW FILE import.log ---
nrpe-2_12-6_fc10:F-9:nrpe-2.12-6.fc10.src.rpm:1233590997
nrpe-read-extra-conf.patch:
--- NEW FILE nrpe-read-extra-conf.patch ---
--- init-script.in~ 2009-01-30 18:34:49.509236950 +0300
+++ init-script.in 2009-01-30 18:37:09.797598582 +0300
@@ -24,6 +24,11 @@
# Source networking configuration.
. /etc/sysconfig/network
+# Read configuration (environment etc.) for nrpe and plugins
+if [ -f /etc/sysconfig/nrpe ]; then
+ . /etc/sysconfig/nrpe
+fi
+
# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0
@@ -36,7 +41,7 @@
start)
# Start daemons.
echo -n "Starting nrpe: "
- daemon $NrpeBin -c $NrpeCfg -d
+ daemon $NrpeBin -c $NrpeCfg -d $NRPE_SSL_OPT
echo
touch $LockFile
;;
--- NEW FILE nrpe.sysconfig ---
# specify additional command line arguments for nrpe
NRPE_SSL_OPT=""
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 23 Feb 2007 20:47:05 -0000 1.3
+++ .cvsignore 2 Feb 2009 16:10:29 -0000 1.4
@@ -1 +1 @@
-nrpe-2.7.tar.gz
+nrpe-2.12.tar.gz
Index: nrpe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nrpe/F-9/nrpe.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nrpe.spec 19 Dec 2008 15:41:22 -0000 1.7
+++ nrpe.spec 2 Feb 2009 16:10:30 -0000 1.8
@@ -2,14 +2,17 @@
Name: nrpe
Version: 2.12
-Release: 3%{?dist}
+Release: 6%{?dist}
Summary: Host/service/network monitoring agent for Nagios
Group: Applications/System
License: GPLv2
URL: http://www.nagios.org
-Source: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source1: nrpe.sysconfig
Patch0: nrpe-initreload.patch
+Patch1: nrpe-read-extra-conf.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel tcp_wrappers
@@ -18,7 +21,7 @@
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(post): /sbin/chkconfig, /sbin/service
Requires(postun): /sbin/service
-Provides: nagios-nrpe
+Provides: nagios-nrpe = %{version}-%{release}
%description
Nrpe is a system daemon that will execute various Nagios plugins
@@ -33,7 +36,7 @@
Group: Applications/System
Summary: Provides nrpe plugin for Nagios
Requires: nagios-plugins
-Provides: check_nrpe
+Provides: check_nrpe = %{version}-%{release}
%description -n nagios-plugins-nrpe
Nrpe is a system daemon that will execute various Nagios plugins
@@ -47,6 +50,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p0 -b .sysconfig
%build
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -67,10 +71,11 @@
%install
rm -rf %{buildroot}
-install -D -m 0755 init-script %{buildroot}/%{_initrddir}/nrpe
-install -D -m 0644 sample-config/nrpe.cfg %{buildroot}/%{_sysconfdir}/nagios/nrpe.cfg
-install -D -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
-install -D -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
+install -D -p -m 0755 init-script %{buildroot}/%{_initrddir}/nrpe
+install -D -p -m 0644 sample-config/nrpe.cfg %{buildroot}/%{_sysconfdir}/nagios/nrpe.cfg
+install -D -p -m 0755 src/nrpe %{buildroot}/%{_sbindir}/nrpe
+install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/check_nrpe
+install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
%clean
rm -rf %{buildroot}
@@ -98,14 +103,25 @@
%{_sbindir}/nrpe
%dir %{_sysconfdir}/nagios
%config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
-%doc Changelog LEGAL README
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%doc Changelog LEGAL README
%files -n nagios-plugins-nrpe
%defattr(-,root,root,-)
%{_libdir}/nagios/*
-%doc Changelog LEGAL README
+%doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
%changelog
+* Mon Feb 2 2009 Peter Lemenkov <lemenkov at gmail.com> - 2.12-6
+- Fixed BZ# 449174
+- Clean up (in order to disable rpmlint warnings)
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.12-5
+- rebuild with new openssl
+
+* Sun Dec 21 2008 Mike McGrath <mmcgrath at redhat.com> - 2.12-4
+- Added some doc lines for ticket 477527
+
* Fri Dec 19 2008 Mike McGrath <mmcgrath at redhat.com> - 2.12-3
- Added Provides: nagios-nrpe
- Previous message (by thread): rpms/nrpe/F-10 import.log, NONE, 1.1 nrpe-read-extra-conf.patch, NONE, 1.1 nrpe.sysconfig, NONE, 1.1 .cvsignore, 1.3, 1.4 nrpe.spec, 1.7, 1.8
- Next message (by thread): rpms/rhm/F-10 .cvsignore, 1.11, 1.12 rhm.spec, 1.34, 1.35 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list