Hello community, here is the log from the commit of package nagios-plugins-rsync for openSUSE:Factory checked in at 2012-07-04 13:55:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios-plugins-rsync (Old) and /work/SRC/openSUSE:Factory/.nagios-plugins-rsync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios-plugins-rsync", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios-plugins-rsync/nagios-plugins-rsync.changes 2011-09-26 17:06:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios-plugins-rsync.new/nagios-plugins-rsync.changes 2012-07-04 13:55:25.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 2 15:23:22 UTC 2012 - [email protected] + +- added nagios-plugins-rsync-hidden_modules.patch to allow hidden + rsync modules to be tested +- use nagios-rpm-macros in specfile +- Fix license: it's GPL 2 or newer + +------------------------------------------------------------------- New: ---- nagios-plugins-rsync-hidden_modules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios-plugins-rsync.spec ++++++ --- /var/tmp/diff_new_pack.RPDobT/_old 2012-07-04 13:55:26.000000000 +0200 +++ /var/tmp/diff_new_pack.RPDobT/_new 2012-07-04 13:55:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nagios-plugins-rsync # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: nagios-plugins-rsync -Summary: Nagios plugin for checking rsync servers availability +Summary: Check rsync servers availability +License: GPL-2.0+ +Group: System/Monitoring Version: 1.02 -Release: 14 +Release: 0 Url: https://www.monitoringexchange.org/p/817 -License: GPL-3.0 -Group: System/Monitoring Source0: check_rsync Source1: COPYING Patch1: nagios-plugins-rsync-timeout.patch +Patch2: nagios-plugins-rsync-hidden_modules.patch +BuildRequires: nagios-rpm-macros %if 0%{?suse_version} > 1010 # nagios can execute the script with embedded perl Recommends: perl @@ -35,7 +35,6 @@ Requires: rsync BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define libexecdir %_prefix/lib/nagios/plugins %description Checks rsync servers availability, as well as (optionally) individual @@ -46,23 +45,18 @@ The only required argument is -H, in which case it will only try to list modules on the Rsync server. - - -Authors: --------- - Thomas Guyot-Sionnest <[email protected]> - %prep %setup -q -T -c %name install -m644 %{SOURCE0} . %patch1 -p0 +%patch2 -p0 %build %install -mkdir -p %buildroot/%{libexecdir} -sed -e "s|/usr/local/nagios/libexec|%{libexecdir}|g" check_rsync > %buildroot/%{libexecdir}/check_rsync -chmod +x %buildroot/%{libexecdir}/check_rsync +mkdir -p %buildroot/%{nagios_plugindir} +sed -e "s|/usr/local/nagios/libexec|%{nagios_plugindir}|g" check_rsync > %buildroot/%{nagios_plugindir}/check_rsync +chmod +x %buildroot/%{nagios_plugindir}/check_rsync %clean rm -rf %buildroot @@ -70,8 +64,8 @@ %files %defattr(-,root,root) # avoid build dependecy of nagios - own the dirs -%dir %_prefix/lib/nagios -%dir %{libexecdir} -%{libexecdir}/check_rsync +%dir %{nagios_libdir} +%dir %{nagios_plugindir} +%{nagios_plugindir}/check_rsync %changelog ++++++ nagios-plugins-rsync-hidden_modules.patch ++++++ --- check_rsync.orig 2012-07-02 17:18:01.194047612 +0200 +++ check_rsync 2012-07-02 17:18:11.378747279 +0200 @@ -120,19 +120,8 @@ my $realerr = $error_code >> 8; report_error("Rsync command $command failed with error " . $realerr . ": " . (defined $RSYNCMSG{"$realerr"} ? $RSYNCMSG{"$realerr"} : "Unknown error")) if ($realerr != 0); -# If one or more -m, check if these modules exists first... -if (@modules) { - - my @result = split(/\n/, $result); - - foreach my $mod (@modules) { - my $match = 0; - for (@result) { - $match = 1 if (/^$$mod[0]\s/); - } - report_error("Module $$mod[0] not found") if ($match == 0); - } -} else { # else just return OK +# if we do not need to check modules, just return here +if (! @modules){ print "OK: Rsync is up\n"; exit $ERRORS{'OK'}; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
