Hello community,
here is the log from the commit of package sblim-cmpi-nfsv3 for openSUSE:Factory checked in at 2012-03-07 13:45:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sblim-cmpi-nfsv3 (Old)
and /work/SRC/openSUSE:Factory/.sblim-cmpi-nfsv3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-cmpi-nfsv3", Maintainer is "VDziewiecki@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sblim-cmpi-nfsv3/sblim-cmpi-nfsv3.changes 2011-09-23 12:45:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sblim-cmpi-nfsv3.new/sblim-cmpi-nfsv3.changes 2012-03-07 13:45:35.000000000 +0100
@@ -1,0 +2,38 @@
+Mon Feb 13 10:55:31 UTC 2012 - coolo@suse.com
+
+- patch license to follow spdx.org standard
+
+-------------------------------------------------------------------
+Wed Sep 7 10:21:40 UTC 2011 - kkaempf@suse.com
+
+- Fix resource leak
+ if fopen() is successful and valid_file() not, file is not closed
+ (Pavel Raiskup )
+
+-------------------------------------------------------------------
+Wed Sep 7 10:18:31 UTC 2011 - kkaempf@suse.com
+
+- update to 1.1.1
+ - Features:
+ - 3299507 obtain fully qualified hostname using etab entry
+ - Bugs:
+ - 3275169 bash error reported in provider bootstrap scripts
+ - 3303687 remove old cmpi version definition
+
+-------------------------------------------------------------------
+Mon Sep 13 19:08:27 UTC 2010 - kkaempf@novell.com
+
+- Fix RHEL build
+
+-------------------------------------------------------------------
+Tue Oct 6 14:17:51 CEST 2009 - mhrusecky@suse.cz
+
+- updated to 1.1.0
+ - fixes:
+ * 1652246: fixes compile errors with gcc4
+ * 1457924: various compile warnings
+ * 1833455: updated URL for CPL
+ * 2795176: migrate provider licenses to EPL
+ - sblim-cmpi-nfsv3-1.0.13_gcc4.patch not needed anymore
+
+-------------------------------------------------------------------
Old:
----
sblim-cmpi-nfsv3-1.0.13_gcc4.patch
sblim-cmpi-nfsv3-1.0.14.tar.bz2
New:
----
0001-Missing-fclose-fix.patch
sblim-cmpi-nfsv3-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-cmpi-nfsv3.spec ++++++
--- /var/tmp/diff_new_pack.QnGe4q/_old 2012-03-07 13:45:37.000000000 +0100
+++ /var/tmp/diff_new_pack.QnGe4q/_new 2012-03-07 13:45:37.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package sblim-cmpi-nfsv3 (Version 1.0.14)
+# spec file for package sblim-cmpi-nfsv3
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,23 +15,31 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: sblim-cmpi-nfsv3
Url: http://sblim.wiki.sourceforge.net/
-BuildRequires: bison flex gcc-c++ openslp-devel openssl-devel pam-devel sblim-cmpi-base-devel sblim-indication_helper-devel sblim-testsuite
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gcc-c++
+BuildRequires: openssl-devel
+BuildRequires: pam-devel
+BuildRequires: sblim-cmpi-base-devel
+BuildRequires: sblim-indication_helper-devel
+BuildRequires: sblim-sfcb
+BuildRequires: sblim-testsuite
+%if 0%{?suse_version}
+BuildRequires: openslp-devel
+%endif
Summary: SBLIM CMPI NFSv3 Instrumentation
-Version: 1.0.14
-Release: 85
+License: EPL-1.0
Group: System/Management
-License: IBM Public License
+Version: 1.1.1
+Release: 0
Requires: sblim-cmpi-base >= 1.2.3
-Requires: cim-server
+Requires: cim-server, cim-schema
Source: http://prdownloads.sourceforge.net/sblim/sblim-cmpi-nfsv3-%{version}.tar.bz2
-Patch: sblim-cmpi-nfsv3-1.0.13_gcc4.patch
+Patch: 0001-Missing-fclose-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: sblim-sfcb
#!BuildIgnore: tog-pegasus
%description
@@ -45,42 +53,57 @@
%prep
%setup -n %{name}-%{version}
-%patch
+%patch -p1
%build
%configure --disable-static
%{__make}
%install
+%if 0%{?suse_version}
%makeinstall docdir=%{_docdir}/%{name}
+%else
+make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version}
+%endif
rm %buildroot%_libdir/cmpi/*.la
rm %buildroot%_libdir/*.la
%clean
%{__rm} -rf %{buildroot}
+%define PEGASUS_MOF CIM_SystemSetting,CIM_NFS,CIM_SystemConfiguration,CIM_SystemSettingContext
+
%post
-%define mofs Linux_NFSv3SystemSetting Linux_NFSv3SystemConfiguration
# compile MOF
-d=%_datadir/%name
-for i in %mofs; do
- $d/provider-register.sh -t sfcb -r $d/$i.registration -m $d/$i.mof
-done
+/sbin/ldconfig
+# Register Schema and Provider - this is higly provider specific
+# tog-pegasus needs some schemes registered first
+if [ -x /usr/bin/peg-loadmof.sh ]; then
+ peg-loadmof.sh -n root/cimv2 /usr/share/mof/cim-current/*/{%{PEGASUS_MOF}}.mof
+ rctog-pegasus try-restart
+fi
+# and then following script can handle registration for various providers
+d=%{_datadir}/%{name}
+$d/provider-register.sh -r $d/*.registration -m $d/*.mof
%preun
if [ "$1" = "0" ]; then
- d=%_datadir/%name
- for i in %mofs; do
- $d/provider-register.sh -t sfcb -d -r $d/$i.registration -m $d/$i.mof
- done
+ d=%{_datadir}/%{name}
+ $d/provider-register.sh -d -r $d/*.registration -m $d/*.mof
fi
+%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
%{_libdir}/cmpi/*.so
%{_libdir}/*.so
%{_datadir}/sblim-testsuite/*
%{_datadir}/%{name}/
+%if 0%{?suse_version}
%doc %{_docdir}/%{name}
+%else
+%doc %{_docdir}/%{name}-%{version}
+%endif
%changelog
++++++ 0001-Missing-fclose-fix.patch ++++++
From 6d06b5b1dd12bf73be2673016d6536265854f084 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup
Date: Wed, 3 Aug 2011 12:57:51 +0200
Subject: [PATCH 1/2] Missing fclose fix
fclose was not called when valid_file() returned -1 (the file was
correctly opened).
---
util/Linux_NFSv3SystemConfigurationUtil.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/util/Linux_NFSv3SystemConfigurationUtil.c b/util/Linux_NFSv3SystemConfigurationUtil.c
index 546c7e0..c40b53b 100644
--- a/util/Linux_NFSv3SystemConfigurationUtil.c
+++ b/util/Linux_NFSv3SystemConfigurationUtil.c
@@ -448,6 +448,8 @@ void * Linux_NFSv3_startReadingInstances()
/* If etab file doesn't exist or is zero bytes, use exports */
if ( ((sourcefile = fopen(_CONFIGFILE_ETAB, "r")) == NULL) ||
(valid_file(_CONFIGFILE_ETAB) == -1) ) {
+ if (sourcefile)
+ fclose(sourcefile);
_OSBASE_TRACE(4,("startReadingInstances() : %s not found or contains no entries. Using /etc/exports", _CONFIGFILE_ETAB));
if ((sourcefile = fopen(_CONFIGFILE,"r")) == NULL) {
_OSBASE_TRACE(1,("startReadingInstances() : Cannot read from config file %s", _CONFIGFILE));
--
1.7.3.1
++++++ sblim-cmpi-nfsv3-1.0.14.tar.bz2 -> sblim-cmpi-nfsv3-1.1.1.tar.bz2 ++++++
++++ 78202 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org