diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index c6bdba0..ca7f0ab 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -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 @@ -55,6 +55,7 @@ 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 Url: http://oss.oracle.com/projects/ocfs2-tools/ Requires: /sbin/chkconfig Requires: e2fsprogs @@ -134,6 +135,7 @@ managing the file system. %patch207 -p1 %patch208 -p1 %patch209 -p1 +%patch210 -p1 %build export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" diff --git a/ocfs2-tools.tar.bz2 b/ocfs2-tools.tar.bz2 index ab29b0b..6c70aac 100644 --- a/ocfs2-tools.tar.bz2 +++ b/ocfs2-tools.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a66c14aa2e505099784dd5f2378a6a817265dd7fb637f853abb682d60a7b5cb7 -size 1125613 +oid sha256:64f3d14752d1c3731255f2680cb980b2d3ac3b4e4ae7cc6e1558a21ee3f73cfe +size 1132271 diff --git a/restore-g_list_append.patch b/restore-g_list_append.patch new file mode 100644 index 0000000..d942589 --- /dev/null +++ b/restore-g_list_append.patch @@ -0,0 +1,24 @@ +From: Goldwyn Rodrigues +Subject: [PATCH] Fix list_append in jconfig.c + +Patch deb5ade9145f8809f1fde19cf53bdfdf1fb7963e was over-zealous in +removing warnings and g_list_append() got deleted. + +Restore g_list_append() to fix the issue. + +Signed-off-by: Goldwyn Rodrigues +--- + +diff --git a/o2cb_ctl/jconfig.c b/o2cb_ctl/jconfig.c +index bad34ba..79bbddb 100644 +--- a/o2cb_ctl/jconfig.c ++++ b/o2cb_ctl/jconfig.c +@@ -1082,6 +1082,8 @@ JConfigStanza *j_config_add_stanza(JConfig *cf, + g_strdup(stanza_name), + elem); + } ++ else ++ g_list_append(elem, cfs); + + return(cfs); + } /* j_config_add_stanza() */