[Debian-ha-commits] [ocfs2-tools] 05/08: Refresh debian/patches

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit 8b970a7871b42c3ddf9d7817ac01e876abf6d973
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Tue Jun 20 09:36:04 2017 +0200

    Refresh debian/patches
---
 debian/patches/dead_threshold.patch            |  4 ++--
 debian/patches/debugfs-segfault.patch          | 11 -----------
 debian/patches/libo2dlm-dlopen-libdlm_lt.patch |  8 +++-----
 debian/patches/mkfs-segfault.patch             | 11 -----------
 debian/patches/o2cb-ctl-virtio.patch           | 11 -----------
 debian/patches/ocfs2-udev-rule.patch           |  8 --------
 debian/patches/series                          |  4 ----
 7 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/debian/patches/dead_threshold.patch b/debian/patches/dead_threshold.patch
index f502403..2ff42cc 100644
--- a/debian/patches/dead_threshold.patch
+++ b/debian/patches/dead_threshold.patch
@@ -19,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #define SYS_DEBUG_DIR			"/sys/kernel/debug"
 --- a/vendor/common/o2cb.init.sh
 +++ b/vendor/common/o2cb.init.sh
-@@ -224,7 +224,7 @@
+@@ -234,7 +234,7 @@
  set_timeouts_o2cb()
  {
      O2CB_HEARTBEAT_THRESHOLD_FILE_OLD=/proc/fs/ocfs2_nodemanager/hb_dead_threshold
@@ -28,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      if [ -n "$O2CB_HEARTBEAT_THRESHOLD" ]; then
          if [ -f "$O2CB_HEARTBEAT_THRESHOLD_FILE" ]; then
              echo "$O2CB_HEARTBEAT_THRESHOLD" > "$O2CB_HEARTBEAT_THRESHOLD_FILE"
-@@ -259,7 +259,7 @@
+@@ -269,7 +269,7 @@
  {
  
      O2CB_HEARTBEAT_THRESHOLD_FILE_OLD=/proc/fs/ocfs2_nodemanager/hb_dead_threshold
diff --git a/debian/patches/debugfs-segfault.patch b/debian/patches/debugfs-segfault.patch
deleted file mode 100644
index d818e21..0000000
--- a/debian/patches/debugfs-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/debugfs.ocfs2/main.c
-+++ b/debugfs.ocfs2/main.c
-@@ -198,7 +198,7 @@
- 		{ "noprompt", 0, 0, 'n' },
- 		{ "decode", 0, 0, 'd' },
- 		{ "encode", 0, 0, 'e' },
--		{ "superblock", 0, 0, 's' },
-+		{ "superblock", 1, 0, 's' },
- 		{ "image", 0, 0, 'i' },
- 		{ 0, 0, 0, 0}
- 	};
diff --git a/debian/patches/libo2dlm-dlopen-libdlm_lt.patch b/debian/patches/libo2dlm-dlopen-libdlm_lt.patch
index e337848..eb8a423 100644
--- a/debian/patches/libo2dlm-dlopen-libdlm_lt.patch
+++ b/debian/patches/libo2dlm-dlopen-libdlm_lt.patch
@@ -1,8 +1,6 @@
-Index: my/libo2dlm/o2dlm.c
-===================================================================
---- my.orig/libo2dlm/o2dlm.c
-+++ my/libo2dlm/o2dlm.c
-@@ -802,7 +802,7 @@ static errcode_t load_fsdlm(struct o2dlm
+--- a/libo2dlm/o2dlm.c
++++ b/libo2dlm/o2dlm.c
+@@ -803,7 +803,7 @@
  		goto out;
  	}
  
diff --git a/debian/patches/mkfs-segfault.patch b/debian/patches/mkfs-segfault.patch
deleted file mode 100644
index 966a36b..0000000
--- a/debian/patches/mkfs-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mkfs.ocfs2/mkfs.c
-+++ b/mkfs.ocfs2/mkfs.c
-@@ -883,7 +883,7 @@
- 		{ "verbose", 0, 0, 'v' },
- 		{ "quiet", 0, 0, 'q' },
- 		{ "version", 0, 0, 'V' },
--		{ "journal-options", 0, 0, 'J'},
-+		{ "journal-options", 1, 0, 'J'},
- 		{ "heartbeat-device", 0, 0, 'H'},
- 		{ "force", 0, 0, 'F'},
- 		{ "mount", 1, 0, 'M'},
diff --git a/debian/patches/o2cb-ctl-virtio.patch b/debian/patches/o2cb-ctl-virtio.patch
deleted file mode 100644
index 89087e3..0000000
--- a/debian/patches/o2cb-ctl-virtio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/o2cb_ctl/o2cb_scandisk.c
-+++ b/o2cb_ctl/o2cb_scandisk.c
-@@ -130,6 +130,8 @@
- 				add = !strncmp(path->path, "/dev/loop", 9);
- 			if (!add)
- 				add = !strncmp(path->path, "/dev/xvd", 8);
-+			if (!add)
-+				add = !strncmp(path->path, "/dev/vd", 7);
- 		}
- 		if (add) {
- 			hb = malloc(sizeof(struct hb_devices));
diff --git a/debian/patches/ocfs2-udev-rule.patch b/debian/patches/ocfs2-udev-rule.patch
deleted file mode 100644
index 90a875a..0000000
--- a/debian/patches/ocfs2-udev-rule.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-Index: my/vendor/common/51-ocfs2.rules
-===================================================================
---- my.orig/vendor/common/51-ocfs2.rules
-+++ my/vendor/common/51-ocfs2.rules
-@@ -1,2 +1 @@
--KERNEL=="ocfs2_control", NAME="misc/ocfs2_control", MODE="0660"
--
-+KERNEL=="ocfs2_control", SYMLINK+="misc/ocfs2_control", MODE="0660"
diff --git a/debian/patches/series b/debian/patches/series
index b3dead9..3bcdede 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
 libo2dlm-dlopen-libdlm_lt.patch
 ocfs2-init-script.patch
 o2cb-init-script.patch
-ocfs2-udev-rule.patch
-o2cb-ctl-virtio.patch
-debugfs-segfault.patch
-mkfs-segfault.patch
 dead_threshold.patch

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