[sblim-cmpi-base] Fix double fclose() call
vcrhonek
vcrhonek at fedoraproject.org
Thu May 10 11:53:09 UTC 2012
commit 49425309351653d2c3f57d7c830a0044b76c05da
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Thu May 10 13:52:59 2012 +0200
Fix double fclose() call
sblim-cmpi-base-1.6.1-double-fclose.patch | 11 +++++++++++
sblim-cmpi-base.spec | 12 +++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/sblim-cmpi-base-1.6.1-double-fclose.patch b/sblim-cmpi-base-1.6.1-double-fclose.patch
new file mode 100644
index 0000000..59eb024
--- /dev/null
+++ b/sblim-cmpi-base-1.6.1-double-fclose.patch
@@ -0,0 +1,11 @@
+diff -up sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c.orig sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c
+--- sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c.orig 2012-05-10 13:19:42.628416721 +0200
++++ sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c 2012-05-10 13:20:38.331706857 +0200
+@@ -250,7 +250,6 @@ int get_cpu_queue_data_26(struct os_stat
+ } else {
+ _OSBASE_TRACE(1,("get_cpu_queue_data_26(): could not find cpu info"));
+ }
+- fclose(f);
+ } else {
+ _OSBASE_TRACE(1,("get_cpu_queue_data_26(): could not open %s: %s",DATA_FILE,strerror(errno)));
+ }
diff --git a/sblim-cmpi-base.spec b/sblim-cmpi-base.spec
index f3fa20d..345c053 100644
--- a/sblim-cmpi-base.spec
+++ b/sblim-cmpi-base.spec
@@ -1,6 +1,6 @@
Name: sblim-cmpi-base
Version: 1.6.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: SBLIM CMPI Base Providers
Group: Applications/System
@@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz
Patch0: sblim-cmpi-base-1.6.0-missing-fclose.patch
Patch1: sblim-cmpi-base-1.6.0-methods-enable.patch
Patch2: sblim-cmpi-base-1.6.0-provider-register-sfcb-init.patch
+Patch3: sblim-cmpi-base-1.6.1-double-fclose.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: cim-server sblim-indication_helper
BuildRequires: sblim-cmpi-devel sblim-indication_helper-devel
@@ -43,9 +44,10 @@ Testcase Files for the SBLIM Testsuite.
%prep
%setup -q
-%patch0
-%patch1
+%patch0 -p0 -b .missing-fclose
+%patch1 -p0 -b .methods-enable
%patch2 -p1 -b .provider-register-sfcb-init
+%patch3 -p1 -b .double-fclose
%build
%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite --disable-static
@@ -183,6 +185,10 @@ fi
%postun -p /sbin/ldconfig
%changelog
+* Thu May 10 2012 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.1-6
+- Fix double fclose() call (patch by Roman Rakus <rrakus at redhat.com>)
+ Resolves: #820315
+
* Wed Feb 15 2012 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.1-5
- Enable indications and method providers
More information about the scm-commits
mailing list