[Debian-ha-commits] [resource-agents] 03/04: New upstream RC version.

[Christoph Berg]

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

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

commit 3d3a5ae006e001970493130c11bd6aa57ad79652
Author: Christoph Berg <myon at debian.org>
Date:   Tue Jan 10 23:20:26 2017 +0100

    New upstream RC version.
    
    * New upstream RC version.
    * Fix typo in IPaddr2, patch by ISHIKAWA Mutsumi. (Closes: #850787)
---
 debian/changelog               |  4 +++-
 debian/patches/850787-fix-typo | 19 +++++++++++++++++++
 debian/patches/ocf_mkstatedir  | 21 ---------------------
 debian/patches/runocft         |  8 --------
 debian/patches/series          |  3 +--
 5 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2238be..070d939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-resource-agents (1:3.9.7-4) UNRELEASED; urgency=medium
+resource-agents (1:4.0.0~rc1-1) UNRELEASED; urgency=medium
 
   [ Christoph Berg ]
+  * New upstream RC version.
   * Include list of agents in package description.
   * Remove unused CVE-2010-3389--bug598549.patch.
+  * Fix typo in IPaddr2, patch by ISHIKAWA Mutsumi. (Closes: #850787)
 
   [ Adrian Vondendriesch ]
   * Bump standards version.
diff --git a/debian/patches/850787-fix-typo b/debian/patches/850787-fix-typo
new file mode 100644
index 0000000..7a20c73
--- /dev/null
+++ b/debian/patches/850787-fix-typo
@@ -0,0 +1,19 @@
+commit 21e1ffb01f99c4cfd7d06e2023e72cef9e23a10a
+Author: ISHIKAWA Mutsumi <ishikawa at hanzubon.jp>
+Date:   Tue Jan 10 22:47:18 2017 +0100
+
+    Fix typo in IPaddr2
+    
+    Debian #850787
+
+--- a/heartbeat/IPaddr2
++++ b/heartbeat/IPaddr2
+@@ -722,7 +722,7 @@ run_send_ua() {
+ 			;;
+ 		*tentative*)
+ 			if [ $i -eq 10 ]; then
+-				ofc_log warn "IPv6 address : DAD is still in tentative"
++				ocf_log warn "IPv6 address : DAD is still in tentative"
+ 			fi
+ 			;;
+ 		*)
diff --git a/debian/patches/ocf_mkstatedir b/debian/patches/ocf_mkstatedir
deleted file mode 100644
index 4f4c156..0000000
--- a/debian/patches/ocf_mkstatedir
+++ /dev/null
@@ -1,21 +0,0 @@
-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/runocft b/debian/patches/runocft
deleted file mode 100644
index b2807e5..0000000
--- a/debian/patches/runocft
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/tools/ocft/runocft
-+++ b/tools/ocft/runocft
-@@ -1,3 +1,5 @@
-+#!/bin/sh
-+
- OCFTDIR=/usr/share/resource-agents/ocft
- CONFDIR=$OCFTDIR/configs
- 
diff --git a/debian/patches/series b/debian/patches/series
index 977964e..9deaf2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
 02_spelling_fixes.patch
 mysql-path.patch
 no-dirty-version
-runocft
 ipv6-linux-only
-ocf_mkstatedir
+850787-fix-typo

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