[Debian-ha-commits] [resource-agents] 01/01: ocf_mkstatedir: fix path check

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository resource-agents.

commit 3bc66977f44c8ac6411953ac1216e089967c37ec
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Wed Dec 28 12:05:36 2016 +0100

    ocf_mkstatedir: fix path check
---
 debian/patches/ocf_mkstatedir | 21 +++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/ocf_mkstatedir b/debian/patches/ocf_mkstatedir
new file mode 100644
index 0000000..4f4c156
--- /dev/null
+++ b/debian/patches/ocf_mkstatedir
@@ -0,0 +1,21 @@
+Description: ocf_mkstatedir: fix path check
+ Check fails due to duble slashes in string comparison.
+ Path /var/run/apache2 is compared with /var/run//* giving the following error in the logs:
+ Dec 21 13:17:53 node1 apache(apache_/etc/apache2/apache2.conf)[826]: [868]: ERROR: cannot create /var/run/apache2 (does not start with /var/run/)
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Bug: https://github.com/ClusterLabs/resource-agents/pull/905
+Applied-Upstream: https://github.com/ClusterLabs/resource-agents/commit/1a9fa4c051fd8b1533feaf37af37f0c4f1213871
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/heartbeat/ocf-shellfuncs.in
++++ b/heartbeat/ocf-shellfuncs.in
+@@ -779,7 +779,7 @@
+ 	[ $(id -u) = 0 ] || return 1
+ 
+ 	case $path in
+-	$HA_VARRUN/*) : this path is ok ;;
++	${HA_VARRUN%/}/*) : this path is ok ;;
+ 	*) ocf_log err "cannot create $path (does not start with $HA_VARRUN)"
+ 		return 1
+ 	;;
diff --git a/debian/patches/series b/debian/patches/series
index 4fdd3e5..977964e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ mysql-path.patch
 no-dirty-version
 runocft
 ipv6-linux-only
+ocf_mkstatedir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/resource-agents.git