subject:"commit ocfs2\-tools for openSUSE\:Factory"

commit ocfs2-tools for openSUSE:Factory

2020-10-29 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2020-10-29 14:52:53

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new.3463 (New)


Package is "ocfs2-tools"

Thu Oct 29 14:52:53 2020 rev:78 rq:844844 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2020-08-10 
15:01:55.848125067 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.3463/ocfs2-tools.changes
2020-10-29 14:53:03.609260479 +0100
@@ -1,0 +2,6 @@
+Thu Oct 29 11:10:30 UTC 2020 - g...@suse.com
+
+- Point out the default value of mount options (bsc#1178248)
+  + mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
+
+---

New:

  mount.ocfs2-point-out-the-default-value-of-mount-opt.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.9NdGE7/_old  2020-10-29 14:53:04.913260921 +0100
+++ /var/tmp/diff_new_pack.9NdGE7/_new  2020-10-29 14:53:04.917260923 +0100
@@ -62,6 +62,7 @@
 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
@@ -176,6 +177,7 @@
 %patch504 -p1
 %patch505 -p1
 %patch506 -p1
+%patch507 -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects

++ mount.ocfs2-point-out-the-default-value-of-mount-opt.patch ++
>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

commit ocfs2-tools for openSUSE:Factory

2020-08-10 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2020-08-10 15:00:30

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new.3399 (New)


Package is "ocfs2-tools"

Mon Aug 10 15:00:30 2020 rev:77 rq:825208 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2020-05-07 
14:57:07.638577657 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.3399/ocfs2-tools.changes
2020-08-10 15:01:55.848125067 +0200
@@ -1,0 +2,6 @@
+Mon Aug 10 10:50:30 UTC 2020 - g...@suse.com
+
+- Add nocluster mount option support (bsc#1174943)
+  + mount.ocfs2-add-nocluster-mount-option-support.patch
+
+---

New:

  mount.ocfs2-add-nocluster-mount-option-support.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.Qu92Pc/_old  2020-08-10 15:01:57.940126171 +0200
+++ /var/tmp/diff_new_pack.Qu92Pc/_new  2020-08-10 15:01:57.944126174 +0200
@@ -61,6 +61,7 @@
 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
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -174,6 +175,7 @@
 %patch503 -p1
 %patch504 -p1
 %patch505 -p1
+%patch506 -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects

++ mount.ocfs2-add-nocluster-mount-option-support.patch ++
>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) &&

commit ocfs2-tools for openSUSE:Factory

2020-05-07 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2020-05-07 14:56:57

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new.2738 (New)


Package is "ocfs2-tools"

Thu May  7 14:56:57 2020 rev:76 rq:801080 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2020-02-05 
19:43:29.315318744 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.2738/ocfs2-tools.changes
2020-05-07 14:57:07.638577657 +0200
@@ -1,0 +2,6 @@
+Wed May  6 11:30:20 UTC 2020 - g...@suse.com
+
+- Fix debugfs.ocfs2 error on devices with sector size 4096 (bsc#1170530)
+  + debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch
+
+---

New:

  debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.wZH66v/_old  2020-05-07 14:57:08.782579719 +0200
+++ /var/tmp/diff_new_pack.wZH66v/_new  2020-05-07 14:57:08.782579719 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020 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
@@ -60,6 +60,7 @@
 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
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -172,6 +173,7 @@
 %patch502 -p1
 %patch503 -p1
 %patch504 -p1
+%patch505 -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects

++ debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch ++
>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

commit ocfs2-tools for openSUSE:Factory

2020-02-05 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2020-02-05 19:42:30

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new.26092 (New)


Package is "ocfs2-tools"

Wed Feb  5 19:42:30 2020 rev:75 rq:770117 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2019-09-13 
14:58:10.457276869 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.26092/ocfs2-tools.changes   
2020-02-05 19:43:29.315318744 +0100
@@ -1,0 +2,6 @@
+Thu Jan 30 10:29:12 UTC 2020 - Thorsten Kukuk 
+
+- Use %license instead of %doc [bsc#1082318]
+- Remove obsolete /sbin/chkconfig requires
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.Z7OoeC/_old  2020-02-05 19:43:30.675319392 +0100
+++ /var/tmp/diff_new_pack.Z7OoeC/_new  2020-02-05 19:43:30.679319394 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -39,7 +39,7 @@
 Summary:Oracle Cluster File System 2 Core Tools
 License:GPL-2.0-only
 Group:  System/Filesystems
-Url:https://ocfs2.wiki.kernel.org/
+URL:https://ocfs2.wiki.kernel.org/
 Source: ocfs2-tools-%{version}.tar.gz
 Source1:reflink.tar.bz2
 Patch001:   auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
@@ -74,7 +74,6 @@
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires(pre):  %fillup_prereq
-Requires:   /sbin/chkconfig
 Requires:   e2fsprogs
 Requires:   glib2 >= 2.2.3
 Requires:   libdlm
@@ -261,7 +260,8 @@
 
 %files
 %defattr(-,root,root)
-%doc COPYING CREDITS MAINTAINERS
+%license COPYING
+%doc CREDITS MAINTAINERS
 %doc documentation/users_guide.txt
 %dir /usr/lib/udev
 %dir %{_udevrulesdir}

commit ocfs2-tools for openSUSE:Factory

2019-09-13 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2019-09-13 14:58:05

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new.7948 (New)


Package is "ocfs2-tools"

Fri Sep 13 14:58:05 2019 rev:74 rq:730087 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2019-03-05 
12:21:59.684902310 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.7948/ocfs2-tools.changes
2019-09-13 14:58:10.457276869 +0200
@@ -1,0 +2,5 @@
+Tue Sep 10 11:23:05 UTC 2019 - Christophe Giboudeaux 
+
+- Use -ffat-lto-objects when building static libraries.
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.nZm2Er/_old  2019-09-13 14:58:12.609276960 +0200
+++ /var/tmp/diff_new_pack.nZm2Er/_new  2019-09-13 14:58:12.613276961 +0200
@@ -175,6 +175,7 @@
 %patch504 -p1
 
 %build
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 export PROJECT="ocfs2-tools"
 autoreconf -fi -I /usr/share/aclocal

commit ocfs2-tools for openSUSE:Factory

2019-03-05 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2019-03-05 12:21:38

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new.28833 (New)


Package is "ocfs2-tools"

Tue Mar  5 12:21:38 2019 rev:73 rq:681251 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2019-01-21 
10:59:53.743310821 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.28833/ocfs2-tools.changes   
2019-03-05 12:21:59.684902310 +0100
@@ -1,0 +2,7 @@
+Mon Mar  4 10:00:30 UTC 2019 - g...@suse.com
+
+- Fix build failure with glibc-2.28 (bsc#1126968)
+  + mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
+  + fix-build-failure-with-glibc-2.28.patch
+
+---

New:

  fix-build-failure-with-glibc-2.28.patch
  mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.o0lsx0/_old  2019-03-05 12:22:01.648901711 +0100
+++ /var/tmp/diff_new_pack.o0lsx0/_new  2019-03-05 12:22:01.648901711 +0100
@@ -58,6 +58,8 @@
 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
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -169,6 +171,8 @@
 %patch406 -p1
 %patch501 -p1
 %patch502 -p1
+%patch503 -p1
+%patch504 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ fix-build-failure-with-glibc-2.28.patch ++
>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

++ mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch ++
>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

commit ocfs2-tools for openSUSE:Factory

2019-01-21 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2019-01-21 10:58:46

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new.28833 (New)


Package is "ocfs2-tools"

Mon Jan 21 10:58:46 2019 rev:72 rq:666565 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2018-08-20 
16:19:04.248792860 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.28833/ocfs2-tools.changes   
2019-01-21 10:59:53.743310821 +0100
@@ -1,0 +2,5 @@
+Thu Jan 10 10:25:30 UTC 2019 - g...@suse.com
+
+- Add libdlm Requires dependency for ocfs2-tools (bsc#1121382)
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.eBw7Ya/_old  2019-01-21 10:59:54.855309378 +0100
+++ /var/tmp/diff_new_pack.eBw7Ya/_new  2019-01-21 10:59:54.855309378 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -75,6 +75,7 @@
 Requires:   /sbin/chkconfig
 Requires:   e2fsprogs
 Requires:   glib2 >= 2.2.3
+Requires:   libdlm
 Requires:   modutils
 Requires:   net-tools
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

commit ocfs2-tools for openSUSE:Factory

2018-08-20 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2018-08-20 16:19:03

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Mon Aug 20 16:19:03 2018 rev:71 rq:629233 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2017-12-14 
11:01:50.630984485 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2018-08-20 16:19:04.248792860 +0200
@@ -1,0 +2,7 @@
+Mon Apr 30 13:49:06 UTC 2018 - crrodrig...@opensuse.org
+
+- fix pre/post/preun/postun scripts when systemd_enabled 
+- insserv_prereq is only needed when !systemd_enabled
+- run fillup to actually provision /etc/sysconfig/o2cb
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.mmt1oV/_old  2018-08-20 16:19:04.820793667 +0200
+++ /var/tmp/diff_new_pack.mmt1oV/_new  2018-08-20 16:19:04.824793673 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -37,7 +37,7 @@
 Version:1.8.5
 Release:0
 Summary:Oracle Cluster File System 2 Core Tools
-License:GPL-2.0
+License:GPL-2.0-only
 Group:  System/Filesystems
 Url:https://ocfs2.wiki.kernel.org/
 Source: ocfs2-tools-%{version}.tar.gz
@@ -72,7 +72,6 @@
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires(pre):  %fillup_prereq
-Requires(pre):  %insserv_prereq
 Requires:   /sbin/chkconfig
 Requires:   e2fsprogs
 Requires:   glib2 >= 2.2.3
@@ -81,9 +80,10 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Recommends: ocfs2-kmp
 %if 0%{?suse_version} >= 1315
-   %define systemd_enabled 1
+%define systemd_enabled 1
 %else
-   %define systemd_enabled 0
+%define systemd_enabled 0
+Requires(pre):  %insserv_prereq
 %endif
 
 %description
@@ -224,14 +224,34 @@
 %if 0%{_ocfs2console} == 1
 python -c "import compileall; 
compileall.compile_dir('%{buildroot}/%{py_sitedir}/ocfs2interface', 
ddir='%{py_sitedir}/ocfs2interface')"
 %endif
+
+%if %{systemd_enabled}
+%pre o2cb
+%service_add_pre ocfs2.service o2cb.service
+%endif
+
 %preun o2cb
+%if %{systemd_enabled}
+%service_del_preun ocfs2.service o2cb.service
+%else
 %stop_on_removal ocfs2
 %stop_on_removal o2cb
+%endif
+
+%post o2cb
+%fillup_only -n o2cb
+%if %{systemd_enabled}
+%service_add_post ocfs2.service o2cb.service
+%endif
 
 %postun o2cb
+%if %{systemd_enabled}
+%service_del_postun ocfs2.service o2cb.service
+%else
 %{insserv_cleanup}
 %restart_on_update ocfs2
 %restart_on_update o2cb
+%endif
 
 %files
 %defattr(-,root,root)

commit ocfs2-tools for openSUSE:Factory

2017-12-14 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2017-12-14 11:01:18

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Thu Dec 14 11:01:18 2017 rev:70 rq:556582 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2017-11-24 
10:56:48.987144199 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2017-12-14 11:01:50.630984485 +0100
@@ -1,0 +2,10 @@
+Wed Dec 13 03:11:37 UTC 2017 - lc...@suse.com
+
+- Remove install procedures for ocfs2console 
+
+---
+Mon Dec 11 10:40:06 UTC 2017 - lc...@suse.com
+
+- Remove ocfs2console module from spec file
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.SP5RuM/_old  2017-12-14 11:01:52.198908795 +0100
+++ /var/tmp/diff_new_pack.SP5RuM/_new  2017-12-14 11:01:52.210908215 +0100
@@ -21,6 +21,18 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
+#if run  "rpmbuild --with=ocfs2console"
+#_with_ocfs2console will be automatically defined
+%if %{defined _with_ocfs2console}
+   %define _ocfs2console  1
+%else
+   %if 0%{?suse_version} >= 1500
+   %define _ocfs2console 0
+   %else
+   %define _ocfs2console 1
+   %endif
+%endif
+
 Name:   ocfs2-tools
 Version:1.8.5
 Release:0
@@ -55,8 +67,6 @@
 BuildRequires:  libdlm-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libz1
-BuildRequires:  python-devel
-BuildRequires:  python-gtk-devel
 BuildRequires:  readline-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(glib-2.0)
@@ -82,9 +92,12 @@
 This package contains the core user-space tools needed for creating and
 managing the file system.
 
+%if 0%{_ocfs2console} == 1
 %package -n ocfs2console
 Summary:Oracle Cluster Filesystem 2 GUI tools
 Group:  System/Filesystems
+BuildRequires:  python-devel
+BuildRequires:  python-gtk-devel
 Requires:   e2fsprogs
 Requires:   glib2 >= 2.2.3
 Requires:   ocfs2-tools = %{version}
@@ -98,6 +111,7 @@
 OCFS2 is the Oracle Cluster Filesystem.
 
 This package contains additional tools and a GUI (python-gtk).
+%endif
 
 %package devel
 Summary:Oracle Cluster File System 2 Development files
@@ -158,7 +172,14 @@
 %build
 export PROJECT="ocfs2-tools"
 autoreconf -fi -I /usr/share/aclocal
-%configure --disable-debug --enable-ocfs2console=yes --enable-dynamic-fsck=yes 
--enable-dynamic-ctl=yes
+
+%configure --disable-debug \
+%if 0%{_ocfs2console} == 1
+--enable-ocfs2console=yes \
+%endif
+--enable-dynamic-fsck=yes \
+--enable-dynamic-ctl=yes
+
 make OPTS="%{optflags}"
 
 cd reflink
@@ -200,8 +221,9 @@
 chmod a-x %{buildroot}/%{_libdir}/libo2cb.a
 chmod a-x %{buildroot}/%{_libdir}/libo2dlm.a
 chmod a-x %{buildroot}/%{_libdir}/libocfs2.a
+%if 0%{_ocfs2console} == 1
 python -c "import compileall; 
compileall.compile_dir('%{buildroot}/%{py_sitedir}/ocfs2interface', 
ddir='%{py_sitedir}/ocfs2interface')"
-
+%endif
 %preun o2cb
 %stop_on_removal ocfs2
 %stop_on_removal o2cb
@@ -246,11 +268,13 @@
 %{_mandir}/man7/ocfs2.7.gz
 %{_mandir}/man1/o2info.1.gz
 
+%if 0%{_ocfs2console} == 1
 %files -n ocfs2console
 %defattr(-,root,root)
 %{_sbindir}/ocfs2console
 %{py_sitedir}/ocfs2interface
 %{_mandir}/man8/ocfs2console.8*
+%endif
 
 %files o2cb
 %defattr(-,root,root)

commit ocfs2-tools for openSUSE:Factory

2017-11-24 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2017-11-24 10:56:41

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Fri Nov 24 10:56:41 2017 rev:69 rq:545006 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2017-10-23 
16:53:44.723411151 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2017-11-24 10:56:48.987144199 +0100
@@ -1,0 +2,12 @@
+Thu Nov 23 13:48:49 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+- Correct clearly invalid .changes timestamp
+
+---
+Wed Nov 22 10:30:00 UTC 2017 - g...@suse.com
+
+- Remove o2cb resource agent which is obsolete (bsc#1069099)
+
+---

Old:

  o2cb.ocf



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.VoAXrX/_old  2017-11-24 10:56:50.651083431 +0100
+++ /var/tmp/diff_new_pack.VoAXrX/_new  2017-11-24 10:56:50.651083431 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:   ocfs2-tools
 Version:1.8.5
 Release:0
@@ -24,8 +29,7 @@
 Group:  System/Filesystems
 Url:https://ocfs2.wiki.kernel.org/
 Source: ocfs2-tools-%{version}.tar.gz
-Source1:o2cb.ocf
-Source2:reflink.tar.bz2
+Source1:reflink.tar.bz2
 Patch001:   auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
 Patch103:   debug-ocfs2_hb_ctl.patch
 Patch105:   bug-470741-debug_start_failures.patch
@@ -133,7 +137,7 @@
 OCFS2 filesystem.
 
 %prep
-%setup -q -a 2
+%setup -q -a 1
 %patch001 -p1
 %patch103 -p1
 %patch105 -p1
@@ -166,13 +170,10 @@
 %install
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_prefix}/bin
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
 mkdir -p %{buildroot}%{_udevrulesdir}
-mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
 cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir}
-cp -f $RPM_SOURCE_DIR/o2cb.ocf 
%{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
-chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
-cp -f vendor/common/o2cb.sysconfig 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
+cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_fillupdir}/sysconfig.o2cb
 
 %if %{systemd_enabled}
 mkdir -p %{buildroot}/usr/lib/systemd/system
@@ -244,10 +245,6 @@
 %{_mandir}/man5/ocfs2.cluster.conf.5.gz
 %{_mandir}/man7/ocfs2.7.gz
 %{_mandir}/man1/o2info.1.gz
-%dir %{_prefix}/lib/ocf
-%dir %{_prefix}/lib/ocf/resource.d
-%dir %{_prefix}/lib/ocf/resource.d/ocfs2
-%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
 
 %files -n ocfs2console
 %defattr(-,root,root)
@@ -274,7 +271,7 @@
 %endif
 
 %{_mandir}/man8/o2cb_ctl.8*
-%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
+%{_fillupdir}/sysconfig.o2cb
 %{_mandir}/man7/o2cb.7.gz
 %{_mandir}/man8/o2cb.8.gz

commit ocfs2-tools for openSUSE:Factory

2017-10-23 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2017-10-23 16:53:24

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Mon Oct 23 16:53:24 2017 rev:68 rq:535897 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2017-09-12 
19:56:01.257795459 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2017-10-23 16:53:44.723411151 +0200
@@ -1,0 +2,5 @@
+Mon Oct 23 14:25:30 UTC 2017 - g...@suse.com
+
+- Fix dependencies problem between ocfs2-tools and ocfs2-kmp (bsc#1060601)
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.NNqcPZ/_old  2017-10-23 16:53:45.479375770 +0200
+++ /var/tmp/diff_new_pack.NNqcPZ/_new  2017-10-23 16:53:45.479375770 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -65,9 +65,7 @@
 Requires:   modutils
 Requires:   net-tools
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} < 1320
 Recommends: ocfs2-kmp
-%endif
 %if 0%{?suse_version} >= 1315
%define systemd_enabled 1
 %else

commit ocfs2-tools for openSUSE:Factory

2017-09-12 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2017-09-12 19:55:39

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Tue Sep 12 19:55:39 2017 rev:67 rq:523257 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2017-09-09 
20:25:47.204416418 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2017-09-12 19:56:01.257795459 +0200
@@ -4,0 +5 @@
+- Change license to GPL-2.0 from GPL-2.0+



Other differences:
--

commit ocfs2-tools for openSUSE:Factory

2017-09-09 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2017-09-09 20:25:46

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Sat Sep  9 20:25:46 2017 rev:66 rq:521866 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2017-03-17 
15:06:57.998289491 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2017-09-09 20:25:47.204416418 +0200
@@ -1,0 +2,5 @@
+Mon Sep 04 15:45:15 UTC 2017 - g...@suse.com
+
+- Add fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch (bsc#1057008)
+
+---

New:

  fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.6yOz1q/_old  2017-09-09 20:25:48.160281686 +0200
+++ /var/tmp/diff_new_pack.6yOz1q/_new  2017-09-09 20:25:48.164281122 +0200
@@ -20,7 +20,7 @@
 Version:1.8.5
 Release:0
 Summary:Oracle Cluster File System 2 Core Tools
-License:GPL-2.0+
+License:GPL-2.0
 Group:  System/Filesystems
 Url:https://ocfs2.wiki.kernel.org/
 Source: ocfs2-tools-%{version}.tar.gz
@@ -41,6 +41,7 @@
 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
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -150,6 +151,7 @@
 %patch405 -p1
 %patch406 -p1
 %patch501 -p1
+%patch502 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ fsck.ocfs2-fix-compile-error-when-glibc-upgrade.patch ++
>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 000..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;

commit ocfs2-tools for openSUSE:Factory

2017-03-17 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2017-03-17 15:06:53

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Fri Mar 17 15:06:53 2017 rev:65 rq:479852 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2017-03-13 
15:35:06.928438335 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2017-03-17 15:06:57.998289491 +0100
@@ -4,0 +5,3 @@
+- Unify the source files between openSUSE:Factory and SLE12SP3
+  + 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+  - bnc883550-Fix-mkfs.ocfs2-man-page-for-default-slots.patch
@@ -13,7 +15,0 @@
-- Add patches (from SLE12SP2):
-  + force-debug.patch
-  + extra-debug.patch
-  + bug-805764-ocfs2-controld.patch
-  + bnc804707-reduce-RR-priority.patch
-  + 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
-  + 0007-Improve-error-message-if-DLM-service-is-unavailable.patch
@@ -87,0 +84,23 @@
+
+---
+Fri Jun 20 17:54:28 UTC 2014 - rgold...@suse.com
+
+- Fix mkfs.ocfs2 man page to meniton number of slots are
+  dynamically determined based on filesystem size.
+
+---
+Fri May 23 17:32:50 UTC 2014 - rgold...@suse.com
+
+- Corrected udev directory from /etc/udev/rules.d
+
+---
+Fri May 23 16:44:54 UTC 2014 - rgold...@suse.com
+
+- Improve error message if DLM is not available (bnc#867329)
+  + 0007-Improve-error-message-if-DLM-service-is-unavailable.patch
+
+---
+Wed Mar 12 04:31:43 UTC 2014 - rgold...@suse.com
+
+- (bnc#867330) Fix group leave in patch:
+  0002-Remove-controld-dependency-in-group_join-leave.patch

Old:

  bnc804707-reduce-RR-priority.patch
  bug-805764-ocfs2-controld.patch
  extra-debug.patch
  force-debug.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.DC6GoA/_old  2017-03-17 15:06:59.198120160 +0100
+++ /var/tmp/diff_new_pack.DC6GoA/_new  2017-03-17 15:06:59.202119595 +0100
@@ -27,8 +27,6 @@
 Source1:o2cb.ocf
 Source2:reflink.tar.bz2
 Patch001:   auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
-Patch101:   force-debug.patch
-Patch102:   extra-debug.patch
 Patch103:   debug-ocfs2_hb_ctl.patch
 Patch105:   bug-470741-debug_start_failures.patch
 Patch106:   ocfs2-devel.diff
@@ -38,8 +36,6 @@
 Patch204:   dont-use-var-lock-subsys.patch
 Patch205:   ocfs2-tools-kernel33.patch
 Patch206:   ocfs2-tools-resource.patch
-Patch212:   bug-805764-ocfs2-controld.patch
-Patch213:   bnc804707-reduce-RR-priority.patch
 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
@@ -140,8 +136,6 @@
 %prep
 %setup -q -a 2
 %patch001 -p1
-%patch101 -p1
-%patch102 -p1
 %patch103 -p1
 %patch105 -p1
 %patch106 -p1
@@ -151,8 +145,6 @@
 %patch204 -p1
 %patch205 -p1
 %patch206 -p1
-%patch212 -p1
-%patch213 -p1
 %patch225 -p1
 %patch228 -p1
 %patch405 -p1
@@ -175,9 +167,9 @@
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_prefix}/bin
 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
+mkdir -p %{buildroot}%{_udevrulesdir}
 mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
-cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_sysconfdir}/udev/rules.d
+cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir}
 cp -f $RPM_SOURCE_DIR/o2cb.ocf 
%{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
 chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
 cp -f vendor/common/o2cb.sysconfig 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
@@ -222,8 +214,8 @@
 %defattr(-,root,root)
 %doc COPYING CREDITS MAINTAINERS
 %doc documentation/users_guide.txt
-%dir %{_sysconfdir}/udev
-%dir %{_sysconfdir}/udev/rules.d
+%dir /usr/lib/udev
+%dir %{_udevrulesdir}
 /sbin/fsck.ocfs2
 /sbin/mkfs.ocfs2
 /sbin/mounted.ocfs2
@@ -236,7 +228,7 @@
 %{_sbindir}/o2hbmonitor
 %{_bindir}/reflink
 %{_bindir}/o2info
-%config %{_sysconfdir}/udev/rules.d/51-ocfs2.rules
+%{_udevrulesdir}/51-ocfs2.rules
 %{_mandir}/man8/debugfs.ocfs2.8*
 %{_mandir}/man8/fsck.ocfs2.8*
 %{_mandir}/man8/fsck.ocfs2.checks.8*

commit ocfs2-tools for openSUSE:Factory

2017-03-13 Thread root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2017-03-13 15:33:38

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Mon Mar 13 15:33:38 2017 rev:64 rq:478931 version:1.8.5

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2016-04-28 
16:59:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2017-03-13 15:35:06.928438335 +0100
@@ -1,0 +2,20 @@
+Thu Mar  9 12:36:30 UTC 2017 - g...@suse.com
+
+- Update ocfs2-tools.tar.gz to upstream v1.8.5 (fate#322956)
+- Drop patches (merged upstream):
+  - 0001-libo2dlm-Close-file-description-after-use.patch
+  - 0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
+  - 0003-o2cb-add-build-scripts-for-rhel7.patch
+  - 0004-add-systemd-support.patch
+  - 0005-do-not-write-sysconfig-if-status-not-changed.patch
+  - 0006-o2cb-mount-debugfs-when-load-config.patch
+  - 0009-o2cb-fix-systemd-o2cb.service-failure.patch
+- Add patches (from SLE12SP2):
+  + force-debug.patch
+  + extra-debug.patch
+  + bug-805764-ocfs2-controld.patch
+  + bnc804707-reduce-RR-priority.patch
+  + 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+  + 0007-Improve-error-message-if-DLM-service-is-unavailable.patch
+
+---

Old:

  0001-libo2dlm-Close-file-description-after-use.patch
  0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
  0003-o2cb-add-build-scripts-for-rhel7.patch
  0004-add-systemd-support.patch
  0005-do-not-write-sysconfig-if-status-not-changed.patch
  0006-o2cb-mount-debugfs-when-load-config.patch
  0009-o2cb-fix-systemd-o2cb.service-failure.patch
  ocfs2-tools-1.8.4.tar.gz

New:

  0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
  0007-Improve-error-message-if-DLM-service-is-unavailable.patch
  bnc804707-reduce-RR-priority.patch
  bug-805764-ocfs2-controld.patch
  extra-debug.patch
  force-debug.patch
  ocfs2-tools-1.8.5.tar.gz



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.Idpfh1/_old  2017-03-13 15:35:08.224255211 +0100
+++ /var/tmp/diff_new_pack.Idpfh1/_new  2017-03-13 15:35:08.228254646 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,7 +17,7 @@
 
 
 Name:   ocfs2-tools
-Version:1.8.4
+Version:1.8.5
 Release:0
 Summary:Oracle Cluster File System 2 Core Tools
 License:GPL-2.0+
@@ -27,6 +27,8 @@
 Source1:o2cb.ocf
 Source2:reflink.tar.bz2
 Patch001:   auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
+Patch101:   force-debug.patch
+Patch102:   extra-debug.patch
 Patch103:   debug-ocfs2_hb_ctl.patch
 Patch105:   bug-470741-debug_start_failures.patch
 Patch106:   ocfs2-devel.diff
@@ -36,15 +38,12 @@
 Patch204:   dont-use-var-lock-subsys.patch
 Patch205:   ocfs2-tools-kernel33.patch
 Patch206:   ocfs2-tools-resource.patch
-Patch301:   0001-libo2dlm-Close-file-description-after-use.patch
-Patch302:   0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
-Patch401:   0003-o2cb-add-build-scripts-for-rhel7.patch
-Patch402:   0004-add-systemd-support.patch 
-Patch403:   0005-do-not-write-sysconfig-if-status-not-changed.patch
-Patch404:   0006-o2cb-mount-debugfs-when-load-config.patch
+Patch212:   bug-805764-ocfs2-controld.patch
+Patch213:   bnc804707-reduce-RR-priority.patch
+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
-Patch407:   0009-o2cb-fix-systemd-o2cb.service-failure.patch
 Patch501:   bnc#96864-ocfs2console-fix-starting-failure.patch
 
 BuildRequires:  autoconf
@@ -141,6 +140,8 @@
 %prep
 %setup -q -a 2
 %patch001 -p1
+%patch101 -p1
+%patch102 -p1
 %patch103 -p1
 %patch105 -p1
 %patch106 -p1
@@ -150,15 +151,12 @@
 %patch204 -p1
 %patch205 -p1
 %patch206 -p1
-%patch301 -p1
-%patch302 -p1
-%patch401 -p1
-%patch402 -p1
-%patch403 -p1
-%patch404 -p1
+%patch212 -p1
+%patch213 -p1
+%patch225 -p1
+%patch228 -p1
 %patch405 -p1
 %patch406 -p1
-%patch407 -p1
 %patch501 -p1
 
 %build

++ 0004-mkfs.ocfs2-Abort-if-clus

commit ocfs2-tools for openSUSE:Factory

2016-04-28 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2016-04-28 16:55:44

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2016-03-17 
16:49:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2016-04-28 16:59:14.0 +0200
@@ -1,0 +2,5 @@
+Thu Apr 21 09:57:15 UTC 2016 - z...@suse.com
+
+- Add 0009-o2cb-fix-systemd-o2cb.service-failure.patch to fix bsc#963959 
+
+---

New:

  0009-o2cb-fix-systemd-o2cb.service-failure.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.dOj1gv/_old  2016-04-28 16:59:17.0 +0200
+++ /var/tmp/diff_new_pack.dOj1gv/_new  2016-04-28 16:59:17.0 +0200
@@ -44,6 +44,7 @@
 Patch404:   0006-o2cb-mount-debugfs-when-load-config.patch
 Patch405:   0007-vendor-Add-vendor-files-for-sles12.patch
 Patch406:   0008-ocfs2-tools-add-systemd-support-fix.patch
+Patch407:   0009-o2cb-fix-systemd-o2cb.service-failure.patch
 Patch501:   bnc#96864-ocfs2console-fix-starting-failure.patch
 
 BuildRequires:  autoconf
@@ -157,6 +158,7 @@
 %patch404 -p1
 %patch405 -p1
 %patch406 -p1
+%patch407 -p1
 %patch501 -p1
 
 %build

++ 0009-o2cb-fix-systemd-o2cb.service-failure.patch ++
>From 2abe087d41b86198886a076fe222dd6e6537f0d1 Mon Sep 17 00:00:00 2001
From: Junxiao Bi 
Date: Fri, 1 Apr 2016 11:10:13 +0800
Subject: [PATCH] o2cb: fix systemd o2cb.service failure

Configfs may have been mounted by "modprobe -s configfs" in
load_filesystem() on ol7 which has systemd supported, in this
case, mount_filesystem() will fail and o2cb.service can't be
started. To fix this, check fs mount status when mount fail,
if already mounted, don't return error.

Signed-off-by: Junxiao Bi 
Reviewed-by: Eric Ren 
---
 vendor/common/o2cb.init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vendor/common/o2cb.init.sh b/vendor/common/o2cb.init.sh
index 9e0b31c..2d8c9e4 100755
--- a/vendor/common/o2cb.init.sh
+++ b/vendor/common/o2cb.init.sh
@@ -610,6 +610,7 @@ mount_filesystem()
 mount -t ${FSNAME} ${FSNAME} ${MOUNTPOINT}
 if [ $? != 0 ]
 then
+check_filesystem "$FSNAME" "$MOUNTPOINT" && return 2
 echo "Unable to mount ${FSNAME} filesystem" >&2
 return 1
 fi
-- 
2.6.6

commit ocfs2-tools for openSUSE:Factory

2016-03-19 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2016-03-17 16:36:22

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2016-01-22 
01:08:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2016-03-17 16:49:49.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 17 04:00:04 UTC 2016 - z...@suse.com
+
+- Add bnc#96864-ocfs2console-fix-starting-failure.patch 
+
+---

New:

  bnc#96864-ocfs2console-fix-starting-failure.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.uKWPhU/_old  2016-03-17 16:49:51.0 +0100
+++ /var/tmp/diff_new_pack.uKWPhU/_new  2016-03-17 16:49:51.0 +0100
@@ -44,6 +44,7 @@
 Patch404:   0006-o2cb-mount-debugfs-when-load-config.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
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -156,6 +157,7 @@
 %patch404 -p1
 %patch405 -p1
 %patch406 -p1
+%patch501 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ bnc#96864-ocfs2console-fix-starting-failure.patch ++
>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

commit ocfs2-tools for openSUSE:Factory

2016-01-21 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2016-01-21 23:43:12

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2015-12-24 
12:17:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2016-01-22 01:08:15.0 +0100
@@ -5 +5 @@
-  with us forever
+  with us forever bnc#959660



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.EkWM0j/_old  2016-01-22 01:08:18.0 +0100
+++ /var/tmp/diff_new_pack.EkWM0j/_new  2016-01-22 01:08:18.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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

commit ocfs2-tools for openSUSE:Factory

2015-12-24 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2015-12-24 12:17:44

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2015-09-24 
06:16:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2015-12-24 12:17:55.0 +0100
@@ -1,0 +2,7 @@
+Tue Dec 22 03:23:50 UTC 2015 - z...@suse.com
+
+- Make pcmk as default stack for ocfs2, and this patch may go along
+  with us forever
+  +auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
+
+---

New:

  auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.IAWUTh/_old  2015-12-24 12:17:57.0 +0100
+++ /var/tmp/diff_new_pack.IAWUTh/_new  2015-12-24 12:17:57.0 +0100
@@ -26,6 +26,7 @@
 Source: ocfs2-tools-%{version}.tar.gz
 Source1:o2cb.ocf
 Source2:reflink.tar.bz2
+Patch001:   auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch
 Patch103:   debug-ocfs2_hb_ctl.patch
 Patch105:   bug-470741-debug_start_failures.patch
 Patch106:   ocfs2-devel.diff
@@ -137,6 +138,7 @@
 
 %prep
 %setup -q -a 2
+%patch001 -p1
 %patch103 -p1
 %patch105 -p1
 %patch106 -p1

++ auto-setup-pcmk-stack-as-default-if-no-stack-is-setup.patch ++
Index: ocfs2-tools-1.8.4/libo2cb/o2cb_abi.c
===
--- a/libo2cb/o2cb_abi.c
+++ b/libo2cb/o2cb_abi.c
@@ -200,7 +200,7 @@ redo:
}
} else if (len == -ENOENT) {
if (!setup_performed) {
-   o2cb_setup_stack(OCFS2_CLASSIC_CLUSTER_STACK);
+   o2cb_setup_stack(OCFS2_PCMK_CLUSTER_STACK);
setup_performed = 1;
goto redo;
}

commit ocfs2-tools for openSUSE:Factory

2015-09-23 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2015-09-24 06:15:42

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2015-05-10 
10:47:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2015-09-24 06:16:10.0 +0200
@@ -1,0 +2,11 @@
+Tue Sep  8 02:58:55 UTC 2015 - z...@suse.com
+
+- Add systemd support for o2cb and ocfs2 service
+  + 0003-o2cb-add-build-scripts-for-rhel7.patch
+  + 0004-add-systemd-support.patch
+  + 0005-do-not-write-sysconfig-if-status-not-changed.patch
+  + 0006-o2cb-mount-debugfs-when-load-config.patch
+  + 0007-vendor-Add-vendor-files-for-sles12.patch
+  + 0008-ocfs2-tools-add-systemd-support-fix.patch
+
+---

New:

  0003-o2cb-add-build-scripts-for-rhel7.patch
  0004-add-systemd-support.patch
  0005-do-not-write-sysconfig-if-status-not-changed.patch
  0006-o2cb-mount-debugfs-when-load-config.patch
  0007-vendor-Add-vendor-files-for-sles12.patch
  0008-ocfs2-tools-add-systemd-support-fix.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.XW7NHQ/_old  2015-09-24 06:16:11.0 +0200
+++ /var/tmp/diff_new_pack.XW7NHQ/_new  2015-09-24 06:16:11.0 +0200
@@ -37,6 +37,12 @@
 Patch206:   ocfs2-tools-resource.patch
 Patch301:   0001-libo2dlm-Close-file-description-after-use.patch
 Patch302:   0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
+Patch401:   0003-o2cb-add-build-scripts-for-rhel7.patch
+Patch402:   0004-add-systemd-support.patch 
+Patch403:   0005-do-not-write-sysconfig-if-status-not-changed.patch
+Patch404:   0006-o2cb-mount-debugfs-when-load-config.patch
+Patch405:   0007-vendor-Add-vendor-files-for-sles12.patch
+Patch406:   0008-ocfs2-tools-add-systemd-support-fix.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -63,6 +69,11 @@
 %if 0%{?suse_version} < 1320
 Recommends: ocfs2-kmp
 %endif
+%if 0%{?suse_version} >= 1315
+   %define systemd_enabled 1
+%else
+   %define systemd_enabled 0
+%endif
 
 %description
 OCFS2 is the Oracle Cluster File System.
@@ -137,6 +148,12 @@
 %patch206 -p1
 %patch301 -p1
 %patch302 -p1
+%patch401 -p1
+%patch402 -p1
+%patch403 -p1
+%patch404 -p1
+%patch405 -p1
+%patch406 -p1
 
 %build
 export PROJECT="ocfs2-tools"
@@ -153,18 +170,27 @@
 %install
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_prefix}/bin
-mkdir -p %{buildroot}%{_sysconfdir}/init.d
 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d/
 mkdir -p %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2
-cp -f vendor/common/o2cb.init %{buildroot}%{_sysconfdir}/init.d/o2cb
-cp -f vendor/common/ocfs2.init %{buildroot}%{_sysconfdir}/init.d/ocfs2
 cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_sysconfdir}/udev/rules.d
 cp -f $RPM_SOURCE_DIR/o2cb.ocf 
%{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
 chmod a+x %{buildroot}%{_prefix}/lib/ocf/resource.d/ocfs2/o2cb
 cp -f vendor/common/o2cb.sysconfig 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
-ln -sf ..%{_sysconfdir}/init.d/o2cb  %{buildroot}/sbin/rco2cb
-ln -sf ..%{_sysconfdir}/init.d/ocfs2  %{buildroot}/sbin/rcocfs2
+
+%if %{systemd_enabled}
+mkdir -p %{buildroot}/usr/lib/systemd/system
+cp -f  vendor/common/o2cb.service %{buildroot}/usr/lib/systemd/system/
+cp -f  vendor/common/ocfs2.service %{buildroot}/usr/lib/systemd/system/
+cp -f vendor/common/o2cb.init %{buildroot}/sbin
+cp -f vendor/common/ocfs2.init %{buildroot}/sbin
+%else
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+cp -f vendor/common/o2cb.init %{buildroot}%{_sysconfdir}/init.d/o2cb
+cp -f vendor/common/ocfs2.init %{buildroot}%{_sysconfdir}/init.d/ocfs2
+ln -sf ..%{_sysconfdir}/init.d/o2cb  %{buildroot}/sbin/rco2cb
+ln -sf ..%{_sysconfdir}/init.d/ocfs2  %{buildroot}/sbin/rcocfs2
+%endif
 make DESTDIR="%{buildroot}" install
 
 cd reflink
@@ -236,12 +262,21 @@
 %files o2cb
 %defattr(-,root,root)
 %doc README.O2CB
-/sbin/rco2cb
-/sbin/rcocfs2
 /sbin/o2cb_ctl
 /sbin/o2cb
-%{_sysconfdir}/init.d/o2cb
-%{_sysconfdir}/init.d/ocfs2
+
+%if %{systemd_enabled}
+/sbin/o2cb.init
+/sbin/ocfs2.init
+/usr/lib/systemd/system/o2cb.service
+/usr/lib/systemd/system/ocfs2.service
+%else
+/sbin/rco2cb
+/sbin/rcocfs2
+%{_sysconfdir}/init.d/o2cb
+%{_sysconfdir}/init.d/ocfs2
+%endif
+
 %{_mandir}/man8/o2cb_ctl.8*
 %{_localstatedir}/adm/fillup-templates/syscon

commit ocfs2-tools for openSUSE:Factory

2015-05-10 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2015-05-10 10:47:15

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2015-04-25 
11:25:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2015-05-10 10:47:17.0 +0200
@@ -1,0 +2,21 @@
+Fri May  8 13:12:57 UTC 2015 - g...@suse.com
+
+- libo2dlm: Close file description after use
+  + 0001-libo2dlm-Close-file-description-after-use.patch
+- debugfs.ocfs2: Fix a bug in process_open_args()
+  + 0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
+
+---
+Thu May  7 12:26:30 UTC 2015 - g...@suse.com
+
+- Update ocfs2-tools.tar.bz2 to upstream v1.8.4
+- Use new ocfs2-tools git URL https://github.com/markfasheh/ocfs2-tools.git
+- Drop patches (merged upstream):
+  - 0001-Use-cmap-for-getting-cluster-name.patch
+  - 0002-Remove-controld-dependency-in-group_join-leave.patch
+  - 0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
+  - 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+  - 0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
+  - 0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
+
+---

Old:

  0001-Use-cmap-for-getting-cluster-name.patch
  0002-Remove-controld-dependency-in-group_join-leave.patch
  0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
  0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
  0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
  0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
  ocfs2-tools-1.8.3+git.1418704844.65fac00.tar.gz

New:

  0001-libo2dlm-Close-file-description-after-use.patch
  0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
  ocfs2-tools-1.8.4.tar.gz



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.pN7CqD/_old  2015-05-10 10:47:18.0 +0200
+++ /var/tmp/diff_new_pack.pN7CqD/_new  2015-05-10 10:47:18.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,12 +17,12 @@
 
 
 Name:   ocfs2-tools
-Version:1.8.3+git.1418704844.65fac00
+Version:1.8.4
 Release:0
 Summary:Oracle Cluster File System 2 Core Tools
 License:GPL-2.0+
 Group:  System/Filesystems
-Url:http://oss.oracle.com/projects/ocfs2-tools/
+Url:https://ocfs2.wiki.kernel.org/
 Source: ocfs2-tools-%{version}.tar.gz
 Source1:o2cb.ocf
 Source2:reflink.tar.bz2
@@ -35,12 +35,8 @@
 Patch204:   dont-use-var-lock-subsys.patch
 Patch205:   ocfs2-tools-kernel33.patch
 Patch206:   ocfs2-tools-resource.patch
-Patch222:   0001-Use-cmap-for-getting-cluster-name.patch
-Patch223:   0002-Remove-controld-dependency-in-group_join-leave.patch
-Patch224:   0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
-Patch225:   0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
-Patch226:   0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
-Patch227:   0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
+Patch301:   0001-libo2dlm-Close-file-description-after-use.patch
+Patch302:   0002-debugfs.ocfs2-Fix-a-bug-in-process_open_args.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -139,12 +135,8 @@
 %patch204 -p1
 %patch205 -p1
 %patch206 -p1
-%patch222 -p1
-%patch223 -p1
-%patch224 -p1
-%patch225 -p1
-%patch226 -p1
-%patch227 -p1
+%patch301 -p1
+%patch302 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ 0001-libo2dlm-Close-file-description-after-use.patch ++
>From 63a8fc605fc8dc1c4e327eb17ba6a5a614928608 Mon Sep 17 00:00:00 2001
From: piaojun 
Date: Thu, 2 Apr 2015 20:46:47 +0800
Subject: [PATCH 1/2] libo2dlm: Close file description after use

In o2dlm_generate_random_value(), randfd should be closed after use.

Signed-off-by: Jun Piao 
Reviewed-by: Alex Chen 
Signed-off-by: Goldwyn Rodrigues 
---
 libo2dlm/o2dlm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libo2dlm/o2dlm.c b/libo2dlm/o2dlm.c
index dbc642b..375f659 100644
--- a/libo2dlm/o2dlm.c
+++ b/lib

commit ocfs2-tools for openSUSE:Factory

2015-04-25 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2015-04-25 09:53:24

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2014-02-01 
09:40:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2015-04-25 11:25:58.0 +0200
@@ -1,0 +2,33 @@
+Mon Feb  9 03:26:29 UTC 2015 - g...@suse.com
+
+- Update ocfs2-tools.tar.bz2 to upstream v1.8.3
+- Drop patches (merged upstream):
+  - fix-indexed-dirs.patch
+  - 0001-fswreck-Create-a-loop-in-group-chains.patch
+  - 0002-Break-a-chain-loop-in-group-desc.patch
+  - restore-g_list_append.patch
+  - ocfs2console-libraries-include-aio.patch
+  - libocfs2-needs-libaio.patch
+  - libocfs2-Change-asserts-to-error.patch
+- Drop patches for ocfs2_controld
+  - force-debug.patch
+  - extra-debug.patch
+  - bug-805764-ocfs2-controld.patch
+  - bnc804707-reduce-RR-priority.patch
+  - use-symlink-in-udev-rules.patch
+
+---
+Tue Feb 11 16:57:54 UTC 2014 - rgold...@suse.com
+
+- Recommend ocfs2-kmp
+- Autosetup pcmk if no cluster stack found (bnc#862758)
+   + 0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
+- Err if cannot write to cluster_stack (cluster mismatch)
+   + 0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
+
+---
+Mon Feb 10 12:32:37 UTC 2014 - rgold...@suse.com
+
+- Update summary and description for the -o2cb package (bnc#862761)
+
+---

Old:

  0001-fswreck-Create-a-loop-in-group-chains.patch
  0002-Break-a-chain-loop-in-group-desc.patch
  bnc804707-reduce-RR-priority.patch
  bug-805764-ocfs2-controld.patch
  extra-debug.patch
  fix-indexed-dirs.patch
  force-debug.patch
  libocfs2-Change-asserts-to-error.patch
  libocfs2-needs-libaio.patch
  ocfs2-tools-1.8.2+git.1361836695.ff84eb5.tar.gz
  ocfs2console-libraries-include-aio.patch
  restore-g_list_append.patch
  use-symlink-in-udev-rules.patch

New:

  0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
  ocfs2-tools-1.8.3+git.1418704844.65fac00.tar.gz



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.bF7rHq/_old  2015-04-25 11:25:59.0 +0200
+++ /var/tmp/diff_new_pack.bF7rHq/_new  2015-04-25 11:25:59.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   ocfs2-tools
-Version:1.8.2+git.1361836695.ff84eb5
+Version:1.8.3+git.1418704844.65fac00
 Release:0
 Summary:Oracle Cluster File System 2 Core Tools
 License:GPL-2.0+
@@ -26,8 +26,6 @@
 Source: ocfs2-tools-%{version}.tar.gz
 Source1:o2cb.ocf
 Source2:reflink.tar.bz2
-Patch101:   force-debug.patch
-Patch102:   extra-debug.patch
 Patch103:   debug-ocfs2_hb_ctl.patch
 Patch105:   bug-470741-debug_start_failures.patch
 Patch106:   ocfs2-devel.diff
@@ -37,21 +35,12 @@
 Patch204:   dont-use-var-lock-subsys.patch
 Patch205:   ocfs2-tools-kernel33.patch
 Patch206:   ocfs2-tools-resource.patch
-Patch207:   fix-indexed-dirs.patch
-Patch208:   0001-fswreck-Create-a-loop-in-group-chains.patch
-Patch209:   0002-Break-a-chain-loop-in-group-desc.patch
-Patch210:   restore-g_list_append.patch
-Patch212:   bug-805764-ocfs2-controld.patch
-Patch213:   bnc804707-reduce-RR-priority.patch
-Patch214:   use-symlink-in-udev-rules.patch
-Patch215:   ocfs2console-libraries-include-aio.patch
-Patch220:   libocfs2-needs-libaio.patch
-Patch221:   libocfs2-Change-asserts-to-error.patch
 Patch222:   0001-Use-cmap-for-getting-cluster-name.patch
 Patch223:   0002-Remove-controld-dependency-in-group_join-leave.patch
 Patch224:   0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
 Patch225:   0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
 Patch226:   0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
+Patch227:   0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -75,8 +64,7 @@
 Requires:   modutils
 Require

commit ocfs2-tools for openSUSE:Factory

2014-02-01 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2014-02-01 09:40:17

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2014-01-10 
07:16:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2014-02-01 09:40:18.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan 31 22:21:11 UTC 2014 - rgold...@suse.com
+
+- Use libcmap.so.4 for dlopen in 0001-Use-cmap-for-getting-cluster-name.patch
+  to remove dependency on devel package (bnc#860982)
+
+---



Other differences:
--
++ 0001-Use-cmap-for-getting-cluster-name.patch ++
--- /var/tmp/diff_new_pack.3XsAVq/_old  2014-02-01 09:40:19.0 +0100
+++ /var/tmp/diff_new_pack.3XsAVq/_new  2014-02-01 09:40:19.0 +0100
@@ -1,8 +1,9 @@
-From 1110d13d756406a6188299bf68db4743cf7c41a3 Mon Sep 17 00:00:00 2001
+From 6423caf73ef9d0f22acf294e100523bc2af3acc9 Mon Sep 17 00:00:00 2001
 From: Goldwyn Rodrigues 
 Date: Sat, 21 Dec 2013 18:41:04 -0600
 Subject: [PATCH] Use cmap for getting cluster name
 
+Signed-off-by: Goldwyn Rodrigues 
 ---
  debugfs.ocfs2/Makefile |  2 +-
  libo2cb/o2cb_abi.c | 79 +++---
@@ -24,7 +25,7 @@
  MANS = debugfs.ocfs2.8
  
 diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c
-index ae03595..40f8176 100644
+index ae03595..6c3ad73 100644
 --- a/libo2cb/o2cb_abi.c
 +++ b/libo2cb/o2cb_abi.c
 @@ -35,6 +35,8 @@
@@ -69,7 +70,7 @@
 -  break;
 -  }
 +
-+  lib_handle = dlopen("libcmap.so", RTLD_NOW | RTLD_LOCAL);
++  lib_handle = dlopen("libcmap.so.4", RTLD_NOW | RTLD_LOCAL);
 +  if (!lib_handle)
 +  return ret;
 +

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ocfs2-tools for openSUSE:Factory

2014-01-09 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2014-01-10 07:16:15

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2013-10-09 
09:44:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2014-01-10 07:16:16.0 +0100
@@ -1,0 +2,20 @@
+Fri Dec 27 17:56:21 UTC 2013 - rgold...@suse.com
+
+- Patch re-factoring, so that we don't have to compile with ldlm
+  + 0001-Use-cmap-for-getting-cluster-name.patch
+  + 0002-Remove-controld-dependency-in-group_join-leave.patch
+  + 0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
+  + 0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+  + 0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
+  - 0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch
+  - 0002-libo2cb-Remove-rest-of-controld-functions.patch
+  - 0003-Get-cluster-name-from-corosync-cmap.patch
+  - 0004-Remove-controld-structures-from-debugfs.ocfs2.patch
+  - 0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
+  - 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
+  - 0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
+  - 0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+  - 0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
+  - 0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch
+
+---

Old:

  0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch
  0002-libo2cb-Remove-rest-of-controld-functions.patch
  0003-Get-cluster-name-from-corosync-cmap.patch
  0004-Remove-controld-structures-from-debugfs.ocfs2.patch
  0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
  0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
  0007-Use-libdlm_lt.so.3-instead-of-libdlm_lt.so.patch
  0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
  0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
  0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
  0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch

New:

  0001-Use-cmap-for-getting-cluster-name.patch
  0002-Remove-controld-dependency-in-group_join-leave.patch
  0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
  0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
  0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.ZXKX7B/_old  2014-01-10 07:16:17.0 +0100
+++ /var/tmp/diff_new_pack.ZXKX7B/_new  2014-01-10 07:16:17.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -47,16 +47,11 @@
 Patch215:   ocfs2console-libraries-include-aio.patch
 Patch220:   libocfs2-needs-libaio.patch
 Patch221:   libocfs2-Change-asserts-to-error.patch
-Patch222:   0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch
-Patch223:   0002-libo2cb-Remove-rest-of-controld-functions.patch
-Patch224:   0003-Get-cluster-name-from-corosync-cmap.patch
-Patch225:   0004-Remove-controld-structures-from-debugfs.ocfs2.patch
-Patch226:   0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
-Patch227:   0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
-Patch228:   0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
-Patch229:   0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
-Patch230:   0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
-Patch231:   0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch
+Patch222:   0001-Use-cmap-for-getting-cluster-name.patch
+Patch223:   0002-Remove-controld-dependency-in-group_join-leave.patch
+Patch224:   0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
+Patch225:   0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+Patch226:   0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -173,11 +168,6 @@
 %patch224 -p1
 %patch225 -p1
 %patch226 -p1
-%patch227 -p1
-%patch228 -p1
-%patch229 -p1
-%patch230 -p1
-%patch231 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ 0001-Use-cma

commit ocfs2-tools for openSUSE:Factory

2013-10-09 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2013-10-09 09:44:53

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2013-09-25 
17:18:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2013-10-09 09:44:55.0 +0200
@@ -1,0 +2,7 @@
+Tue Oct  1 15:07:57 UTC 2013 - rgold...@suse.com
+
+- mkfs.ocfs2: Setup cluster_stack if not setup
+  + 0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
+- Remove patch numbers for easier future maintainability.
+
+---
@@ -10 +17 @@
-  +bug-838705-change_dlm_lib.patch
+  + 0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch

Old:

  bug-838705-change_dlm_lib.patch

New:

  0007-Use-libdlm_lt.so.3-instead-of-libdlm_lt.so.patch
  0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
  0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.LA2ECi/_old  2013-10-09 09:44:56.0 +0200
+++ /var/tmp/diff_new_pack.LA2ECi/_new  2013-10-09 09:44:56.0 +0200
@@ -55,7 +55,8 @@
 Patch227:   0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
 Patch228:   0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
 Patch229:   0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
-Patch230:   bug-838705-change_dlm_lib.patch
+Patch230:   0010-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
+Patch231:   0011-Use-dlm_lt-instead-of-dlm-for-DLM-libraries.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -176,6 +177,7 @@
 %patch228 -p1
 %patch229 -p1
 %patch230 -p1
+%patch231 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ 0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch ++
--- /var/tmp/diff_new_pack.LA2ECi/_old  2013-10-09 09:44:56.0 +0200
+++ /var/tmp/diff_new_pack.LA2ECi/_new  2013-10-09 09:44:56.0 +0200
@@ -1,7 +1,7 @@
 From 2d1b78517ff14633f4b1cf4adddf6308721f9722 Mon Sep 17 00:00:00 2001
 From: Goldwyn Rodrigues 
 Date: Mon, 19 Aug 2013 08:20:32 -0500
-Subject: [PATCH 1/7] libo2cb: Remove controld actions from group join/leave
+Subject: [PATCH] libo2cb: Remove controld actions from group join/leave
 
 ---
  libo2cb/o2cb_abi.c | 152 +

++ 0002-libo2cb-Remove-rest-of-controld-functions.patch ++
--- /var/tmp/diff_new_pack.LA2ECi/_old  2013-10-09 09:44:56.0 +0200
+++ /var/tmp/diff_new_pack.LA2ECi/_new  2013-10-09 09:44:56.0 +0200
@@ -1,7 +1,7 @@
 From 40b1211091b62a4884d1625fc04d476a07489ca3 Mon Sep 17 00:00:00 2001
 From: Goldwyn Rodrigues 
 Date: Mon, 19 Aug 2013 08:38:59 -0500
-Subject: [PATCH 2/7] libo2cb: Remove rest of controld functions
+Subject: [PATCH] libo2cb: Remove rest of controld functions
 
 ---
  libo2cb/o2cb_abi.c | 388 +
@@ -9,8 +9,8 @@
 
 Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/libo2cb/o2cb_abi.c
 ===
 ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/libo2cb/o2cb_abi.c   
2013-08-23 22:50:22.129878132 -0500
-+++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/libo2cb/o2cb_abi.c
2013-08-23 22:52:20.143277130 -0500
+--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/libo2cb/o2cb_abi.c   
2013-10-01 11:36:42.953751354 -0500
 ocfs2-tools-1.8.2+git.1361836695.ff84eb5/libo2cb/o2cb_abi.c
2013-10-01 11:39:04.935088610 -0500
 @@ -46,7 +46,6 @@
  #define CLUSTER_STACK_FILE"/sys/fs/ocfs2/cluster_stack"
  #define LOCKING_PROTOCOL_FILE "/sys/fs/ocfs2/max_locking_protocol"

++ 0003-Get-cluster-name-from-corosync-cmap.patch ++
--- /var/tmp/diff_new_pack.LA2ECi/_old  2013-10-09 09:44:56.0 +0200
+++ /var/tmp/diff_new_pack.LA2ECi/_new  2013-10-09 09:44:56.0 +0200
@@ -1,7 +1,7 @@
 From 3f2b73105c5e09e17744ec249eed93c60124bd2d Mon Sep 17 00:00:00 2001
 From: Goldwyn Rodrigues 
 Date: Mon, 19 Aug 2013 18:05:04 -0500
-Subject: [PATCH 3/7] Get cluster name from corosync cmap
+Subject: [PATCH] Get cluster name from corosync cmap
 
 ---
  libo2cb/o2cb_abi.c | 20 

++ 0004-Remove-controld-structures-from-debugfs.ocfs2.patch ++
--- /var/tmp/diff_new_pack.LA2ECi/_old  2013-10-09 09:44:56.0 +0200
+++ /var/tmp/diff_new_pack.LA2ECi/_new  2013-10-09 09:44:56.0 +0200
@@ -1,7 +1,7 @@
 From 394a3e7d2758331ba8aa6fc38957611d2447a7

commit ocfs2-tools for openSUSE:Factory

2013-09-25 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2013-09-25 17:18:19

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2013-07-08 
07:24:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2013-09-25 17:18:20.0 +0200
@@ -1,0 +2,83 @@
+Fri Sep 13 08:34:08 UTC 2013 - l...@suse.com
+
+- Move static libraries to devel-static subpackage.
+
+---
+Thu Sep 12 09:30:27 UTC 2013 - lzh...@suse.com
+
+- mkfs.ocfs2/tunefs.ocfs2 may hang there because of dlm_unlock
+  +bug-838705-change_dlm_lib.patch
+
+---
+Thu Sep  5 07:24:42 CDT 2013 - rgold...@suse.com
+
+- mkfs.ocfs2 aborts if cluster information is not found/supplied
+  + 0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
+
+---
+Tue Sep  3 09:14:16 CDT 2013 - rgold...@suse.com
+
+- Make mount.ocfs2 load ocfs2 kmp and setup cluster_stack if 
+  not found
+   + 0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
+
+---
+Thu Aug 22 13:18:01 CDT 2013 - rgold...@suse.com
+
+- Mark o2cb.ocf as obsolete. Anyone using o2cb.ocf will get an
+  info message stating so.
+
+---
+Tue Aug 20 08:02:13 CDT 2013 - rgold...@suse.com
+
+- The nocontrold effort (added nocontrold patches and disabled
+  corosync-2.3 controld compatibility patches): 
+  + 0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch
+  + 0002-libo2cb-Remove-rest-of-controld-functions.patch
+  + 0003-Get-cluster-name-from-corosync-cmap.patch
+  + 0004-Remove-controld-structures-from-debugfs.ocfs2.patch
+  + 0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
+  + 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
+  - 0001-Remove-pacemaker-ais-stuff.patch
+  - 0002-Add-corosync-cfg-to-get-configuration-information.patch
+  - 0003-Remove-daemon-protocol-versions-and-consolidate-fs-v.patch
+  - 0005-Add-cluster_name-and-stack-name.patch
+
+---
+Sat Aug 17 09:26:19 CDT 2013 - rgold...@suse.com
+
+- libocfs2-Change-asserts-to-error.patch: Return control to 
+  fsck.ocfs2 instead of erring
+
+---
+Fri Aug  9 13:55:01 CDT 2013 - rgold...@suse.com
+
+- Add libraries back in devel package. This is required for
+  ocfs2-test
+- libocfs2-needs-libaio.patch: Add -laio to ocfs2.pc
+
+---
+Tue Aug  6 09:21:41 CDT 2013 - rgold...@suse.com
+
+- Fix FS protocol versions: 
+  + 0003-Remove-daemon-protocol-versions-and-consolidate-fs-v.patch
+  - 0003-Hard-code-protocol-versions.patch
+
+---
+Wed Jul 31 08:01:02 CDT 2013 - rgold...@suse.com
+
+- Get ocfs2_controld up to speed with corosync 2.3.x
+  + 0001-Remove-pacemaker-ais-stuff.patch
+  + 0002-Add-corosync-cfg-to-get-configuration-information.patch
+  + 0003-Hard-code-protocol-versions.patch
+  + 0005-Add-cluster_name-and-stack-name.patch
+  - ocfs2_controld-pacemaker.diff
+
+---
+Mon Jul 22 10:57:44 UTC 2013 - y...@suse.com
+
+- ocfs2_controld: ocfs2_controld-pacemaker.diff
+  * Replace use of send_ais_text() with send_cluster_text()
+  * Replace use of ais_dispatch() with plugin_dispatch()
+
+---

Old:

  ocfs2_controld-pacemaker.diff

New:

  0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch
  0002-libo2cb-Remove-rest-of-controld-functions.patch
  0003-Get-cluster-name-from-corosync-cmap.patch
  0004-Remove-controld-structures-from-debugfs.ocfs2.patch
  0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch
  0006-Add-cmap-and-dlm-libraries-in-the-tools.patch
  0008-mount.ocfs2-Read-stack-from-device-and-setup-stack-i.patch
  0009-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
  bug-838705-change_dlm_lib.patch
  libocfs2-Change-asserts-to-error.patch
  libocfs2-needs-libaio.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.flADUX/_old  2013-09-25 17:18:21.0 +0200
+++ /var/tmp/diff_new_pack.flADUX/_new  2013-09-25 17:18:21.0 +0200
@@

commit ocfs2-tools for openSUSE:Factory

2013-07-07 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2013-07-08 07:24:13

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2013-04-24 
21:42:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2013-07-08 07:24:14.0 +0200
@@ -1,0 +2,22 @@
+Wed Jul  3 07:40:31 CDT 2013 - rgold...@suse.com
+- ocfs2console-libraries-include-aio.patch: Include aio 
+  while compiling ocfs2console (bnc#827504)
+
+---
+Mon May 27 08:14:45 UTC 2013 - tser...@suse.com
+
+- Replace NAME= with SYMLINK+= in udev rules (bnc#779718)
+  + use-symlink-in-udev-rules.patch
+
+---
+Wed May 22 03:04:22 UTC 2013 - tser...@suse.com
+
+- reduce ocfs2_controld priority to RR(1). (bnc#804707)
+  + bnc804707-reduce-RR-priority.patch
+- Fix the race between udev making misc device node and ocfs2 
+  opening that device (bnc#805764)
+  + bug-805764-ocfs2-controld.patch
+- ocfs2_controld: ocfs2_controld-pacemaker.diff -- changes to be
+  compatible with pacemaker >= 1.1.8
+
+---

New:

  bnc804707-reduce-RR-priority.patch
  bug-805764-ocfs2-controld.patch
  ocfs2console-libraries-include-aio.patch
  use-symlink-in-udev-rules.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.1ng9g6/_old  2013-07-08 07:24:15.0 +0200
+++ /var/tmp/diff_new_pack.1ng9g6/_new  2013-07-08 07:24:15.0 +0200
@@ -42,6 +42,10 @@
 Patch208:   0001-fswreck-Create-a-loop-in-group-chains.patch
 Patch209:   0002-Break-a-chain-loop-in-group-desc.patch
 Patch210:   restore-g_list_append.patch
+Patch212:   bug-805764-ocfs2-controld.patch
+Patch213:   bnc804707-reduce-RR-priority.patch
+Patch214:   use-symlink-in-udev-rules.patch
+Patch215:   ocfs2console-libraries-include-aio.patch
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libaio-devel
@@ -137,6 +141,10 @@
 %patch208 -p1
 %patch209 -p1
 %patch210 -p1
+%patch212 -p1
+%patch213 -p1
+%patch214 -p1
+%patch215 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ bnc804707-reduce-RR-priority.patch ++
Index: ocfs2-tools/ocfs2_controld/main.c
===
--- ocfs2-tools.orig/ocfs2_controld/main.c
+++ ocfs2-tools/ocfs2_controld/main.c
@@ -1233,7 +1233,7 @@ static void set_scheduler(void)
struct sched_param sched_param;
int rv;
 
-   rv = sched_get_priority_max(SCHED_RR);
+   rv = sched_get_priority_min(SCHED_RR);
if (rv != -1) {
sched_param.sched_priority = rv;
rv = sched_setscheduler(0, SCHED_RR, &sched_param);
++ bug-805764-ocfs2-controld.patch ++
Index: ocfs2-tools/ocfs2_controld/main.c
===
--- ocfs2-tools.orig/ocfs2_controld/main.c
+++ ocfs2-tools/ocfs2_controld/main.c
@@ -948,6 +948,68 @@ static void cpg_joined(int first)
}
 }
 
+static int find_minors(void)
+{
+   FILE *fl;
+   char name[256];
+   uint32_t number;
+   int c;
+   int control_minor = 0;
+
+   if (!(fl = fopen("/proc/misc", "r"))) {
+   log_error("failed to open /proc/misc: %s", strerror(errno));
+   goto out;
+   }
+
+   while (!feof(fl)) {
+   if (fscanf(fl, "%d %255s\n", &number, &name[0]) == 2) {
+   if (!strcmp(name, "ocfs2_control"))
+   control_minor = number;
+   } else do {
+   c = fgetc(fl);
+   } while (c != EOF && c != '\n');
+
+   if (control_minor)
+   break;
+   }
+   fclose(fl);
+
+   if (!control_minor)
+   log_error("Is ocfs2 missing from kernel? No misc devices 
found");
+out:
+   return control_minor;
+}
+
+static int find_udev_device(const char *path, uint32_t minor)
+{
+   struct stat st;
+   int i;
+
+   for (i = 0; i < 10; i++) {
+   if (stat(path, &st) == 0 && minor(st.st_rdev) == minor)
+   return 0;
+   sleep(1);
+   }
+
+   log_error("cannot find device %s with minor %d", path, minor);
+   return -1;
+}
+
+static int setup_misc_device(void)
+{
+   int rv = -1;
+   int control_minor = find_minors();
+
+   if (control_minor) {
+   rv = fi

commit ocfs2-tools for openSUSE:Factory

2013-04-24 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2013-04-24 21:42:48

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "rgold...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2013-04-14 
10:36:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2013-04-24 21:42:50.0 +0200
@@ -1,0 +2,5 @@
+Sat Apr 13 11:57:30 UTC 2013 - sch...@suse.de
+
+- Update config.guess/sub in the coreutils copy
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.ebLvbE/_old  2013-04-24 21:42:51.0 +0200
+++ /var/tmp/diff_new_pack.ebLvbE/_new  2013-04-24 21:42:51.0 +0200
@@ -145,6 +145,7 @@
 make OPTS="%{optflags}"
 
 cd reflink
+cp ../config.guess ../config.sub coreutils-6.9/build-aux/
 %configure
 make reflink
 cd ..

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ocfs2-tools for openSUSE:Factory

2013-04-14 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2013-04-14 10:36:05

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "rgold...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2013-04-05 
07:37:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2013-04-14 10:36:06.0 +0200
@@ -1,0 +2,5 @@
+Tue Apr  9 14:42:28 UTC 2013 - e.isto...@edss.ee
+
+- g_list_append.patch: Fix o2cb node listing
+
+---

New:

  restore-g_list_append.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.Ziv94P/_old  2013-04-14 10:36:08.0 +0200
+++ /var/tmp/diff_new_pack.Ziv94P/_new  2013-04-14 10:36:08.0 +0200
@@ -41,6 +41,7 @@
 Patch207:   fix-indexed-dirs.patch
 Patch208:   0001-fswreck-Create-a-loop-in-group-chains.patch
 Patch209:   0002-Break-a-chain-loop-in-group-desc.patch
+Patch210:   restore-g_list_append.patch
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  libaio-devel
@@ -135,6 +136,7 @@
 %patch207 -p1
 %patch208 -p1
 %patch209 -p1
+%patch210 -p1
 
 %build
 export PROJECT="ocfs2-tools"

++ restore-g_list_append.patch ++
--- ocfs2-tools.orig/o2cb_ctl/jconfig.c  2012-09-25 11:12:57.0 -0500
+++ ocfs2-tools/o2cb_ctl/jconfig.c   2012-09-25 11:13:03.0 -0500
@@ -1082,6 +1082,8 @@
 g_strdup(stanza_name),
 elem);
 }
+else
+g_list_append(elem, cfs);
 
 return(cfs);
 }  /* j_config_add_stanza() */
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ocfs2-tools for openSUSE:Factory

2013-04-04 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2013-04-05 07:36:04

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "rgold...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2012-10-26 
17:27:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2013-04-05 07:37:16.0 +0200
@@ -1,0 +2,30 @@
+Tue Apr  2 09:47:35 UTC 2013 - speili...@suse.com
+
+- Add _service file to automatically pull from git. It can be invoked
+  locally by "osc service disabledrun"
+- Use spec-cleaner
+- No need to call ldconfig without shared objects
+- Drop unneeded %clean section
+- No need to export CFLAGS, %configure does that.
+- Also provide ocfs2-support to have clean upgrade path
+- Drop patches (merged upstream):
+  + fix-pacemaker-libs.patch
+  + support-for-xvd-devices.patch
+
+---
+Thu Mar 21 15:00:46 CDT 2013 - rgold...@suse.com
+
+- Reverted tarball to v1.8.2
+- Added support-for-xvd-devices.patch: Support for xvd devices
+- Fixed a couple of rpmlint errors
+  - libdlm requirement
+  - devel package grouping changed
+- restore-g_list_append.patch is not required for old tarball
+
+---
+Tue Mar 19 02:54:02 CDT 2013 - rgold...@suse.com
+
+- Update ocfs2-tools.tar.bz2 to latest upstream for upstream fixes
+- restore-g_list_append.patch: Fix o2cb node listing
+
+---

Old:

  ocfs2-tools.tar.bz2

New:

  _service
  ocfs2-tools-1.8.2+git.1361836695.ff84eb5.tar.gz



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.zJ5CZ2/_old  2013-04-05 07:37:19.0 +0200
+++ /var/tmp/diff_new_pack.zJ5CZ2/_new  2013-04-05 07:37:19.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,27 +17,13 @@
 
 
 Name:   ocfs2-tools
-BuildRequires:  autoconf
-BuildRequires:  e2fsprogs-devel
-BuildRequires:  glib2-devel
-BuildRequires:  libaio-devel
-BuildRequires:  libbz2-devel
-BuildRequires:  libcorosync-devel
-BuildRequires:  libdlm-devel
-BuildRequires:  libopenais-devel
-BuildRequires:  libpacemaker-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  python-devel
-BuildRequires:  python-gtk-devel
-BuildRequires:  readline-devel
-BuildRequires:  update-desktop-files
+Version:1.8.2+git.1361836695.ff84eb5
+Release:0
 Summary:Oracle Cluster File System 2 Core Tools
 License:GPL-2.0+
 Group:  System/Filesystems
-Version:1.8.2
-Release:0
-Source: ocfs2-tools.tar.bz2
+Url:http://oss.oracle.com/projects/ocfs2-tools/
+Source: ocfs2-tools-%{version}.tar.gz
 Source1:o2cb.ocf
 Source2:reflink.tar.bz2
 Patch101:   force-debug.patch
@@ -55,17 +41,32 @@
 Patch207:   fix-indexed-dirs.patch
 Patch208:   0001-fswreck-Create-a-loop-in-group-chains.patch
 Patch209:   0002-Break-a-chain-loop-in-group-desc.patch
-Url:http://oss.oracle.com/projects/ocfs2-tools/
+BuildRequires:  autoconf
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  libaio-devel
+BuildRequires:  libbz2-devel
+BuildRequires:  libcorosync-devel
+BuildRequires:  libdlm-devel
+BuildRequires:  libopenais-devel
+BuildRequires:  libpacemaker-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  libz1
+BuildRequires:  python-devel
+BuildRequires:  python-gtk-devel
+BuildRequires:  readline-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+Requires(pre):  %fillup_prereq
+Requires(pre):  %insserv_prereq
 Requires:   /sbin/chkconfig
 Requires:   e2fsprogs
 Requires:   glib2 >= 2.2.3
 Requires:   modutils
 Requires:   net-tools
-PreReq: %insserv_prereq %fillup_prereq
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-Requires:   libdlm
 Requires:   openais
-%if %suse_version < 1120  
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} < 1120
 # There's no separate kmp for openSUSE 11.2  
 Recommends: ocfs2-kmp
 %endif
@@ -79,14 +80,14 @@
 %package -n ocfs2console
 Summary:Oracl

commit ocfs2-tools for openSUSE:Factory

2012-10-26 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2012-10-26 17:27:31

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "rgold...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2012-09-27 
10:26:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2012-10-26 17:27:33.0 +0200
@@ -1,0 +2,5 @@
+Thu Oct 25 18:47:16 UTC 2012 - co...@suse.com
+
+- add explicit buildrequire to libbz2-devel
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.NeYDfC/_old  2012-10-26 17:27:35.0 +0200
+++ /var/tmp/diff_new_pack.NeYDfC/_new  2012-10-26 17:27:35.0 +0200
@@ -21,6 +21,7 @@
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  glib2-devel
 BuildRequires:  libaio-devel
+BuildRequires:  libbz2-devel
 BuildRequires:  libcorosync-devel
 BuildRequires:  libdlm-devel
 BuildRequires:  libopenais-devel

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ocfs2-tools for openSUSE:Factory

2012-09-27 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2012-09-27 10:26:23

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "rgold...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2012-08-27 
16:31:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2012-09-27 10:26:24.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 25 11:24:55 CDT 2012 - rgold...@suse.de
+
+- Fix infinite loop while checking for group desc chains
+  (bnc#781122)
+
+---

New:

  0001-fswreck-Create-a-loop-in-group-chains.patch
  0002-Break-a-chain-loop-in-group-desc.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.qpZby7/_old  2012-09-27 10:26:26.0 +0200
+++ /var/tmp/diff_new_pack.qpZby7/_new  2012-09-27 10:26:26.0 +0200
@@ -52,6 +52,8 @@
 Patch205:   ocfs2-tools-kernel33.patch
 Patch206:   ocfs2-tools-resource.patch
 Patch207:   fix-indexed-dirs.patch
+Patch208:   0001-fswreck-Create-a-loop-in-group-chains.patch
+Patch209:   0002-Break-a-chain-loop-in-group-desc.patch
 Url:http://oss.oracle.com/projects/ocfs2-tools/
 Requires:   /sbin/chkconfig
 Requires:   e2fsprogs
@@ -129,6 +131,8 @@
 %patch205 -p1
 %patch206 -p1
 %patch207 -p1
+%patch208 -p1
+%patch209 -p1
 
 %build
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"

++ 0001-fswreck-Create-a-loop-in-group-chains.patch ++
>From 57a0a528f35d2b540d4ed533b6274586056664ce Mon Sep 17 00:00:00 2001
From: Goldwyn Rodrigues 
Date: Thu, 20 Sep 2012 19:39:17 -0500
Subject: [PATCH 1/2] fswreck: Create a loop in group chains

---
 fswreck/corrupt.c   |3 +++
 fswreck/group.c |6 ++
 fswreck/include/fsck_type.h |1 +
 fswreck/main.c  |2 ++
 4 files changed, 12 insertions(+)

Index: ocfs2-tools/fswreck/corrupt.c
===
--- ocfs2-tools.orig/fswreck/corrupt.c  2012-08-24 10:02:19.0 -0500
+++ ocfs2-tools/fswreck/corrupt.c   2012-09-25 11:12:35.0 -0500
@@ -331,6 +331,9 @@ void corrupt_group_desc(ocfs2_filesys *f
case GROUP_FREE_BITS:
func = mess_up_group_minor;
break;
+   case GROUP_CHAIN_LOOP:
+   func = mess_up_group_minor;
+   break;
case GROUP_GEN:
func = mess_up_group_gen;
break;
Index: ocfs2-tools/fswreck/group.c
===
--- ocfs2-tools.orig/fswreck/group.c2012-08-24 10:02:19.0 -0500
+++ ocfs2-tools/fswreck/group.c 2012-09-25 11:12:35.0 -0500
@@ -176,6 +176,12 @@ static void damage_group_desc(ocfs2_file
bg->bg_chain, (bg->bg_chain + 10));
bg->bg_chain += 10;
break;
+   case GROUP_CHAIN_LOOP:
+   fprintf(stdout, "Corrput GROUP_LOOP: "
+   "change group next from %"PRIu64" to %"PRIu64"\n",
+   bg->bg_next_group, cr->c_blkno);
+   bg->bg_next_group = cpu_to_le64(cr->c_blkno);
+   break;
case GROUP_FREE_BITS:
fprintf(stdout, "Corrput GROUP_FREE_BITS: "
"change group free bits from %u to %u\n",
Index: ocfs2-tools/fswreck/include/fsck_type.h
===
--- ocfs2-tools.orig/fswreck/include/fsck_type.h2012-08-24 
10:02:19.0 -0500
+++ ocfs2-tools/fswreck/include/fsck_type.h 2012-09-25 11:12:35.0 
-0500
@@ -57,6 +57,7 @@ enum fsck_type
GROUP_BLKNO,
GROUP_CHAIN,
GROUP_FREE_BITS,
+   GROUP_CHAIN_LOOP,
CHAIN_COUNT,
CHAIN_NEXT_FREE,
CHAIN_EMPTY,
Index: ocfs2-tools/fswreck/main.c
===
--- ocfs2-tools.orig/fswreck/main.c 2012-08-24 10:02:19.0 -0500
+++ ocfs2-tools/fswreck/main.c  2012-09-25 11:12:35.0 -0500
@@ -102,6 +102,8 @@ static struct prompt_code prompt_codes[N
   "Corrupt chain group's blkno"),
define_prompt_code(GROUP_CHAIN, corrupt_group_desc, "", 1,
   "Corrupt chain group's chain where it was in"),
+   define_prompt_code(GROUP_CHAIN_LOOP, corrupt_group_desc, "", 1,
+  "Corrupt group's chain to form a loop"),
define_prompt_code(GROUP_FREE_BITS, corrupt_group_desc, "", 1,

commit ocfs2-tools for openSUSE:Factory

2012-08-27 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2012-08-27 16:31:47

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "rgold...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2012-07-30 
11:44:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2012-08-27 16:31:49.0 +0200
@@ -1,0 +2,10 @@
+Fri Aug 24 12:12:32 CDT 2012 - rgold...@suse.de
+
+- Updated to 1.8.2
+  - o2cluster: change cluster stack stamped on ocfs2 filesystem
+  - added man pages ocfs2, ocfs2.cluster.conf, o2hbmonitor
+  - fsck: faster fsck times because of aio; progress
+- fix-indexed-dirs.patch: Fix corrupt indexed directories through
+  fsck
+
+---

Old:

  fix-ocfs2_controld-crmcommon-link.patch

New:

  fix-indexed-dirs.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.zqSZhQ/_old  2012-08-27 16:31:57.0 +0200
+++ /var/tmp/diff_new_pack.zqSZhQ/_new  2012-08-27 16:31:57.0 +0200
@@ -20,6 +20,7 @@
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  glib2-devel
+BuildRequires:  libaio-devel
 BuildRequires:  libcorosync-devel
 BuildRequires:  libdlm-devel
 BuildRequires:  libopenais-devel
@@ -33,7 +34,7 @@
 Summary:Oracle Cluster File System 2 Core Tools
 License:GPL-2.0+
 Group:  System/Filesystems
-Version:1.8.0
+Version:1.8.2
 Release:0
 Source: ocfs2-tools.tar.bz2
 Source1:o2cb.ocf
@@ -47,10 +48,10 @@
 Patch107:   reflink-no-syscall.patch
 Patch201:   bug-543119-o2dlm.patch
 Patch202:   fix-configure-check-libs.patch
-Patch203:   fix-ocfs2_controld-crmcommon-link.patch
 Patch204:   dont-use-var-lock-subsys.patch
 Patch205:   ocfs2-tools-kernel33.patch
 Patch206:   ocfs2-tools-resource.patch
+Patch207:   fix-indexed-dirs.patch
 Url:http://oss.oracle.com/projects/ocfs2-tools/
 Requires:   /sbin/chkconfig
 Requires:   e2fsprogs
@@ -124,10 +125,10 @@
 %patch107 -p0
 %patch201 -p1
 %patch202 -p1
-%patch203 -p1
 %patch204 -p1
 %patch205 -p1
 %patch206 -p1
+%patch207 -p1
 
 %build
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
@@ -198,6 +199,7 @@
 /sbin/tunefs.ocfs2
 /sbin/mount.ocfs2
 /sbin/ocfs2_hb_ctl
+/sbin/o2cluster
 %{_sbindir}/o2image
 %{_sbindir}/debugfs.ocfs2
 %{_sbindir}/ocfs2_controld.pcmk
@@ -214,6 +216,11 @@
 %{_mandir}/man8/ocfs2_hb_ctl.8*
 %{_mandir}/man8/mount.ocfs2.8*
 %{_mandir}/man8/o2image.8.gz
+%{_mandir}/man8/o2cluster.8.gz
+%{_mandir}/man8/o2hbmonitor.8.gz
+%{_mandir}/man5/o2cb.sysconfig.5.gz
+%{_mandir}/man5/ocfs2.cluster.conf.5.gz
+%{_mandir}/man7/ocfs2.7.gz
 %{_mandir}/man1/o2info.1.gz
 %doc COPYING CREDITS MAINTAINERS
 %doc documentation/users_guide.txt

++ bug-470741-debug_start_failures.patch ++
--- /var/tmp/diff_new_pack.zqSZhQ/_old  2012-08-27 16:31:57.0 +0200
+++ /var/tmp/diff_new_pack.zqSZhQ/_new  2012-08-27 16:31:57.0 +0200
@@ -1,7 +1,7 @@
 Index: ocfs2-tools/libo2cb/o2cb_err.et
 ===
 ocfs2-tools.orig/libo2cb/o2cb_err.et
-+++ ocfs2-tools/libo2cb/o2cb_err.et
+--- ocfs2-tools.orig/libo2cb/o2cb_err.et   2012-08-24 10:22:54.0 
-0500
 ocfs2-tools/libo2cb/o2cb_err.et2012-08-24 10:23:03.0 -0500
 @@ -33,6 +33,12 @@ ec  O2CB_ET_IO,
  ecO2CB_ET_SERVICE_UNAVAILABLE,
"Unable to access cluster service"
@@ -17,9 +17,9 @@
  
 Index: ocfs2-tools/libo2cb/o2cb_abi.c
 ===
 ocfs2-tools.orig/libo2cb/o2cb_abi.c
-+++ ocfs2-tools/libo2cb/o2cb_abi.c
-@@ -2095,7 +2095,7 @@ static errcode_t o2cb_control_handshake(
+--- ocfs2-tools.orig/libo2cb/o2cb_abi.c2012-08-24 10:22:54.0 
-0500
 ocfs2-tools/libo2cb/o2cb_abi.c 2012-08-24 10:23:03.0 -0500
+@@ -2367,7 +2367,7 @@ static errcode_t o2cb_control_handshake(
if (ret != 0)
err = O2CB_ET_IO;
else if (!found)
@@ -28,7 +28,7 @@
break;
}
  
-@@ -2152,7 +2152,7 @@ errcode_t o2cb_control_open(unsigned int
+@@ -2424,7 +2424,7 @@ errcode_t o2cb_control_open(unsigned int
case ENOTDIR:
case ENOENT:
case EISDIR:

++ bug-543119-o2dlm.patch ++
--- /var/tmp/diff_new_pack.zqSZhQ/_old  2012-08-27 16:31:57.0 +0200
+++ /var/tmp/diff_new_pack.zqSZhQ/_new  2012-08-27 16:31:57.000

commit ocfs2-tools for openSUSE:Factory

2012-07-30 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2012-07-30 11:17:41

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "rgold...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2012-05-03 
10:59:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2012-07-30 11:44:53.0 +0200
@@ -1,0 +2,5 @@
+Sat Jul 28 14:27:46 UTC 2012 - a...@suse.de
+
+- Include sys/resource.h for getrlimit etc.
+
+---

New:

  ocfs2-tools-resource.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.Zi3x5y/_old  2012-07-30 11:45:11.0 +0200
+++ /var/tmp/diff_new_pack.Zi3x5y/_new  2012-07-30 11:45:11.0 +0200
@@ -50,6 +50,7 @@
 Patch203:   fix-ocfs2_controld-crmcommon-link.patch
 Patch204:   dont-use-var-lock-subsys.patch
 Patch205:   ocfs2-tools-kernel33.patch
+Patch206:   ocfs2-tools-resource.patch
 Url:http://oss.oracle.com/projects/ocfs2-tools/
 Requires:   /sbin/chkconfig
 Requires:   e2fsprogs
@@ -126,6 +127,7 @@
 %patch203 -p1
 %patch204 -p1
 %patch205 -p1
+%patch206 -p1
 
 %build
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"

++ ocfs2-tools-resource.patch ++
Index: ocfs2-tools/ocfs2_hb_ctl/ocfs2_hb_ctl.c
===
--- ocfs2-tools.orig/ocfs2_hb_ctl/ocfs2_hb_ctl.c
+++ ocfs2-tools/ocfs2_hb_ctl/ocfs2_hb_ctl.c
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "ocfs2/ocfs2.h"
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ocfs2-tools for openSUSE:Factory

2012-05-03 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2012-05-03 10:59:02

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "mfas...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2011-12-25 
17:37:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2012-05-03 10:59:08.0 +0200
@@ -1,0 +2,6 @@
+Tue Apr 24 20:04:54 UTC 2012 - dims...@opensuse.org
+
+- Add ocfs2-tools-kernel33.patch: Fix build with kernel 3.3, which
+  dropped umode_t.
+
+---

New:

  ocfs2-tools-kernel33.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.ZzFEVv/_old  2012-05-03 10:59:10.0 +0200
+++ /var/tmp/diff_new_pack.ZzFEVv/_new  2012-05-03 10:59:10.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -49,11 +49,17 @@
 Patch202:   fix-configure-check-libs.patch
 Patch203:   fix-ocfs2_controld-crmcommon-link.patch
 Patch204:   dont-use-var-lock-subsys.patch
+Patch205:   ocfs2-tools-kernel33.patch
 Url:http://oss.oracle.com/projects/ocfs2-tools/
-Requires:   net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
+Requires:   /sbin/chkconfig
+Requires:   e2fsprogs
+Requires:   glib2 >= 2.2.3
+Requires:   modutils
+Requires:   net-tools
 PreReq: %insserv_prereq %fillup_prereq
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-Requires:   libdlm openais
+Requires:   libdlm
+Requires:   openais
 %if %suse_version < 1120  
 # There's no separate kmp for openSUSE 11.2  
 Recommends: ocfs2-kmp
@@ -67,10 +73,15 @@
 
 %package -n ocfs2console
 Summary:Oracle Cluster Filesystem 2 GUI tools
+Group:  System/Filesystems
 Obsoletes:  ocfs2-support
 Requires:   ocfs2-tools = %{version}
 AutoReqProv:No
-Requires:   e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, python-gtk >= 
1.99.16, ocfs2-tools = %{version}
+Requires:   e2fsprogs
+Requires:   glib2 >= 2.2.3
+Requires:   ocfs2-tools = %{version}
+Requires:   python-gtk >= 1.99.16
+Requires:   vte >= 0.11.10
 
 %description -n ocfs2console
 OCFS is the Oracle Cluster Filesystem.
@@ -79,7 +90,10 @@
 
 %package devel
 Summary:Oracle Cluster File System 2 Development files
-Requires:   ocfs2-tools = %{version}, libcom_err, libcom_err-devel
+Group:  System/Filesystems
+Requires:   libcom_err
+Requires:   libcom_err-devel
+Requires:   ocfs2-tools = %{version}
 
 %description devel
 OCFS is the Oracle Cluster File System.
@@ -89,6 +103,7 @@
 
 %package o2cb
 Summary:Oracle Cluster File System 2 Core Tools
+Group:  System/Filesystems
 Requires:   ocfs2-tools = %{version}
 
 %description o2cb
@@ -110,6 +125,7 @@
 %patch202 -p1
 %patch203 -p1
 %patch204 -p1
+%patch205 -p1
 
 %build
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"

++ ocfs2-tools-kernel33.patch ++
Index: ocfs2-tools/include/ocfs2-kernel/ocfs2_fs.h
===
--- ocfs2-tools.orig/include/ocfs2-kernel/ocfs2_fs.h
+++ ocfs2-tools/include/ocfs2-kernel/ocfs2_fs.h
@@ -316,6 +316,9 @@
  */
 #define OCFS2_CLUSTER_O2CB_GLOBAL_HEARTBEAT(0x01)
 
+// Reintroduce umode_t, which disappeared in kernel 3.3
+typedef unsigned short  umode_t;
+
 struct ocfs2_system_inode_info {
char*si_name;
int si_iflags;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ocfs2-tools for openSUSE:Factory

2011-12-25 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2011-12-25 17:37:22

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "mfas...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes  2011-09-23 
02:15:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 
2011-12-25 17:37:24.0 +0100
@@ -1,0 +2,16 @@
+Wed Dec 21 14:13:46 UTC 2011 - co...@suse.com
+
+- add autoconf as buildrequire to avoid implicit dependency
+
+---
+Wed Dec 21 10:31:42 UTC 2011 - co...@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+---
+Fri Dec 16 12:06:36 UTC 2011 - tser...@suse.com
+
+- Fix ocfs2_controld build (/usr/include/pacemaker/crm/common/stack.h
+  moved to /usr/include/pacemaker/crm/cluster/stack.h) 
+
+---



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.t0eG2n/_old  2011-12-25 17:37:25.0 +0100
+++ /var/tmp/diff_new_pack.t0eG2n/_new  2011-12-25 17:37:25.0 +0100
@@ -15,16 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   ocfs2-tools
-BuildRequires:  e2fsprogs-devel glib2-devel libcorosync-devel libdlm-devel 
libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel 
python-gtk-devel readline-devel update-desktop-files
+BuildRequires:  autoconf
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  glib2-devel
+BuildRequires:  libcorosync-devel
+BuildRequires:  libdlm-devel
+BuildRequires:  libopenais-devel
+BuildRequires:  libpacemaker-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  python-devel
+BuildRequires:  python-gtk-devel
+BuildRequires:  readline-devel
+BuildRequires:  update-desktop-files
 Summary:Oracle Cluster File System 2 Core Tools
-Version:1.8.0
-Release:1
 License:GPL-2.0+
 Group:  System/Filesystems
+Version:1.8.0
+Release:0
 Source: ocfs2-tools.tar.bz2
 Source1:o2cb.ocf
 Source2:reflink.tar.bz2
@@ -42,7 +52,6 @@
 Url:http://oss.oracle.com/projects/ocfs2-tools/
 Requires:   net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
 PreReq: %insserv_prereq %fillup_prereq
-AutoReqProv:on
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires:   libdlm openais
 %if %suse_version < 1120  
@@ -56,16 +65,8 @@
 This package contains the core user-space tools needed for creating and
 managing the file system.
 
-
-
-Authors:
-
-Oracle Corporation
-
 %package -n ocfs2console
-License:GPL-2.0+
 Summary:Oracle Cluster Filesystem 2 GUI tools
-Group:  System/Filesystems
 Obsoletes:  ocfs2-support
 Requires:   ocfs2-tools = %{version}
 AutoReqProv:No
@@ -76,16 +77,8 @@
 
 This package contains additional tools and a GUI (python-gtk).
 
-
-
-Authors:
-
-Oracle Corporation
-
 %package devel
-License:GPL-2.0+
 Summary:Oracle Cluster File System 2 Development files
-Group:  System/Filesystems
 Requires:   ocfs2-tools = %{version}, libcom_err, libcom_err-devel
 
 %description devel
@@ -94,16 +87,8 @@
 This package contains the header files and static libraries for
 developing low-level OCFS2-aware applications.
 
-
-
-Authors:
-
-Oracle Corporation
-
 %package o2cb
-License:GPL-2.0+
 Summary:Oracle Cluster File System 2 Core Tools
-Group:  System/Filesystems
 Requires:   ocfs2-tools = %{version}
 
 %description o2cb
@@ -112,12 +97,6 @@
 This package contains the core user-space tools needed for creating and
 managing the file system.
 
-
-
-Authors:
-
-Oracle Corporation
-
 %prep
 %setup -q -n %{name} -a 2
 %patch101 -p1
@@ -133,7 +112,6 @@
 %patch204 -p1
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
 export PROJECT="ocfs2-tools"
 autoreconf -fi -I /usr/share/aclocal

++ ocfs2_controld-pacemaker.diff ++
--- /var/tmp/diff_new_pack.t0eG2n/_old  2011-12-25 17:37:25.0 +0100
+++ /var/tmp/diff_new_pack.t0eG2n/_new  2011-12-25 17:37:25.0 +0100
@@ -2,10 +2,12 @@
 ===
 --- ocfs2-tools.orig/ocfs2_controld/pacemaker.c
 +++ ocfs2-tools/ocfs2_controld/pacemaker.c
-@@ -31,6 +31,8 @@

commit ocfs2-tools for openSUSE:Factory

2011-12-06 Thread h_root

Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory 
checked in at 2011-12-06 18:33:18

Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
 and  /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New)


Package is "ocfs2-tools", Maintainer is "mfas...@suse.com"

Changes:




Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.Hi7Qfn/_old  2011-12-06 18:54:30.0 +0100
+++ /var/tmp/diff_new_pack.Hi7Qfn/_new  2011-12-06 18:54:30.0 +0100
@@ -23,7 +23,7 @@
 Summary:Oracle Cluster File System 2 Core Tools
 Version:1.8.0
 Release:1
-License:GPLv2+
+License:GPL-2.0+
 Group:  System/Filesystems
 Source: ocfs2-tools.tar.bz2
 Source1:o2cb.ocf
@@ -63,7 +63,7 @@
 Oracle Corporation
 
 %package -n ocfs2console
-License:GPLv2+
+License:GPL-2.0+
 Summary:Oracle Cluster Filesystem 2 GUI tools
 Group:  System/Filesystems
 Obsoletes:  ocfs2-support
@@ -83,7 +83,7 @@
 Oracle Corporation
 
 %package devel
-License:GPLv2+
+License:GPL-2.0+
 Summary:Oracle Cluster File System 2 Development files
 Group:  System/Filesystems
 Requires:   ocfs2-tools = %{version}, libcom_err, libcom_err-devel
@@ -101,7 +101,7 @@
 Oracle Corporation
 
 %package o2cb
-License:GPLv2+
+License:GPL-2.0+
 Summary:Oracle Cluster File System 2 Core Tools
 Group:  System/Filesystems
 Requires:   ocfs2-tools = %{version}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit ocfs2-tools for openSUSE:Factory

2011-09-01 Thread h_root


Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory
checked in at Thu Sep 1 15:47:09 CEST 2011.




--- ocfs2-tools/ocfs2-tools.changes 2011-04-15 15:26:41.0 +0200
+++ /mounts/work_src_done/STABLE/ocfs2-tools/ocfs2-tools.changes
2011-08-31 10:51:32.0 +0200
@@ -1,0 +2,10 @@
+Tue Aug 30 09:38:52 UTC 2011 - tser...@suse.com
+
+- Don't use /var/lock/subsys in /etc/init.d/ocfs2 (bnc#714644)
+
+---
+Mon Aug 29 05:16:05 UTC 2011 - tser...@suse.com
+
+- Add -lcrmcommon to fix ocfs2_controld build.
+
+---
@@ -4,0 +15,27 @@
+  - mkfs.ocfs2 enables file system features indexed-dirs, discontig-bg,
+refcount & extended-slotmap by default.
+  - ocfs2console is no longer built by default.
+  - ocfs2-tools: fsck.ocfs2 and *ctl built dynamically by default
+  - debugfs: Add -T to logdump
+  - mounted.ocfs2: Show cluster and global heartbeat
+  - mount.ocfs2: Validate mount path before mount
+  - mount.ocfs2: Add support for o2cb global heartbeat
+  - tools: Detect differing cluster name and heartbeat modes
+  - mkfs.ocfs2: Add -U option to allow custom UUIDs
+  - mkfs.ocfs2: Add --global-heartbeat option
+  - libo2cb: Validate cluster name and cluster flags in 
classic_begin_group_join()
+  - o2cb: Add man page
+  - o2cb: Add ops start-heartbeat and stop-heartbeat
+  - o2cb: Add ops register-cluster and unregister-cluster
+  - o2cb: Add ops list-clusters, list-cluster, list-nodes and list-heartbeats
+  - o2cb: Add ops add-heartbeat, remove-heartbeat and heartbeat-mode
+  - o2cb: Add ops add-node and remove-node
+  - o2cb: Add ops add-cluster and remove-cluster
+  - o2cb: Add a new cluster configuration tool
+  - libo2cb: Adds support for global heartbeat
+  - libo2cb: Extend libo2cb api to learn ip address/port/local of a registered 
node
+  - o2cb_scandisk: Scan heartbeat devices
+  - debugfs.ocfs2: Journal logdump prints full inode and extent blocks
+  - debugfs.ocfs2: Improve block detection
+  - ocfs2-tools: Set hash seed when convert ocfs2 to support indexed-dirs
+  - ocfs2-tools: o2hbmonitor moved to /usr/sbin

calling whatdependson for head-i586


New:

  dont-use-var-lock-subsys.patch
  fix-ocfs2_controld-crmcommon-link.patch



Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.mRKfHl/_old  2011-09-01 15:35:20.0 +0200
+++ /var/tmp/diff_new_pack.mRKfHl/_new  2011-09-01 15:35:20.0 +0200
@@ -21,8 +21,8 @@
 Name:   ocfs2-tools
 BuildRequires:  e2fsprogs-devel glib2-devel libcorosync-devel libdlm-devel 
libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel 
python-gtk-devel readline-devel update-desktop-files
 Summary:Oracle Cluster File System 2 Core Tools
-Version:1.6.3
-Release:8
+Version:1.8.0
+Release:1
 License:GPLv2+
 Group:  System/Filesystems
 Source: ocfs2-tools.tar.bz2
@@ -37,6 +37,8 @@
 Patch107:   reflink-no-syscall.patch
 Patch201:   bug-543119-o2dlm.patch
 Patch202:   fix-configure-check-libs.patch
+Patch203:   fix-ocfs2_controld-crmcommon-link.patch
+Patch204:   dont-use-var-lock-subsys.patch
 Url:http://oss.oracle.com/projects/ocfs2-tools/
 Requires:   net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
 PreReq: %insserv_prereq %fillup_prereq
@@ -127,6 +129,8 @@
 %patch107 -p0
 %patch201 -p1
 %patch202 -p1
+%patch203 -p1
+%patch204 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}

++ dont-use-var-lock-subsys.patch ++
Index: ocfs2-tools/vendor/common/ocfs2.init
===
--- ocfs2-tools.orig/vendor/common/ocfs2.init
+++ ocfs2-tools/vendor/common/ocfs2.init
@@ -107,9 +107,6 @@ FUSER=`which fuser`
 
 case "$1" in
 start|reload)
-if [ -d /var/lock/subsys ] ; then
-touch /var/lock/subsys/ocfs2
-fi
 if [ -n "`ocfs2fstab`" ] ; then
 echo -n "Starting Oracle Cluster File System (OCFS2) "
 mount -at ocfs2
@@ -143,9 +140,6 @@ case "$1" in
 retry=$(($retry - 1))
 sig=-9
 done
-if [ -z "$remaining" ] && [ -e /var/lock/subsys/ocfs2 ] ; then
-rm /var/lock/subsys/ocfs2
-fi
 [ -z "$remaining" ] && success_status
 ;;
 restart|force-reload)
++ fix-ocfs2_controld-crmcommon-link.patch ++
Index: ocfs2-tools/ocfs2_controld/Makefile
===
--- ocfs2-tools.orig/ocfs2_controld/Makefile
+++ ocfs2-tools/ocfs2_controld/Makefile
@@ -67,7 +67,7 @@ DIST_FILES =  \
 ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS)

commit ocfs2-tools for openSUSE:Factory

2011-06-21 Thread h_root


Hello community,

here is the log from the commit of package ocfs2-tools for openSUSE:Factory
checked in at Tue Jun 21 11:56:59 CEST 2011.




--- ocfs2-tools/ocfs2-tools.changes 2010-12-02 09:27:39.0 +0100
+++ /mounts/work_src_done/STABLE/ocfs2-tools/ocfs2-tools.changes
2011-04-15 15:26:41.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr 15 12:46:03 UTC 2011 - i...@coly.li
+
+- update ocfs2-tools to 1.8.0
+
+---
@@ -17,0 +23,6 @@
+
+---
+Wed Jul 28 21:35:46 PDT 2010 - mfas...@novell.com
+ 
+- Make ocfs2-kmp a Recommend instead of a Requires. This allows easier
+  building of packages which in turn depend on ocfs2-tools.

calling whatdependson for head-i586




Other differences:
--
++ ocfs2-tools.spec ++
--- /var/tmp/diff_new_pack.oCTgdw/_old  2011-06-21 11:43:47.0 +0200
+++ /var/tmp/diff_new_pack.oCTgdw/_new  2011-06-21 11:43:47.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package ocfs2-tools (Version 1.6.3)
+# spec file for package ocfs2-tools
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 BuildRequires:  e2fsprogs-devel glib2-devel libcorosync-devel libdlm-devel 
libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel 
python-gtk-devel readline-devel update-desktop-files
 Summary:Oracle Cluster File System 2 Core Tools
 Version:1.6.3
-Release:2
+Release:8
 License:GPLv2+
 Group:  System/Filesystems
 Source: ocfs2-tools.tar.bz2
@@ -43,6 +43,10 @@
 AutoReqProv:on
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Requires:   libdlm openais
+%if %suse_version < 1120  
+# There's no separate kmp for openSUSE 11.2  
+Recommends: ocfs2-kmp
+%endif
 
 %description
 OCFS is the Oracle Cluster File System.
@@ -129,7 +133,7 @@
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
 export PROJECT="ocfs2-tools"
 autoreconf -fi -I /usr/share/aclocal
-%configure --disable-debug --prefix=/usr --mandir=%{_mandir} 
--enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
+%configure --disable-debug --prefix=/usr --mandir=%{_mandir} 
--enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
 make OPTS="$RPM_OPT_FLAGS"
 
 cd reflink
@@ -197,7 +201,9 @@
 %{_sbindir}/o2image
 %{_sbindir}/debugfs.ocfs2
 %{_sbindir}/ocfs2_controld.pcmk
+%{_sbindir}/o2hbmonitor
 %{_bindir}/reflink
+%{_bindir}/o2info
 %config %{_sysconfdir}/udev/rules.d/51-ocfs2.rules
 %{_mandir}/man8/debugfs.ocfs2.8*
 %{_mandir}/man8/fsck.ocfs2.8*
@@ -208,6 +214,7 @@
 %{_mandir}/man8/ocfs2_hb_ctl.8*
 %{_mandir}/man8/mount.ocfs2.8*
 %{_mandir}/man8/o2image.8.gz
+%{_mandir}/man1/o2info.1.gz
 %doc COPYING CREDITS MAINTAINERS
 %doc documentation/users_guide.txt
 %dir /usr/lib/ocf
@@ -226,11 +233,13 @@
 /sbin/rco2cb
 /sbin/rcocfs2
 /sbin/o2cb_ctl
+/sbin/o2cb
 %{_sysconfdir}/init.d/o2cb
 %{_sysconfdir}/init.d/ocfs2
 %{_mandir}/man8/o2cb_ctl.8*
 /var/adm/fillup-templates/sysconfig.o2cb
 %{_mandir}/man7/o2cb.7.gz
+%{_mandir}/man8/o2cb.8.gz
 %doc README.O2CB 
 
 %files devel

++ ocfs2-tools.tar.bz2 ++
 9792 lines of diff (skipped)






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

39 matches

Mail list logo