Hello community, here is the log from the commit of package nagios-nrpe for openSUSE:Factory checked in at Tue May 31 17:17:04 CEST 2011.
-------- --- nagios-nrpe/nagios-nrpe.changes 2011-02-10 01:03:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios-nrpe/nagios-nrpe.changes 2011-05-30 17:38:06.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 30 14:43:59 UTC 2011 - [email protected] + +- specfile cleanup using spec-cleaner (add comments to patches) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-nrpe.spec ++++++ --- /var/tmp/diff_new_pack.Kk4W0o/_old 2011-05-31 17:12:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Kk4W0o/_new 2011-05-31 17:12:41.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # default %define nagios3only 0 @@ -27,38 +26,56 @@ %define _libexecdir %{_prefix}/lib/nagios/plugins Name: nagios-nrpe -Summary: Nagios Remote Plug-In Executor Version: 2.12 -Release: 18 +Release: 25 License: GPLv2+ -Group: System/Monitoring +Summary: Nagios Remote Plug-In Executor Url: http://www.nagios.org/ -Source0: nrpe-%version.tar.bz2 +Group: System/Monitoring +Source0: nrpe-%{version}.tar.bz2 Source1: nrpe.init Source2: nagios-nrpe-rpmlintrc Source3: nagios-nrpe-SuSEfirewall2 Source4: nrpe.8 Source10: README.SuSE +# PATCH-FIX-openSUSE change the installation order Patch0: nrpe-2.12-Makefile.patch +# PATCH-FIX-openSUSE place the service disabled in the directory Patch1: nrpe-2.12-xinetd.patch +# PATCH-FIX-openSUSE adapts NRPE to support the standard buffersize of Nagios 3.x Patch2: nagios-nrpe-buffersize.patch +# PATCH-FIX-UPSTREAM produce more randomness and do not reduce entropy on Linux kernels Patch3: nrpe-more_random.patch +# PATCH-FIX-UPSTREAM improve help output of nrpe and check_nrpe Patch4: nrpe-improved_help.patch +# PATCH-FIX-UPSTREAM null buffer before using it Patch5: nrpe-weird_output.patch +# PATCH-FIX-UPSTREAM drop privileges before writing the pidfile for more safety Patch6: nrpe-drop_privileges_before_writing_pidfile.patch +# PATCH-FIX-UPSTREAM compiler complains about this unused variable Patch7: nrpe-unused_variable.patch +# PATCH-FIX-UPSTREAM fix compiler warnings Patch8: nrpe-return_value.patch +# PATCH-FIX-UPSTREAM fix compiler warnings Patch9: nrpe-uninitialized_variable.patch +# PATCH-FIX-openSUSE fix pathnames for nrpe_check_control command Patch10: nrpe_check_control.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq %fillup_prereq -PreReq: coreutils grep pwdutils sed netcfg +PreReq: %fillup_prereq +PreReq: %insserv_prereq PreReq: /bin/logger +PreReq: coreutils +PreReq: grep +PreReq: netcfg +PreReq: pwdutils +PreReq: sed +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 -PreReq: sysvinit(network) sysvinit(syslog) +PreReq: sysvinit(network) +PreReq: sysvinit(syslog) %endif # -BuildRequires: nagios-plugins tcpd-devel +BuildRequires: nagios-plugins +BuildRequires: tcpd-devel # %if 0%{?suse_version} > 1000 BuildRequires: krb5-devel @@ -67,7 +84,8 @@ %endif # %if 0%{?suse_version} > 1020 -BuildRequires: libopenssl-devel openssl +BuildRequires: libopenssl-devel +BuildRequires: openssl %else BuildRequires: openssl-devel %endif @@ -89,12 +107,6 @@ This package contains the software for NRPE server. It could be run by inet-daemon or as stand-alone daemon - - -Authors: --------- - Ethan Galstad <[email protected]> - %package doc License: GPLv2+ Summary: Nagios Remote Plug-In Executor documentation @@ -104,12 +116,6 @@ This package contains the README files, OpenOffice and PDF documentation for the remote plugin executor (NRPE) for nagios. - - -Authors: --------- - Ethan Galstad <[email protected]> - %package -n nagios-plugins-nrpe License: GPLv2+ Summary: Nagios NRPE plugin @@ -131,14 +137,8 @@ The plugin then uses the output and return code from the plugin execution on the remote host for its own output and return code. - - -Authors: --------- - Ethan Galstad <[email protected]> - %prep -%setup -n nrpe-%version +%setup -n nrpe-%{version} %patch0 -p1 %patch1 -p1 %if %{nagios3only} @@ -152,20 +152,20 @@ %patch8 -p0 %patch9 -p0 %patch10 -p0 -%{__cp} -a %{S:10} . +cp -a %{SOURCE10} . %build -%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_GNU_SOURCE" \ - --sbindir=%_prefix/lib/nagios/cgi \ - --libexecdir=%_libexecdir \ - --datadir=%_datadir/nagios \ - --sysconfdir=%_sysconfdir/nagios \ +%configure CFLAGS="%{optflags} -fno-strict-aliasing -D_GNU_SOURCE" \ + --sbindir=%{_prefix}/lib/nagios/cgi \ + --libexecdir=%{_libexecdir} \ + --datadir=%{_datadir}/nagios \ + --sysconfdir=%{_sysconfdir}/nagios \ --localstatedir=/var/log/nagios \ - --exec-prefix=%_sbindir \ - --bindir=%_sbindir \ + --exec-prefix=%{_sbindir} \ + --bindir=%{_sbindir} \ --with-log_facility=daemon \ - --with-kerberos-inc=%_includedir \ - --with-init-dir=%_sysconfdir/init.d \ + --with-kerberos-inc=%{_includedir} \ + --with-init-dir=%{_sysconfdir}/init.d \ --with-nagios-user=%nsusr \ --with-nagios-group=%nsgrp \ --with-nrpe-user=%nsusr \ @@ -173,39 +173,39 @@ --with-nrpe-port=%nrpeport \ --enable-command-args \ --enable-ssl -make %{?jobs:-j%jobs} all +make %{?_smp_mflags} all gcc %{optflags} -o contrib/nrpe_check_control contrib/nrpe_check_control.c %install -%{__make} install-all \ - DESTDIR="%buildroot" \ +make install-all \ + DESTDIR=%{buildroot} \ INSTALL_OPTS="" \ COMMAND_OPTS="" \ - CGICFGDIR="%_sysconfdir/nagios" \ + CGICFGDIR="%{_sysconfdir}/nagios" \ NAGIOS_INSTALL_OPTS="" \ NRPE_INSTALL_OPTS="" \ INIT_OPTS="" -%{__install} -d %buildroot/var/run/nagios -%{__install} -Dm 644 %{S:4} %buildroot%_mandir/man8/nrpe.8 -%{__install} -Dm 755 %{S:1} %buildroot%_sysconfdir/init.d/nrpe -%{__ln_s} -f ../../etc/init.d/nrpe %buildroot%_sbindir/rcnrpe +install -d %{buildroot}%{_localstatedir}/run/nagios +install -Dm 644 %{SOURCE4} %{buildroot}%{_mandir}/man8/nrpe.8 +install -Dm 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/nrpe +ln -s -f ../../etc/init.d/nrpe %{buildroot}%{_sbindir}/rcnrpe # install SuSEfirewall2 script %if 0%{?suse_version} > 1020 -install -Dm644 %{S:3} %buildroot/%_sysconfdir/sysconfig/SuSEfirewall2.d/services/nrpe-service +install -Dm644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe-service %endif # fix pid_file in nrpe.cfg -%{__sed} -i -e "s,^\(pid_file=\).*,\1/var/run/nrpe/nrpe.pid," %buildroot/%_sysconfdir/nagios/nrpe.cfg +sed -i -e "s,^\(pid_file=\).*,\1/var/run/nrpe/nrpe.pid," %{buildroot}/%{_sysconfdir}/nagios/nrpe.cfg # create directory and pidfile (package them as ghost) -%{__mkdir_p} %{buildroot}/var/run/nrpe -touch %{buildroot}/var/run/nrpe/nrpe.pid +mkdir -p %{buildroot}%{_localstatedir}/run/nrpe +touch %{buildroot}%{_localstatedir}/run/nrpe/nrpe.pid # create home directory of nagios user -mkdir -p %buildroot/var/lib/nagios +mkdir -p %{buildroot}%{_localstatedir}/lib/nagios # create contrib plugin install -m0755 contrib/nrpe_check_control %{buildroot}%{_libexecdir}/nrpe_check_control @@ -226,7 +226,7 @@ : OK group %nsgrp already present else groupadd -r %nsgrp 2>/dev/null || : - %nnmmsg "Added group %nsgrp for package %name" + %nnmmsg "Added group %nsgrp for package %{name}" fi # default user: nagios if @@ -235,7 +235,7 @@ : OK user %nsusr already present else useradd -r -o -g %nsgrp -s /bin/false -c "User for Nagios" -d /var/lib/nagios %nsusr 2> /dev/null || : - %nnmmsg "Added user %nsusr for package %name" + %nnmmsg "Added user %nsusr for package %{name}" fi # check if the port for nrpe is already defined in /etc/services if grep -q %nrpeport /etc/services ; then @@ -256,24 +256,24 @@ %insserv_cleanup %clean -%{__rm} -rf %buildroot +rm -rf %{buildroot} %files %defattr(-,root,root) %doc README.SuSE -%_mandir/man8/nrpe.8* -%dir %_sysconfdir/nagios/ -%dir /var/lib/nagios -%config(noreplace) %_sysconfdir/nagios/nrpe.cfg -%config(noreplace) %_sysconfdir/xinetd.d/nrpe +%{_mandir}/man8/nrpe.8* +%dir %{_sysconfdir}/nagios/ +%dir %{_localstatedir}/lib/nagios +%config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg +%config(noreplace) %{_sysconfdir}/xinetd.d/nrpe %if 0%{?suse_version} > 1020 -%config %_sysconfdir/sysconfig/SuSEfirewall2.d/services/nrpe-service +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nrpe-service %endif -%_sysconfdir/init.d/nrpe -%_sbindir/nrpe -%_sbindir/rcnrpe -%ghost %dir /var/run/nrpe -%ghost /var/run/nrpe/nrpe.pid +%{_sysconfdir}/init.d/nrpe +%{_sbindir}/nrpe +%{_sbindir}/rcnrpe +%ghost %dir %{_localstatedir}/run/nrpe +%ghost %{_localstatedir}/run/nrpe/nrpe.pid %files doc %defattr(644,root,root,755) @@ -282,7 +282,7 @@ %files -n nagios-plugins-nrpe %defattr(-,root,root) %doc contrib/README.nrpe_check_control -%_libexecdir/check_nrpe +%{_libexecdir}/check_nrpe %dir %{_sysconfdir}/nagios/objects %config(noreplace) %{_sysconfdir}/nagios/objects/nrpe_check_control.cfg %{_libexecdir}/nrpe_check_control ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
