[glusterfs] glusterfs-3.3.0-3 fix segv in cmd_heal_volume_brick_out (RHEL seems particularly sensitive to this b
Kaleb S. KEITHLEY
kkeithle at fedoraproject.org
Wed Jul 18 18:03:31 UTC 2012
commit cd99a1a6f642e5b344cb70ffcdb8befe73be682b
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date: Wed Jul 18 14:02:21 2012 -0400
glusterfs-3.3.0-3
fix segv in cmd_heal_volume_brick_out (RHEL seems particularly sensitive
to this bug.)
glusterfs-3.3.0.cli.cli-rpc-ops.c.patch | 20 ++++++++++++++++++++
glusterfs.spec | 8 +++++++-
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/glusterfs-3.3.0.cli.cli-rpc-ops.c.patch b/glusterfs-3.3.0.cli.cli-rpc-ops.c.patch
new file mode 100644
index 0000000..3d7ca10
--- /dev/null
+++ b/glusterfs-3.3.0.cli.cli-rpc-ops.c.patch
@@ -0,0 +1,20 @@
+*** cli/src/cli-rpc-ops.c.orig 2012-07-18 13:16:43.720998232 -0400
+--- cli/src/cli-rpc-ops.c 2012-07-18 13:19:52.463999495 -0400
+***************
+*** 5832,5838 ****
+ if (!time) {
+ cli_out ("%s", path);
+ } else {
+! tm = localtime ((time_t*)(&time));
+ strftime (timestr, sizeof (timestr),
+ "%Y-%m-%d %H:%M:%S", tm);
+ if (i ==0) {
+--- 5832,5839 ----
+ if (!time) {
+ cli_out ("%s", path);
+ } else {
+! time_t hack = time;
+! tm = localtime (&hack);
+ strftime (timestr, sizeof (timestr),
+ "%Y-%m-%d %H:%M:%S", tm);
+ if (i ==0) {
diff --git a/glusterfs.spec b/glusterfs.spec
index 2c3f78c..43299b6 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -25,7 +25,7 @@
Summary: Cluster File System
Name: glusterfs
Version: 3.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv3+ and (GPLv2 or LGPLv3+)
Group: System Environment/Base
Vendor: Red Hat
@@ -39,6 +39,7 @@ Source5: glusterd.logrotate
Source6: glusterfsd.logrotate
Patch0: %{name}-3.3.0.libglusterfs.Makefile.patch
Patch1: %{name}-3.2.5.configure.ac.patch
+Patch2: %{name}-3.3.0.cli.cli-rpc-ops.c.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%if ( 0%{?fedora} && 0%{?fedora} < 17 ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
@@ -199,6 +200,7 @@ This package provides the development libraries.
%setup -q -n %{name}-%{version}
%patch0 -p0
%patch1 -p0
+%patch2 -p0
%build
./autogen.sh
@@ -483,6 +485,10 @@ if [ $1 -ge 1 ]; then
fi
%changelog
+* Wed Jul 18 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-3
+- fix segv in cmd_heal_volume_brick_out (RHEL seems particularly
+ sensitive to this bug.)
+
* Thu Jul 5 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-2
- selected fixes to glusterfs.spec for BZs 826836, 826855, 829734, 834847
More information about the scm-commits
mailing list