averi pushed to check-mk (el5). "Cherry-pick changes from master: fix php's shebang"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 15:37:19 UTC 2015
>From 931bb9cdaf74fab5ea859e79e6ae9ee598023cd0 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 17:37:04 +0200
Subject: Cherry-pick changes from master: fix php's shebang
diff --git a/check-mk.spec b/check-mk.spec
index e102b02..7502efe 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -162,6 +162,13 @@ for file in `find %{buildroot}%{_datadir}/check_mk/web -name '*.py'`; do
sed -i '1{\@^#!/usr/bin/python at d}' $file
done
+# Fix the shebang on agents/plugins/unitrends_backup and on web/plugins/unitrends_backup
+sed -i 's|#!/usr/bin/pnp|#!/usr/bin/php|1' \
+ %{buildroot}%{_datadir}/check_mk/agents/plugins/unitrends_backup
+
+sed -i 's|#!/usr/bin/pnp|#!/usr/bin/php|1' \
+ %{buildroot}%{_datadir}/check_mk/web/plugins/unitrends_backup
+
# Copy the check_mk_templates.cfg from the example file and remove the file installed
# on the /etc/nagios/objects directory.
mkdir -p %{buildroot}%{_sysconfdir}/nagios/conf.d/
@@ -212,7 +219,6 @@ rm -rf %{buildroot}%{_docdir}/check_mk/treasures/windows_msi/
rm -rf %{buildroot}%{_docdir}/check_mk/treasures/msexchange/
rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
-
# Remove DEB and RPM files that upstream ships
rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-%{nodistrelease}.noarch.rpm
rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent.spec
@@ -330,6 +336,8 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
when a downtime is set. This was caused by a change on the downtime struct
applied in the course of Nagios 3's development. Thanks Mike Battersby for
the patch. (BZ: #1083003)
+- Fix the /usr/bin/pnp shebang from the plugins/unitrends_backup file
+ as that is a non-existent binary file, upstream probably meant php.
* Wed Sep 17 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-1
- New upstream release. Fixes CVEs:
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=el5&id=931bb9cdaf74fab5ea859e79e6ae9ee598023cd0
More information about the scm-commits
mailing list