From b683b7a4dc9c85550da3d3d962c98622acc6b56e Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Mon, 28 Jun 2010 00:02:28 +0000 Subject: [PATCH] - Fix mount.ocfs2.c compilation issue on gcc 4.5 (deb#565100) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=10 --- gcc45-ftbfs-deb-565100.patch | 22 ++++++++++++++++++++++ ocfs2-tools.changes | 5 +++++ ocfs2-tools.spec | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 gcc45-ftbfs-deb-565100.patch diff --git a/gcc45-ftbfs-deb-565100.patch b/gcc45-ftbfs-deb-565100.patch new file mode 100644 index 0000000..828dd94 --- /dev/null +++ b/gcc45-ftbfs-deb-565100.patch @@ -0,0 +1,22 @@ +Index: ocfs2-tools/mount.ocfs2/mount.ocfs2.c +=================================================================== +--- ocfs2-tools.orig/mount.ocfs2/mount.ocfs2.c ++++ ocfs2-tools/mount.ocfs2/mount.ocfs2.c +@@ -261,7 +261,7 @@ int main(int argc, char **argv) + char *extra = NULL; + int dev_ro = 0; + char *hbstr = NULL; +- char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1] = ""; ++ char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1]; + ocfs2_filesys *fs = NULL; + struct o2cb_cluster_desc cluster; + struct o2cb_region_desc desc; +@@ -269,6 +269,8 @@ int main(int argc, char **argv) + int hb_started = 0; + struct stat statbuf; + ++ stackstr[0] = '\0'; ++ + initialize_ocfs_error_table(); + initialize_o2dl_error_table(); + initialize_o2cb_error_table(); diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 76ccadf..9723f53 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 27 23:44:54 UTC 2010 - tserong@novell.com + +- Fix mount.ocfs2.c compilation issue on gcc 4.5 (deb#565100) + ------------------------------------------------------------------- Sun Jun 27 09:58:09 UTC 2010 - tserong@novell.com diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 64e3c71..51da2f4 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -71,6 +71,7 @@ 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 Url: http://oss.oracle.com/projects/ocfs2-tools/ Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 PreReq: %insserv_prereq %fillup_prereq @@ -191,6 +192,7 @@ Authors: %patch401 -p1 %patch402 -p0 %patch500 -p1 +%patch501 -p1 %build %{?suse_update_config:%{suse_update_config -f}}