diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 9723f53..1b6fccc 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Wed Oct 20 17:33:02 UTC 2010 - i@coly.li + +- remove ocfs2-o2cb_ctl-static-glibc.diff, since it is unnecessary + to link glib2 statically in ocfs2-o2cb_ctl now. + +------------------------------------------------------------------- +Wed Oct 6 05:39:20 UTC 2010 - i@coly.li + +- update ocfs2-tools to 1.6.3 +- remove gcc45-ftbfs-deb-565100.patch, the fix is in upstream now. + +------------------------------------------------------------------- +Wed Jun 30 14:12:48 UTC 2010 - i@coly.li + +- remove ocfs2-kmp dependency, since opensuse kernel does not privide such kmp. +- change version string from 1.4.3 to 1.6.0 in ocfs2-tools.spec + +------------------------------------------------------------------- +Wed Jun 30 08:51:06 UTC 2010 - i@coly.li + +- remove bug-585080-handle-symbolic-link.patch since it's upstream now. +- remove version-1.4.3.patch, update to ocfs2-tools 1.6.0 +- remove dx_dirs patch set, since they are upstream now. + 0001-dx_dirs-Add-library-support-for-directory-indexing.patch + 0002-dx_dirs-debugfs.ocfs2-support.patch + 0003-dx_dirs-mkfs.ocfs2-support.patch + 0004-dx_dirs-Add-tunefs.ocfs2-feature-for-indexed-directo.patch + 0005-dx_dirs-Update-for-dr_num_entries.patch + 0006-dx_dirs-add-missing-ocfs2_filesys-fs-parameter.patch + 0007-dx_dirs-more-library-support-for-directory-indexing.patch + 0008-dx_dirs-fsck.ocfs2-support.patch + 0009-dx_dirs-add-blocknr-in-callback-of-ocfs2_dir_iterate.patch + 0010-dx_dirs-add-disable-indexed-dirs-support-in-tunefs.o.patch + 0011-dx_dirs-build-indexed-trees-when-enabling-indexed-di.patch + 0012-dx_dirs-fix-return-value-of-walk_dirblock-when-enabl.patch + 0013-dx_dirs-try-to-install-dir-trailers-when-enable-inde.patch + 0014-dx_dirs-add-an-initial-man-page-entry-for-indexed-di.patch + 0015-fsck.ocfs2-prompt-before-truncating-an-invalid-dir-i.patch + 0016-tunefs.ocfs2-move-o2ne_add_tailers-into-libocfs2ne.c.patch + 0017-dx_dirs-add-check-for-invalid-slot-in-ocfs2_new_dx_r.patch + 0018-mkfs.ocfs2-create-root-and-orphan-directories-as-ind.patch + 0019-libocfs2-fix-flag-check-in-ocfs2_init_dir.patch + 0020-libocfs2-fix-ocfs2_init_dir-to-retain-indexed-flag.patch + 0021-fsck.ocfs2-verify-dirent-dx-entry-linkages.patch + 0022-dx_dirs-stop-iterate-dir-entries-for-I-O-error.patch + 0023-dx_dirs-check-callback-iter-dx_func-return-value-in-.patch + 0024-dx_dirs-remove-unncessary-return-value-assignment.patch + 0025-dx_dirs-unifiy-feature-string-of-indexed-dirs.patch + 0026-dx_dirs-Improve-information-displayed-by-dump_dx_roo.patch + 0027-dx_dirs-stop-iteration-of-dir-trailer-initialization.patch + 0028-dx_dirs-stop-dx-insert-iteration-for-callback-error.patch + 0029-dx_dirs-set-OCFS2_INDEXED_DIR_FL-after-indexed-tree-.patch + 0030-dx_dirs-fix-ocfs2_swap_dx_entry_list-for-big-endian.patch + 0031-dx_dirs-enable-metaecc-and-indexed-dirs-support-as-d.patch + ------------------------------------------------------------------- Sun Jun 27 23:44:54 UTC 2010 - tserong@novell.com diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index ccc68d1..e051f72 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -1,5 +1,5 @@ # -# spec file for package ocfs2-tools (Version 1.4.3) +# spec file for package ocfs2-tools (Version 1.6.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,67 +21,28 @@ 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.4.3 -Release: 1 -License: GPLv2+ +Version: 1.6.3 +Release: 0. +License: GPL v2 or later Group: System/Filesystems Source: ocfs2-tools.tar.bz2 Source1: o2cb.ocf Source2: reflink.tar.bz2 -Patch101: ocfs2-o2cb_ctl-static-glibc.diff -Patch102: force-debug.patch -Patch103: extra-debug.patch -Patch104: debug-ocfs2_hb_ctl.patch -Patch105: ocfs2_controld-pacemaker.diff -Patch106: bug-470741-debug_start_failures.patch -Patch107: ocfs2-devel.diff +Patch101: force-debug.patch +Patch102: extra-debug.patch +Patch103: debug-ocfs2_hb_ctl.patch +Patch104: ocfs2_controld-pacemaker.diff +Patch105: bug-470741-debug_start_failures.patch +Patch106: ocfs2-devel.diff +Patch107: reflink-no-syscall.patch Patch201: bug-543119-o2dlm.patch -Patch202: bug-585080-handle-symbolic-link.patch -Patch301: 0001-dx_dirs-Add-library-support-for-directory-indexing.patch -Patch302: 0002-dx_dirs-debugfs.ocfs2-support.patch -Patch303: 0003-dx_dirs-mkfs.ocfs2-support.patch -Patch304: 0004-dx_dirs-Add-tunefs.ocfs2-feature-for-indexed-directo.patch -Patch305: 0005-dx_dirs-Update-for-dr_num_entries.patch -Patch306: 0006-dx_dirs-add-missing-ocfs2_filesys-fs-parameter.patch -Patch307: 0007-dx_dirs-more-library-support-for-directory-indexing.patch -Patch308: 0008-dx_dirs-fsck.ocfs2-support.patch -Patch309: 0009-dx_dirs-add-blocknr-in-callback-of-ocfs2_dir_iterate.patch -Patch310: 0010-dx_dirs-add-disable-indexed-dirs-support-in-tunefs.o.patch -Patch311: 0011-dx_dirs-build-indexed-trees-when-enabling-indexed-di.patch -Patch312: 0012-dx_dirs-fix-return-value-of-walk_dirblock-when-enabl.patch -Patch313: 0013-dx_dirs-try-to-install-dir-trailers-when-enable-inde.patch -Patch314: 0014-dx_dirs-add-an-initial-man-page-entry-for-indexed-di.patch -Patch315: 0015-fsck.ocfs2-prompt-before-truncating-an-invalid-dir-i.patch -Patch316: 0016-tunefs.ocfs2-move-o2ne_add_tailers-into-libocfs2ne.c.patch -Patch317: 0017-dx_dirs-add-check-for-invalid-slot-in-ocfs2_new_dx_r.patch -Patch318: 0018-mkfs.ocfs2-create-root-and-orphan-directories-as-ind.patch -Patch319: 0019-libocfs2-fix-flag-check-in-ocfs2_init_dir.patch -Patch320: 0020-libocfs2-fix-ocfs2_init_dir-to-retain-indexed-flag.patch -Patch321: 0021-fsck.ocfs2-verify-dirent-dx-entry-linkages.patch -Patch322: 0022-dx_dirs-stop-iterate-dir-entries-for-I-O-error.patch -Patch323: 0023-dx_dirs-check-callback-iter-dx_func-return-value-in-.patch -Patch324: 0024-dx_dirs-remove-unncessary-return-value-assignment.patch -Patch325: 0025-dx_dirs-unifiy-feature-string-of-indexed-dirs.patch -Patch326: 0026-dx_dirs-Improve-information-displayed-by-dump_dx_roo.patch -Patch327: 0027-dx_dirs-stop-iteration-of-dir-trailer-initialization.patch -Patch328: 0028-dx_dirs-stop-dx-insert-iteration-for-callback-error.patch -Patch329: 0029-dx_dirs-set-OCFS2_INDEXED_DIR_FL-after-indexed-tree-.patch -Patch330: 0030-dx_dirs-fix-ocfs2_swap_dx_entry_list-for-big-endian.patch -Patch331: 0031-dx_dirs-enable-metaecc-and-indexed-dirs-support-as-d.patch -Patch401: version-1.4.3.patch -Patch402: reflink-no-syscall.patch -Patch500: fix-configure-check-libs.patch -Patch501: gcc45-ftbfs-deb-565100.patch +Patch202: fix-configure-check-libs.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 AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libdlm openais -%if %suse_version < 1120 -# There's no separate kmp for openSUSE 11.2 -Requires: ocfs2-kmp -%endif %description OCFS is the Oracle Cluster File System. @@ -96,7 +57,7 @@ Authors: Oracle Corporation %package -n ocfs2console -License: GPLv2+ +License: GPL v2 or later Summary: Oracle Cluster Filesystem 2 GUI tools Group: System/Filesystems Obsoletes: ocfs2-support @@ -116,7 +77,7 @@ Authors: Oracle Corporation %package devel -License: GPLv2+ +License: GPL v2 or later Summary: Oracle Cluster File System 2 Development files Group: System/Filesystems Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel @@ -134,7 +95,7 @@ Authors: Oracle Corporation %package o2cb -License: GPLv2+ +License: GPL v2 or later Summary: Oracle Cluster File System 2 Core Tools Group: System/Filesystems Requires: ocfs2-tools = %{version} @@ -159,44 +120,9 @@ Authors: %patch104 -p1 %patch105 -p1 %patch106 -p1 -%patch107 -p1 +%patch107 -p0 %patch201 -p1 %patch202 -p1 -%patch301 -p1 -%patch302 -p1 -%patch303 -p1 -%patch304 -p1 -%patch305 -p1 -%patch306 -p1 -%patch307 -p1 -%patch308 -p1 -%patch309 -p1 -%patch310 -p1 -%patch311 -p1 -%patch312 -p1 -%patch313 -p1 -%patch314 -p1 -%patch315 -p1 -%patch316 -p1 -%patch317 -p1 -%patch318 -p1 -%patch319 -p1 -%patch320 -p1 -%patch321 -p1 -%patch322 -p1 -%patch323 -p1 -%patch324 -p1 -%patch325 -p1 -%patch326 -p1 -%patch327 -p1 -%patch328 -p1 -%patch329 -p1 -%patch330 -p1 -%patch331 -p1 -%patch401 -p1 -%patch402 -p0 -%patch500 -p1 -%patch501 -p1 %build %{?suse_update_config:%{suse_update_config -f}} diff --git a/ocfs2-tools.tar.bz2 b/ocfs2-tools.tar.bz2 index 69a5265..9364607 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:c86b31db7cd2df1f711b977462c47889241a28b907de081c666ed8db7baccf29 -size 1206555 +oid sha256:f9914ed380cf0409689c06c691177d437a5615ffbb39d8083b414e2d499ac467 +size 1238521 diff --git a/ocfs2_controld-pacemaker.diff b/ocfs2_controld-pacemaker.diff index 3c529d0..fc7d000 100644 --- a/ocfs2_controld-pacemaker.diff +++ b/ocfs2_controld-pacemaker.diff @@ -11,12 +11,8 @@ Index: ocfs2-tools/ocfs2_controld/pacemaker.c #include "ocfs2-kernel/kernel-list.h" #include "o2cb/o2cb.h" -@@ -152,10 +154,10 @@ static void process_pcmk(int ci) - - int setup_stack(void) - { -- crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL); -+ crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL, FALSE); +@@ -155,7 +157,7 @@ int setup_stack(void) + crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL); if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { - log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE);