From ccf3a393c75983a3119b83ebe25e8a87bd78ad53 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Apr 2010 07:09:40 +0000 Subject: [PATCH 1/3] Accepting request 37469 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/ocfs2-tools via accept of submit request 37469 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/37469 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=5 --- ocfs2-mount-gcc45.patch | 21 +++++++++++++++++++++ ocfs2-tools-dynamic-com-err.patch | 12 ++++++++++++ ocfs2-tools.changes | 5 +++++ ocfs2-tools.spec | 6 +++++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 ocfs2-mount-gcc45.patch create mode 100644 ocfs2-tools-dynamic-com-err.patch diff --git a/ocfs2-mount-gcc45.patch b/ocfs2-mount-gcc45.patch new file mode 100644 index 0000000..f26fb38 --- /dev/null +++ b/ocfs2-mount-gcc45.patch @@ -0,0 +1,21 @@ +Index: mount.ocfs2/mount.ocfs2.c +=================================================================== +--- mount.ocfs2/mount.ocfs2.c.orig ++++ 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,7 @@ 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-dynamic-com-err.patch b/ocfs2-tools-dynamic-com-err.patch new file mode 100644 index 0000000..9dc8f95 --- /dev/null +++ b/ocfs2-tools-dynamic-com-err.patch @@ -0,0 +1,12 @@ +Index: o2image/Makefile +=================================================================== +--- o2image/Makefile.orig ++++ o2image/Makefile +@@ -32,6 +32,6 @@ OBJS = $(subst .c,.o,$(CFILES)) + DIST_FILES = $(CFILES) $(HFILES) o2image.8.in + + o2image: $(OBJS) $(LIBOCFS2_DEPS) +- $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) -lpthread ++ $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) -Wl,-Bdynamic $(COM_ERR_LIBS) -lpthread + + include $(TOPDIR)/Postamble.make diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 1005174..34e323b 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 9 07:25:41 UTC 2010 - aj@suse.de + +- Fix build. + ------------------------------------------------------------------- Wed Sep 30 08:03:29 UTC 2009 - aj@suse.de diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index db6b6c3..f2799dc 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -19,7 +19,7 @@ Name: ocfs2-tools -BuildRequires: e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files +BuildRequires: e2fsprogs-devel glib2-devel libcom_err-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.1 Release: 24 @@ -38,6 +38,8 @@ Patch103: ocfs2console-extraoption-fix.diff Patch104: ocfs2console-pop-display-warning.diff Patch105: ocfs2_controld-retry-470741.diff Patch106: tunefs.ocfs2.8.in_more_options.diff +Patch107: ocfs2-mount-gcc45.patch +Patch108: ocfs2-tools-dynamic-com-err.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 @@ -130,6 +132,8 @@ Authors: %patch104 -p1 %patch105 -p1 %patch106 -p1 +%patch107 -p0 +%patch108 -p0 %build # disable as-needed to fix configure checks From f77e13198f55f855c41e53de352d32bfa1c7e45e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 15 Apr 2010 23:10:07 +0000 Subject: [PATCH 2/3] Accepting request 37897 from network:ha-clustering:Factory checked in (request 37897) OBS-URL: https://build.opensuse.org/request/show/37897 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=6 --- ocfs2-mount-gcc45.patch | 21 --------------------- ocfs2-tools-dynamic-com-err.patch | 12 ------------ ocfs2-tools.changes | 5 ----- ocfs2-tools.spec | 6 +----- 4 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 ocfs2-mount-gcc45.patch delete mode 100644 ocfs2-tools-dynamic-com-err.patch diff --git a/ocfs2-mount-gcc45.patch b/ocfs2-mount-gcc45.patch deleted file mode 100644 index f26fb38..0000000 --- a/ocfs2-mount-gcc45.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: mount.ocfs2/mount.ocfs2.c -=================================================================== ---- mount.ocfs2/mount.ocfs2.c.orig -+++ 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,7 @@ 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-dynamic-com-err.patch b/ocfs2-tools-dynamic-com-err.patch deleted file mode 100644 index 9dc8f95..0000000 --- a/ocfs2-tools-dynamic-com-err.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: o2image/Makefile -=================================================================== ---- o2image/Makefile.orig -+++ o2image/Makefile -@@ -32,6 +32,6 @@ OBJS = $(subst .c,.o,$(CFILES)) - DIST_FILES = $(CFILES) $(HFILES) o2image.8.in - - o2image: $(OBJS) $(LIBOCFS2_DEPS) -- $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) -lpthread -+ $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) -Wl,-Bdynamic $(COM_ERR_LIBS) -lpthread - - include $(TOPDIR)/Postamble.make diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 34e323b..1005174 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Apr 9 07:25:41 UTC 2010 - aj@suse.de - -- Fix build. - ------------------------------------------------------------------- Wed Sep 30 08:03:29 UTC 2009 - aj@suse.de diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index f2799dc..db6b6c3 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -19,7 +19,7 @@ Name: ocfs2-tools -BuildRequires: e2fsprogs-devel glib2-devel libcom_err-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files +BuildRequires: e2fsprogs-devel glib2-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.1 Release: 24 @@ -38,8 +38,6 @@ Patch103: ocfs2console-extraoption-fix.diff Patch104: ocfs2console-pop-display-warning.diff Patch105: ocfs2_controld-retry-470741.diff Patch106: tunefs.ocfs2.8.in_more_options.diff -Patch107: ocfs2-mount-gcc45.patch -Patch108: ocfs2-tools-dynamic-com-err.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 @@ -132,8 +130,6 @@ Authors: %patch104 -p1 %patch105 -p1 %patch106 -p1 -%patch107 -p0 -%patch108 -p0 %build # disable as-needed to fix configure checks From 73ccbbfd9454bcd1454fdc562ca7f14c00d40db7 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 15 Apr 2010 23:10:08 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/ocfs2-tools revision 24.0 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=2d9cf140aea42aa6f0602f8c26f3a828 --- ocfs2-mount-gcc45.patch | 21 +++++++++++++++++++++ ocfs2-tools-dynamic-com-err.patch | 12 ++++++++++++ ocfs2-tools.changes | 5 +++++ ocfs2-tools.spec | 18 +++++++++++------- 4 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 ocfs2-mount-gcc45.patch create mode 100644 ocfs2-tools-dynamic-com-err.patch diff --git a/ocfs2-mount-gcc45.patch b/ocfs2-mount-gcc45.patch new file mode 100644 index 0000000..f26fb38 --- /dev/null +++ b/ocfs2-mount-gcc45.patch @@ -0,0 +1,21 @@ +Index: mount.ocfs2/mount.ocfs2.c +=================================================================== +--- mount.ocfs2/mount.ocfs2.c.orig ++++ 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,7 @@ 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-dynamic-com-err.patch b/ocfs2-tools-dynamic-com-err.patch new file mode 100644 index 0000000..9dc8f95 --- /dev/null +++ b/ocfs2-tools-dynamic-com-err.patch @@ -0,0 +1,12 @@ +Index: o2image/Makefile +=================================================================== +--- o2image/Makefile.orig ++++ o2image/Makefile +@@ -32,6 +32,6 @@ OBJS = $(subst .c,.o,$(CFILES)) + DIST_FILES = $(CFILES) $(HFILES) o2image.8.in + + o2image: $(OBJS) $(LIBOCFS2_DEPS) +- $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) -lpthread ++ $(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) -Wl,-Bdynamic $(COM_ERR_LIBS) -lpthread + + include $(TOPDIR)/Postamble.make diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 1005174..34e323b 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 9 07:25:41 UTC 2010 - aj@suse.de + +- Fix build. + ------------------------------------------------------------------- Wed Sep 30 08:03:29 UTC 2009 - aj@suse.de diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index db6b6c3..a88fa2d 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -1,7 +1,7 @@ # # spec file for package ocfs2-tools (Version 1.4.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,11 +19,11 @@ Name: ocfs2-tools -BuildRequires: e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files +BuildRequires: e2fsprogs-devel glib2-devel libcom_err-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.1 -Release: 24 -License: GPL v2 only ; GPL v2 or later +Release: 25 +License: GPLv2+ Group: System/Filesystems Source: ocfs2-tools.tar.bz2 Source1: o2cb.ocf @@ -38,6 +38,8 @@ Patch103: ocfs2console-extraoption-fix.diff Patch104: ocfs2console-pop-display-warning.diff Patch105: ocfs2_controld-retry-470741.diff Patch106: tunefs.ocfs2.8.in_more_options.diff +Patch107: ocfs2-mount-gcc45.patch +Patch108: ocfs2-tools-dynamic-com-err.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 @@ -62,7 +64,7 @@ Authors: Oracle Corporation %package -n ocfs2console -License: GPL v2 or later +License: GPLv2+ Summary: Oracle Cluster Filesystem 2 GUI tools Group: System/Filesystems Obsoletes: ocfs2-support @@ -82,7 +84,7 @@ Authors: Oracle Corporation %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Oracle Cluster File System 2 Development files Group: System/Filesystems Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel @@ -100,7 +102,7 @@ Authors: Oracle Corporation %package o2cb -License: GPL v2 or later +License: GPLv2+ Summary: Oracle Cluster File System 2 Core Tools Group: System/Filesystems Requires: ocfs2-tools = %{version} @@ -130,6 +132,8 @@ Authors: %patch104 -p1 %patch105 -p1 %patch106 -p1 +%patch107 -p0 +%patch108 -p0 %build # disable as-needed to fix configure checks