diff --git a/0008-ocfs2-tools-add-systemd-support-fix.patch b/0008-ocfs2-tools-add-systemd-support-fix.patch
index 2c9c92f..569e2fa 100644
--- a/0008-ocfs2-tools-add-systemd-support-fix.patch
+++ b/0008-ocfs2-tools-add-systemd-support-fix.patch
@@ -16,9 +16,9 @@ diff --git a/vendor/common/ocfs2.service b/vendor/common/ocfs2.service
index 768f806..c7ecbea 100644
--- a/vendor/common/ocfs2.service
+++ b/vendor/common/ocfs2.service
-@@ -1,7 +1,7 @@
- [Unit]
- Description=Load ocfs2 Modules
+@@ -2,7 +2,7 @@
+ Description=Mount ocfs2 Filesystems
+ Documentation=man:ocfs2(7) man:mount.ocfs2(8)
Requires=o2cb.service
-After=o2cb.service
+After=o2cb.service remote-fs.target
diff --git a/_service b/_service
index cd8eb68..e6127e2 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
https://github.com/markfasheh/ocfs2-tools.git
git
.git
- 1.8.5
+ 1.8.7
master
diff --git a/bnc#96864-ocfs2console-fix-starting-failure.patch b/bnc#96864-ocfs2console-fix-starting-failure.patch
deleted file mode 100644
index b01607e..0000000
--- a/bnc#96864-ocfs2console-fix-starting-failure.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5cf4d29df66c9a539d686f7646a70cb312899f7f Mon Sep 17 00:00:00 2001
-From: Eric Ren
-Date: Thu, 17 Mar 2016 11:15:25 +0800
-Subject: [PATCH] ocfs2console: fix starting failure
-
-ocfs2console failed to start with this errors:
-ImportError: /usr/lib64/python2.7/site-packages/ocfs2interface/o2cbmodule.so: undefined
-symbol: cmap_get_string
-ImportError: ocfs2console/ocfs2interface/o2cbmodule.so: undefined
-symbol: ocfs2_free
-
-The first is caused by commit: 9be25f2fadf7 (Get cluster list info from corosync);
-As for the second, actually, I don't know when it slipped in, but much likely from
-when someone use ocfs2_free somewhere.
-
-Signed-off-by: Eric Ren
----
- ocfs2console/ocfs2interface/Makefile | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile
-index 5409455..f49d998 100644
---- a/ocfs2console/ocfs2interface/Makefile
-+++ b/ocfs2console/ocfs2interface/Makefile
-@@ -21,6 +21,10 @@ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
- endif
- LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
-
-+ifneq ($(BUILD_CMAP_SUPPORT),)
-+LIBO2CB_LIBS += -lcmap
-+endif
-+
- ifdef HAVE_BLKID
- BLKID_DEPS =
- else
-@@ -103,7 +107,7 @@ ocfs2module.so: $(OCFS2_OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
- $(LINK) -shared $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS)
-
- o2cbmodule.so: $(O2CB_OBJS) $(LIBO2CB_DEPS)
-- $(LINK) -shared $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
-+ $(LINK) -shared ${LIBOCFS2_LIBS} $(LIBO2CB_LIBS) $(COM_ERR_LIBS)
-
- install-pylib:
- $(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(pyexecdir)/ocfs2interface
---
-2.6.2
-
diff --git a/bug-543119-o2dlm.patch b/bug-543119-o2dlm.patch
deleted file mode 100644
index a02f115..0000000
--- a/bug-543119-o2dlm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ocfs2-tools/libo2dlm/o2dlm.c
-===================================================================
---- ocfs2-tools.orig/libo2dlm/o2dlm.c 2012-08-24 10:22:54.000000000 -0500
-+++ ocfs2-tools/libo2dlm/o2dlm.c 2012-08-24 10:23:20.000000000 -0500
-@@ -802,7 +802,7 @@ static errcode_t load_fsdlm(struct o2dlm
- goto out;
- }
-
-- ctxt->ct_lib_handle = dlopen("libdlm_lt.so",
-+ ctxt->ct_lib_handle = dlopen("libdlm_lt.so.3",
- RTLD_NOW | RTLD_LOCAL);
- if (!ctxt->ct_lib_handle)
- goto out;
diff --git a/debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch b/debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch
deleted file mode 100644
index 32e329e..0000000
--- a/debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4ab576767129a89f3ff6d60c85c23c3be80c2dae Mon Sep 17 00:00:00 2001
-From: Gang He
-Date: Wed, 6 May 2020 18:06:07 +0800
-Subject: [PATCH] debugfs.ocfs2: Fix the error on devices with sector size 4096
-
-Debugfs.ocfs2 can not work on devices with sector size 4096,
-e.g.
- # debugfs.ocfs2 -s 1 /dev/sdd
- open: I/O error on channel Can't get the blocksize from the device by the num 1
- # blockdev --getss /dev/sdd
- 4096
-
-we should remove these line hard code, then debugfs.ocfs2 works on
-different sector size devices.
----
- debugfs.ocfs2/commands.c | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/debugfs.ocfs2/commands.c b/debugfs.ocfs2/commands.c
-index cc88583c..b1ee6172 100644
---- a/debugfs.ocfs2/commands.c
-+++ b/debugfs.ocfs2/commands.c
-@@ -482,14 +482,6 @@ static errcode_t get_blocksize(char* dev, uint64_t offset, uint64_t *blocksize,
- if (ret)
- goto bail;
-
-- /* since ocfs2_super_block inode can be stored in OCFS2_MIN_BLOCKSIZE,
-- * so here we just use the minimum block size and read the information
-- * in the specific offset.
-- */
-- ret = io_set_blksize(channel, OCFS2_MIN_BLOCKSIZE);
-- if (ret)
-- goto bail;
--
- ret = ocfs2_malloc_block(channel, &buf);
- if (ret)
- goto bail;
-@@ -507,7 +499,7 @@ static errcode_t get_blocksize(char* dev, uint64_t offset, uint64_t *blocksize,
- offset = hdr->hdr_superblocks[super_no-1] * hdr->hdr_fsblksz;
- }
-
-- blkno = offset / OCFS2_MIN_BLOCKSIZE;
-+ blkno = offset / io_get_blksize(channel);
- ret = io_read_block(channel, blkno, 1, buf);
- if (ret)
- goto bail;
---
-2.21.0
-
diff --git a/fix-build-failure-with-glibc-2.28.patch b/fix-build-failure-with-glibc-2.28.patch
deleted file mode 100644
index 89d1258..0000000
--- a/fix-build-failure-with-glibc-2.28.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e6e049ca6a371528ebf39b106209c2df586500bc Mon Sep 17 00:00:00 2001
-From: Gang He
-Date: Mon, 4 Mar 2019 15:20:34 +0800
-Subject: [PATCH] Fix build failure with glibc 2.28
-
-Since glibc git 663e7d78 (to be 2.28), type loff_t will be only defined
-when _DEFAULT_SOURCE defined. And with _XOPEN_SOURCE defined,
-_DEFAULT_SOURCE will not be defined by default.
-
-Build failed with the error messages like,
-Make[1]: Entering directory '/builddir/build/BUILD/ocfs2-tools-ocfs2-tools-1.8.5/libo2cb'
-gcc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -mcet -fcf-protection -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -pipe -fPIC -I../include -I. -DHAVE_CMAP -DHAVE_FSDLM -MD -MP -MF ./.o2cb_abi.d -o o2cb_abi.o -c o2cb_abi.c
-In file included from o2cb_abi.c:52:
-../include/ocfs2/ocfs2.h:222:2: error: unknown type name 'loff_t'
-loff_t d_off; /* Offset of structure in the file */
-^~~~~~
----
- Preamble.make | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Preamble.make b/Preamble.make
-index b9b4af03..10adc031 100644
---- a/Preamble.make
-+++ b/Preamble.make
-@@ -28,7 +28,7 @@ DIST_RULES =
- INCLUDES =
- DEFINES =
-
--CFLAGS += -pipe
-+CFLAGS += -pipe -D_DEFAULT_SOURCE=1
- # protect with configure?
- CDEPFLAGS = -MD -MP -MF $(@D)/.$(basename $(@F)).d
-
---
-2.19.2
-
diff --git a/fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch b/fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch
deleted file mode 100644
index 8e2b116..0000000
--- a/fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 0ffd58b223e24779420130522ea8ee359505f493 Mon Sep 17 00:00:00 2001
-From: Gang He
-Date: Mon, 4 Sep 2017 14:08:59 +0800
-Subject: [PATCH] fsck.ocfs2: fix compile error when glibc upgrade
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2,
-the compile error messages like,
-
-In file included from /usr/include/string.h:431:0,
- from ../include/ocfs2/ocfs2.h:41,
- from pass4.c:32:
-include/strings.h:37:1: error: unknown type name ‘errcode_t’; did you mean ‘mode_t’?
- errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
- ^~~~~~~~~
- mode_t
----
- fsck.ocfs2/Makefile | 2 +-
- fsck.ocfs2/include/o2fsck_strings.h | 43 +++++++++++++++++++++++++++++++++++++
- fsck.ocfs2/include/strings.h | 44 -------------------------------------
- fsck.ocfs2/pass2.c | 2 +-
- fsck.ocfs2/pass5.c | 2 +-
- fsck.ocfs2/strings.c | 2 +-
- 6 files changed, 48 insertions(+), 48 deletions(-)
- create mode 100644 fsck.ocfs2/include/o2fsck_strings.h
- delete mode 100644 fsck.ocfs2/include/strings.h
-
-diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
-index 051ed74..baf1994 100644
---- a/fsck.ocfs2/Makefile
-+++ b/fsck.ocfs2/Makefile
-@@ -64,7 +64,7 @@ HFILES = include/fsck.h \
- include/problem.h \
- include/refcount.h \
- include/slot_recovery.h \
-- include/strings.h \
-+ include/o2fsck_strings.h \
- include/util.h
-
-
-diff --git a/fsck.ocfs2/include/o2fsck_strings.h b/fsck.ocfs2/include/o2fsck_strings.h
-new file mode 100644
-index 0000000..69a1be9
---- /dev/null
-+++ b/fsck.ocfs2/include/o2fsck_strings.h
-@@ -0,0 +1,43 @@
-+/*
-+ * strings.h
-+ *
-+ * Copyright (C) 2002 Oracle Corporation. All rights reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public
-+ * License as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this program; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 021110-1307, USA.
-+ *
-+ * Author: Zach Brown
-+ */
-+
-+#ifndef __O2FSCK_STRINGS_H__
-+#define __O2FSCK_STRINGS_H__
-+
-+#include "ocfs2/ocfs2.h"
-+#include "ocfs2/kernel-rbtree.h"
-+
-+typedef struct _o2fsck_strings {
-+ struct rb_root s_root;
-+ size_t s_allocated;
-+} o2fsck_strings;
-+
-+int o2fsck_strings_exists(o2fsck_strings *strings, char *string,
-+ size_t strlen);
-+errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
-+ size_t strlen, int *is_dup);
-+void o2fsck_strings_init(o2fsck_strings *strings);
-+void o2fsck_strings_free(o2fsck_strings *strings);
-+size_t o2fsck_strings_bytes_allocated(o2fsck_strings *strings);
-+
-+#endif /* __O2FSCK_STRINGS_H__ */
-+
-diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/strings.h
-deleted file mode 100644
-index 69a1be9..0000000
---- a/fsck.ocfs2/include/strings.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--/*
-- * strings.h
-- *
-- * Copyright (C) 2002 Oracle Corporation. All rights reserved.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this program; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-- * Boston, MA 021110-1307, USA.
-- *
-- * Author: Zach Brown
-- */
--
--#ifndef __O2FSCK_STRINGS_H__
--#define __O2FSCK_STRINGS_H__
--
--#include "ocfs2/ocfs2.h"
--#include "ocfs2/kernel-rbtree.h"
--
--typedef struct _o2fsck_strings {
-- struct rb_root s_root;
-- size_t s_allocated;
--} o2fsck_strings;
--
--int o2fsck_strings_exists(o2fsck_strings *strings, char *string,
-- size_t strlen);
--errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
-- size_t strlen, int *is_dup);
--void o2fsck_strings_init(o2fsck_strings *strings);
--void o2fsck_strings_free(o2fsck_strings *strings);
--size_t o2fsck_strings_bytes_allocated(o2fsck_strings *strings);
--
--#endif /* __O2FSCK_STRINGS_H__ */
--
-diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c
-index 181febb..a48a50b 100644
---- a/fsck.ocfs2/pass2.c
-+++ b/fsck.ocfs2/pass2.c
-@@ -43,7 +43,7 @@
- #include "fsck.h"
- #include "pass2.h"
- #include "problem.h"
--#include "strings.h"
-+#include "o2fsck_strings.h"
- #include "util.h"
-
- static const char *whoami = "pass2";
-diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c
-index 5c2d899..bfad1b7 100644
---- a/fsck.ocfs2/pass5.c
-+++ b/fsck.ocfs2/pass5.c
-@@ -40,7 +40,7 @@
- #include "fsck.h"
- #include "pass5.h"
- #include "problem.h"
--#include "strings.h"
-+#include "o2fsck_strings.h"
- #include "util.h"
-
- static const char *whoami = "pass5";
-diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c
-index 4ad3782..8a7a8d9 100644
---- a/fsck.ocfs2/strings.c
-+++ b/fsck.ocfs2/strings.c
-@@ -31,7 +31,7 @@
- #include "ocfs2/ocfs2.h"
-
- #include "fsck.h"
--#include "strings.h"
-+#include "o2fsck_strings.h"
- #include "util.h"
-
- struct string_entry {
---
-1.8.5.6
-
diff --git a/mount.ocfs2-add-nocluster-mount-option-support.patch b/mount.ocfs2-add-nocluster-mount-option-support.patch
deleted file mode 100644
index e3a4d1d..0000000
--- a/mount.ocfs2-add-nocluster-mount-option-support.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 9b661d197aa634229919364d6cc07e58ed4cc01f Mon Sep 17 00:00:00 2001
-From: Gang He
-Date: Mon, 27 Jul 2020 19:32:26 +0800
-Subject: [PATCH] mount.ocfs2: add nocluster mount option support
-
-Now, ocfs2 kernel modules have accepted nocluster mount option, to
-support mounting a shared volume without the cluster stack.
-For mount.ocfs2 tool, we need to add the corresponding support, e.g.
-add the prompt message, option description in man page.
----
- mount.ocfs2/mount.ocfs2.8.in | 6 ++++++
- mount.ocfs2/mount.ocfs2.c | 17 +++++++++++++++--
- mount.ocfs2/opts.c | 5 +++++
- mount.ocfs2/sundries.h | 1 +
- 4 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/mount.ocfs2/mount.ocfs2.8.in b/mount.ocfs2/mount.ocfs2.8.in
-index 053244d6..a36bdc8c 100644
---- a/mount.ocfs2/mount.ocfs2.8.in
-+++ b/mount.ocfs2/mount.ocfs2.8.in
-@@ -126,6 +126,12 @@ will have no effect. This mount option works with Linux kernel \fB2.6.35\fR and
- Indicates that the file system can create inodes at any location in the volume, including
- those which will result in inode numbers greater than 4 billion.
-
-+.TP
-+\fBnocluster\fR
-+This option allows users to mount a clustered volume without configuring the cluster stack.
-+However, you must be aware that you can only mount the file system from one node at the
-+same time, otherwise, the file system may be damaged. Please use it with caution.
-+
- .TP
- \fB[no]intr\fR
- Specifies whether a signal can interrupt IOs. It is disabled by default.
-diff --git a/mount.ocfs2/mount.ocfs2.c b/mount.ocfs2/mount.ocfs2.c
-index 5481ae9a..27049996 100644
---- a/mount.ocfs2/mount.ocfs2.c
-+++ b/mount.ocfs2/mount.ocfs2.c
-@@ -28,6 +28,7 @@
-
- int verbose = 0;
- int mount_quiet = 0;
-+int nocluster_opt = 0;
- char *progname = NULL;
-
- static int nomtab = 0;
-@@ -112,7 +113,7 @@ static errcode_t add_mount_options(ocfs2_filesys *fs,
- char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1];
- struct ocfs2_super_block *sb = OCFS2_RAW_SB(fs->fs_super);
-
-- if (ocfs2_mount_local(fs) || ocfs2_is_hard_readonly(fs)) {
-+ if (ocfs2_mount_local(fs) || nocluster_opt || ocfs2_is_hard_readonly(fs)) {
- add = OCFS2_HB_NONE;
- goto addit;
- }
-@@ -345,7 +346,19 @@ int main(int argc, char **argv)
- goto bail;
- }
-
-- clustered = (0 == ocfs2_mount_local(fs));
-+ clustered = ((0 == ocfs2_mount_local(fs)) && (0 == nocluster_opt));
-+
-+ if ((0 == ocfs2_mount_local(fs)) && nocluster_opt) {
-+ fprintf(stdout, "Warning: to mount a clustered volume without the cluster stack.\n"
-+ "Please make sure you only mount the file system from one node.\n"
-+ "Otherwise, the file system may be damaged.\n"
-+ "Proceed (y/N): ");
-+ if (toupper(getchar()) != 'Y') {
-+ printf("Aborting operation.\n");
-+ ret = 1;
-+ goto bail;
-+ }
-+ }
-
- if (ocfs2_is_hard_readonly(fs) && (clustered ||
- !(mo.flags & MS_RDONLY))) {
-diff --git a/mount.ocfs2/opts.c b/mount.ocfs2/opts.c
-index ae8129a4..cd03390c 100644
---- a/mount.ocfs2/opts.c
-+++ b/mount.ocfs2/opts.c
-@@ -120,6 +120,11 @@ static int parse_string_opt(char *s)
- struct string_opt_map *m;
- int lth;
-
-+ if (!strncmp(s, "nocluster", 9)) {
-+ nocluster_opt = 1;
-+ return 0;
-+ }
-+
- for (m = &string_opt_map[0]; m->tag; m++) {
- lth = strlen(m->tag);
- if (!strncmp(s, m->tag, lth)) {
-diff --git a/mount.ocfs2/sundries.h b/mount.ocfs2/sundries.h
-index af0df4e2..52b1267d 100644
---- a/mount.ocfs2/sundries.h
-+++ b/mount.ocfs2/sundries.h
-@@ -13,6 +13,7 @@
- #include
- #endif
-
-+extern int nocluster_opt;
- extern int mount_quiet;
- extern int verbose;
- extern int sloppy;
---
-2.21.0
-
diff --git a/mount.ocfs2-point-out-the-default-value-of-mount-opt.patch b/mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
deleted file mode 100644
index b3cd7d5..0000000
--- a/mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From faf103905ec641f1266b93e584d4949cd4ef49cd Mon Sep 17 00:00:00 2001
-From: Gang He
-Date: Thu, 29 Oct 2020 17:34:35 +0800
-Subject: [PATCH] mount.ocfs2: point out the default value of mount options
-
-The default value of some mount options should be clearly pointed
-out in the man page. e.g. update access time, acl, user_xattr.
-This can help users to simplify mount command line.
-
-Signed-off-by: Gang He
----
- mount.ocfs2/mount.ocfs2.8.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mount.ocfs2/mount.ocfs2.8.in b/mount.ocfs2/mount.ocfs2.8.in
-index a36bdc8c..ff78d193 100644
---- a/mount.ocfs2/mount.ocfs2.8.in
-+++ b/mount.ocfs2/mount.ocfs2.8.in
-@@ -26,7 +26,7 @@ The file system will not update access time.
- .TP
- \fBrelatime\fR
- The file system will update atime only if the on-disk atime is older than mtime
--or ctime.
-+or ctime. This is the default mode.
-
- .TP
- \fBstrictatime,atime\_quantum=nrsec\fR
-@@ -36,11 +36,11 @@ zero to always update atime. These two options need work together.
-
- .TP
- \fB[no]acl\fR
--Enables / disables POSIX ACLs (access control lists) support.
-+Enables / disables POSIX ACLs (access control lists) support. It is enabled by default.
-
- .TP
- \fB[no]user_xattr\fR
--Enables / disables extended user attributes.
-+Enables / disables extended user attributes. It is enabled by default.
-
- .TP
- \fBcommit=nrsec\fR
---
-2.12.3
-
diff --git a/mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch b/mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
deleted file mode 100644
index 628f149..0000000
--- a/mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 03be837c7d0b9be393ffb555879c49e6212fbd0f Mon Sep 17 00:00:00 2001
-From: Valentin Vidic
-Date: Thu, 25 Jan 2018 13:05:27 +0100
-Subject: [PATCH] mounted.ocfs2: use include for makedev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- mounted.c: In function ‘build_partition_list’:
- mounted.c:354:13: warning: In the GNU C Library, "makedev" is defined
- by . For historical compatibility, it is
- currently defined by as well, but we plan to
- remove this soon. To use "makedev", include
- directly. If you did not intend to use a system-defined macro
- "makedev", you should undefine it after including .
- makedev(major, minor), &devname);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~
----
- mounted.ocfs2/mounted.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mounted.ocfs2/mounted.c b/mounted.ocfs2/mounted.c
-index 1576f902..090ab4ed 100644
---- a/mounted.ocfs2/mounted.c
-+++ b/mounted.ocfs2/mounted.c
-@@ -25,7 +25,7 @@
- #define _LARGEFILE64_SOURCE
- #define _GNU_SOURCE /* Because libc really doesn't want us using O_DIRECT? */
-
--#include
-+#include
- #include
- #include
- #include
---
-2.19.2
-
diff --git a/ocfs2-tools-1.8.5.tar.gz b/ocfs2-tools-1.8.5.tar.gz
deleted file mode 100644
index 61ece46..0000000
--- a/ocfs2-tools-1.8.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfa2f4ca4285abb592f2d0d968c5a04cf9d72b035965aa7ff48cf4d10cc75281
-size 1528141
diff --git a/ocfs2-tools-1.8.7.tar.gz b/ocfs2-tools-1.8.7.tar.gz
new file mode 100644
index 0000000..898e6ba
--- /dev/null
+++ b/ocfs2-tools-1.8.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d87b9982b6c186f963b39ba4a667d307efe4337748c02aa194f9fe6519bfac8
+size 1522282
diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index 164482f..12f50bb 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed May 26 10:32:30 UTC 2021 - ghe@suse.com
+
+- Update ocfs2-tools.tar.gz to upstream v1.8.7 (bsc#1186308)
+- Update patch due to patching failure
+ + 0008-ocfs2-tools-add-systemd-support-fix.patch
+- Drop patches (merged upstream):
+ - bug-543119-o2dlm.patch
+ - bnc#96864-ocfs2console-fix-starting-failure.patch
+ - fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch
+ - mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
+ - fix-build-failure-with-glibc-2.28.patch
+ - debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch
+ - mount.ocfs2-add-nocluster-mount-option-support.patch
+ - mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
+
-------------------------------------------------------------------
Thu Oct 29 11:10:30 UTC 2020 - ghe@suse.com
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index 4102da4..6b0ff4f 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -1,7 +1,7 @@
#
# spec file for package ocfs2-tools
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,7 +34,7 @@
%endif
Name: ocfs2-tools
-Version: 1.8.5
+Version: 1.8.7
Release: 0
Summary: Oracle Cluster File System 2 Core Tools
License: GPL-2.0-only
@@ -47,7 +47,6 @@ Patch103: debug-ocfs2_hb_ctl.patch
Patch105: bug-470741-debug_start_failures.patch
Patch106: ocfs2-devel.diff
Patch107: reflink-no-syscall.patch
-Patch201: bug-543119-o2dlm.patch
Patch202: fix-configure-check-libs.patch
Patch204: dont-use-var-lock-subsys.patch
Patch205: ocfs2-tools-kernel33.patch
@@ -56,13 +55,6 @@ Patch225: 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
Patch228: 0007-Improve-error-message-if-DLM-service-is-unavailable.patch
Patch405: 0007-vendor-Add-vendor-files-for-sles12.patch
Patch406: 0008-ocfs2-tools-add-systemd-support-fix.patch
-Patch501: bnc#96864-ocfs2console-fix-starting-failure.patch
-Patch502: fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch
-Patch503: mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
-Patch504: fix-build-failure-with-glibc-2.28.patch
-Patch505: debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch
-Patch506: mount.ocfs2-add-nocluster-mount-option-support.patch
-Patch507: mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
BuildRequires: autoconf
BuildRequires: e2fsprogs-devel
@@ -162,7 +154,6 @@ OCFS2 filesystem.
%patch105 -p1
%patch106 -p1
%patch107 -p0
-%patch201 -p1
%patch202 -p1
%patch204 -p1
%patch205 -p1
@@ -171,13 +162,6 @@ OCFS2 filesystem.
%patch228 -p1
%patch405 -p1
%patch406 -p1
-%patch501 -p1
-%patch502 -p1
-%patch503 -p1
-%patch504 -p1
-%patch505 -p1
-%patch506 -p1
-%patch507 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@@ -226,6 +210,8 @@ cd reflink
make DESTDIR="%{buildroot}" install
cd ..
+rm %{buildroot}/sbin/defragfs.ocfs2
+rm %{buildroot}/%{_mandir}/man8/defragfs.ocfs2.8
mv %{buildroot}/{,/usr}/sbin/o2image
mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
#mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk