Hello community,
here is the log from the commit of package monitoring-plugins-bind for
openSUSE:Factory checked in at 2014-12-16 14:49:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-bind (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-bind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monitoring-plugins-bind"
Changes:
--------
---
/work/SRC/openSUSE:Factory/monitoring-plugins-bind/monitoring-plugins-bind.changes
2014-08-01 14:34:38.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.monitoring-plugins-bind.new/monitoring-plugins-bind.changes
2014-12-16 14:49:12.000000000 +0100
@@ -1,0 +2,7 @@
+Sun Dec 14 14:29:00 UTC 2014 - Led <[email protected]>
+
+- fix bashisms in check_bind.sh script
+- add patches:
+ * check_bind-fix-bashisms.patch
+
+-------------------------------------------------------------------
New:
----
check_bind-fix-bashisms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ monitoring-plugins-bind.spec ++++++
--- /var/tmp/diff_new_pack.4oKcQ0/_old 2014-12-16 14:49:13.000000000 +0100
+++ /var/tmp/diff_new_pack.4oKcQ0/_new 2014-12-16 14:49:13.000000000 +0100
@@ -18,7 +18,7 @@
Name: monitoring-plugins-bind
Version: 1.3
-Release: 100
+Release: 0
Summary: Check whether BIND is running and to get the performance data
via rndc stats
License: GPL-2.0+
Group: System/Monitoring
@@ -26,6 +26,7 @@
Source0: check_bind.sh
Source1: LICENSE
Source2: check_bind.php
+Patch0: check_bind-fix-bashisms.patch
BuildRequires: nagios-rpm-macros
Provides: nagios-plugins-bind = %{version}-%{release}
Obsoletes: nagios-plugins-bind < %{version}-%{release}
@@ -46,6 +47,9 @@
terms of the GPLv2 (or later).
%prep
+%setup -cT
+install -m 0644 %{SOURCE0} ./check_bind.sh
+%patch0
%build
@@ -53,7 +57,7 @@
mkdir -p %{buildroot}/%{nagios_plugindir}
sed -e "s|^version=9.4|version=9.6|g; \
s|Default is: 9.4|Default is: \$version|g; \
- s|9.5|9.5\|9.6|g" %{SOURCE0} >
%{buildroot}/%{nagios_plugindir}/check_bind
+ s|9.5|9.5\|9.6|g" check_bind.sh >
%{buildroot}/%{nagios_plugindir}/check_bind
chmod +x %{buildroot}/%{nagios_plugindir}/check_bind
install -Dp -m 0644 %{SOURCE2}
%{buildroot}%{pnp4nagios_templatedir}/check_bind.php
install -Dp -m 0644 %{SOURCE1} %{buildroot}%{_defaultdocdir}/%{name}/LICENSE
++++++ check_bind-fix-bashisms.patch ++++++
--- check_bind.sh.orig 2013-01-07 15:40:23.000000000 +0200
+++ check_bind.sh 2014-11-16 02:22:42.000000000 +0200
@@ -203,49 +203,49 @@
;;
esac
- if [ "$succ_1st" == '' ]
+ if [ -z "$succ_1st" ]
then
success=0
else
success=`expr $succ_1st - $succ_2nd`
fi
- if [ "$ref_1st" == '' ]
+ if [ -z "$ref_1st" ]
then
referral=0
else
referral=`expr $ref_1st - $ref_2nd`
fi
- if [ "$nxrr_1st" == '' ]
+ if [ -z "$nxrr_1st" ]
then
nxrrset=0
else
nxrrset=`expr $nxrr_1st - $nxrr_2nd`
fi
- if [ "$nxdom_1st" == '' ]
+ if [ -z "$nxdom_1st" ]
then
nxdomain=0
else
nxdomain=`expr $nxdom_1st - $nxdom_2nd`
fi
- if [ "$rec_1st" == '' ]
+ if [ -z "$rec_1st" ]
then
recursion=0
else
recursion=`expr $rec_1st - $rec_2nd`
fi
- if [ "$fail_1st" == '' ]
+ if [ -z "$fail_1st" ]
then
failure=0
else
failure=`expr $fail_1st - $fail_2nd`
fi
- if [ "$dup_1st" == '' ]
+ if [ -z "$dup_1st" ]
then
duplicate=0
else
duplicate=`expr $dup_1st - $dup_2nd`
fi
- if [ "$drop_1st" == '' ]
+ if [ -z "$drop_1st" ]
then
dropped=0
else
@@ -264,7 +264,7 @@
esac
}
-if [ ${pid_check} == 1 ]
+if [ ${pid_check} = 1 ]
then
check_pid
if [ "$retval" = 1 ]
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
