Revisions of sblim-cmpi-dhcp
- fix wrong check after fopen() add sblim-cmpi-dhcp-1.0.patch
- Clean up spec file
- fix license to EPL-1.0 - install COPYING and AUTHORS, fix line ends on COPYING
buildservice-autocommit
accepted
request 93951
from
Stephan Kulow (coolo)
(revision 18)
baserev update by copy to link target
add libtool to buildrequires
buildservice-autocommit
accepted
request 73514
from
Petr Uzel (puzel)
(revision 16)
baserev update by copy to link target
checked in (request 35098)
- Update to 1.0 * upstream maintenance release * License changed from CPL to EPL --This line, and those below, will be ignored-- D sblim-cmpi-dhcp-0.5.5-automake.patch D sblim-cmpi-dhcp-0.5.5-interopnamespace.patch D sblim-cmpi-dhcp-0.5.5-open-missing-mode.patch D sblim-cmpi-dhcp-0.5.5-paths.patch D sblim-cmpi-dhcp-0.5.5.tar.bz2 A sblim-cmpi-dhcp-1.0-automake.patch A sblim-cmpi-dhcp-1.0-interopnamespace.patch A sblim-cmpi-dhcp-1.0.tar.bz2 M sblim-cmpi-dhcp.changes M sblim-cmpi-dhcp.spec Diff for working copy: . Index: sblim-cmpi-dhcp.changes =================================================================== --- sblim-cmpi-dhcp.changes (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp.changes (working copy) @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 2 10:31:13 UTC 2010 - kkaempf@novell.com + +- Update to 1.0 + * upstream maintenance release + * License changed from CPL to EPL + ------------------------------------------------------------------- Mon Jun 29 15:26:05 CEST 2009 - mhrusecky@suse.cz Index: sblim-cmpi-dhcp.spec =================================================================== --- sblim-cmpi-dhcp.spec (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp.spec (working copy) @@ -1,5 +1,5 @@ # -# spec file for package sblim-cmpi-dhcp (Version 0.5.5) +# spec file for package sblim-cmpi-dhcp (Version 1.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,16 +22,14 @@ Url: http://sblim.sourceforge.net/wbemsmt.html BuildRequires: bison flex sblim-cmpi-base-devel sblim-cmpi-devel sblim-testsuite sblim-tools-libra-devel Summary: SBLIM CMPI dhcp Instrumentation -Version: 0.5.5 +Version: 1.0 Release: 21 Group: System/Management -License: IBM Public License .. ; Common Public License 1.0, Eclipse Public License +License: Eclipse Public License Requires: sblim-cmpi-base >= 1.2.3, cim-server Source: http://prdownloads.sourceforge.net/sblim/sblim-cmpi-dhcp-%{version}.tar.bz2 -Patch1: sblim-cmpi-dhcp-0.5.5-open-missing-mode.patch -Patch2: sblim-cmpi-dhcp-0.5.5-paths.patch -Patch3: sblim-cmpi-dhcp-0.5.5-interopnamespace.patch -Patch4: sblim-cmpi-dhcp-0.5.5-automake.patch +Patch1: %{name}-%{version}-interopnamespace.patch +Patch2: %{name}-%{version}-automake.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: sblim-sfcb #!BuildIgnore: tog-pegasus @@ -49,8 +47,6 @@ %setup -q %patch1 %patch2 -%patch3 -%patch4 %build find . -name 'Makefile.am' -exec sed -i 's|#.-Werror.*|-Wall|' \{\} \; Index: sblim-cmpi-dhcp-1.0-automake.patch =================================================================== --- sblim-cmpi-dhcp-1.0-automake.patch (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp-1.0-automake.patch (working copy) @@ -1,0 +1,22 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -36,6 +36,7 @@ AC_ARG_VAR([CIMSERVER],[the target CIM s + # Checks for programs. + AC_PROG_AWK + AC_PROG_CC ++AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_LIBTOOL + +Index: man/Makefile.am +=================================================================== +--- man/Makefile.am.orig ++++ man/Makefile.am +@@ -20,5 +20,3 @@ smt_dhcp_ra_support.conf.5: smt_dhcp_ra_ + man5_MANS = \ + smt_dhcp_ra_support.conf.5 + +-dist_man_MANS = \ +- smt_dhcp_ra_support.conf.5 Index: sblim-cmpi-dhcp-1.0-interopnamespace.patch =================================================================== --- sblim-cmpi-dhcp-1.0-interopnamespace.patch (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp-1.0-interopnamespace.patch (working copy) @@ -1,0 +1,154 @@ +Index: model/registration/Linux_DHCPElementConformsToProfile.registration +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPElementConformsToProfile.registration,v +retrieving revision 1.1 +diff -u -r1.1 Linux_DHCPElementConformsToProfile.registration +--- model/registration/Linux_DHCPElementConformsToProfile.registration 29 Apr 2008 23:59:12 -0000 1.1 ++++ model/registration/Linux_DHCPElementConformsToProfile.registration 18 Dec 2008 17:38:51 -0000 +@@ -15,4 +15,4 @@ + # + # Classname - Namespace - Providername - Libraryname - Capabilities ... + Linux_DHCPElementConformsToProfile root/cimv2 Linux_DHCPElementConformsToProfileProvider cmpiLinux_DHCPElementConformsToProfile instance association +-Linux_DHCPElementConformsToProfile root/PG_InterOp Linux_DHCPElementConformsToProfileProvider cmpiLinux_DHCPElementConformsToProfile instance association ++Linux_DHCPElementConformsToProfile root/interop Linux_DHCPElementConformsToProfileProvider cmpiLinux_DHCPElementConformsToProfile instance association +Index: model/registration/Linux_DHCPService.registration +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPService.registration,v +retrieving revision 1.1 +diff -u -r1.1 Linux_DHCPService.registration +--- model/registration/Linux_DHCPService.registration 4 Dec 2007 19:24:15 -0000 1.1 ++++ model/registration/Linux_DHCPService.registration 18 Dec 2008 17:38:51 -0000 +@@ -14,4 +14,4 @@ + # + # + # Classname - Namespace - Providername - Libraryname - Capabilities ... +-Linux_DHCPService root/cimv2 Linux_DHCPServiceProvider cmpiLinux_DHCPService instance method ++Linux_DHCPService root/cimv2 Linux_DHCPServiceProvider cmpiLinux_DHCPService instance +Index: model/registration/Linux_DHCPServiceConfiguration.registration +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPServiceConfiguration.registration,v +retrieving revision 1.1 +diff -u -r1.1 Linux_DHCPServiceConfiguration.registration +--- model/registration/Linux_DHCPServiceConfiguration.registration 4 Dec 2007 19:24:15 -0000 1.1 ++++ model/registration/Linux_DHCPServiceConfiguration.registration 18 Dec 2008 17:38:51 -0000 +@@ -14,4 +14,4 @@ + # + # + # Classname - Namespace - Providername - Libraryname - Capabilities ... +-Linux_DHCPServiceConfiguration root/cimv2 Linux_DHCPServiceConfigurationProvider cmpiLinux_DHCPServiceConfiguration instance method ++Linux_DHCPServiceConfiguration root/cimv2 Linux_DHCPServiceConfigurationProvider cmpiLinux_DHCPServiceConfiguration instance +Index: model/registration/Linux_DHCPRegisteredProfile.registration +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPRegisteredProfile.registration,v +retrieving revision 1.1 +diff -u -r1.1 Linux_DHCPRegisteredProfile.registration +--- model/registration/Linux_DHCPRegisteredProfile.registration 4 Dec 2007 19:24:14 -0000 1.1 ++++ model/registration/Linux_DHCPRegisteredProfile.registration 18 Dec 2008 17:38:51 -0000 +@@ -14,4 +14,4 @@ + # + # + # Classname - Namespace - Providername - Libraryname - Capabilities ... +-Linux_DHCPRegisteredProfile root/PG_InterOp Linux_DHCPRegisteredProfileProvider cmpiLinux_DHCPRegisteredProfile instance ++Linux_DHCPRegisteredProfile root/interop Linux_DHCPRegisteredProfileProvider cmpiLinux_DHCPRegisteredProfile instance +Index: model/registration/Linux_DHCPGlobal.registration +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPGlobal.registration,v +retrieving revision 1.1 +diff -u -r1.1 Linux_DHCPGlobal.registration +--- model/registration/Linux_DHCPGlobal.registration 4 Dec 2007 19:24:15 -0000 1.1 ++++ model/registration/Linux_DHCPGlobal.registration 18 Dec 2008 17:38:51 -0000 +@@ -14,4 +14,4 @@ + # + # + # Classname - Namespace - Providername - Libraryname - Capabilities ... +-Linux_DHCPGlobal root/cimv2 Linux_DHCPGlobalProvider cmpiLinux_DHCPGlobal instance method ++Linux_DHCPGlobal root/cimv2 Linux_DHCPGlobalProvider cmpiLinux_DHCPGlobal instance +Index: sblim-cmpi-dhcp.spec.in +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/sblim-cmpi-dhcp.spec.in,v +retrieving revision 1.7 +diff -u -r1.7 sblim-cmpi-dhcp.spec.in +--- sblim-cmpi-dhcp.spec.in 13 May 2008 02:08:30 -0000 1.7 ++++ sblim-cmpi-dhcp.spec.in 18 Dec 2008 17:38:51 -0000 +@@ -103,7 +103,7 @@ + -r %{REGISTRATION} -m %{SCHEMA} > /dev/null + + %{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ +- -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null ++ -n "root/interop" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null + + fi + +@@ -114,7 +114,7 @@ + -v -r %{REGISTRATION} -m %{SCHEMA} > /dev/null + + %{_datadir}/%{name}/provider-register.sh %{?tog_pegasus:-t pegasus} \ +- -v -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null ++ -v -n "root/interop" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null + /sbin/ldconfig + + ############################################################################### +@@ -126,7 +126,7 @@ + -r %{REGISTRATION} -m %{SCHEMA} > /dev/null + + %{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ +- -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null ++ -n "root/interop" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null + fi + + ############################################################################### +Index: Makefile.am +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/Makefile.am,v +retrieving revision 1.2 +diff -u -r1.2 Makefile.am +--- Makefile.am 30 Apr 2008 00:06:11 -0000 1.2 ++++ Makefile.am 18 Dec 2008 17:38:51 -0000 +@@ -152,11 +152,11 @@ + # Register the provider(s) and class definition(s) to the current CIM server/CIMOM + postinstall: + sh provider-register.sh -t @CIMSERVER@ -r $(REGISTRATIONS) -m $(SCHEMAS) +- sh provider-register.sh -t @CIMSERVER@ -n "root/PG_InterOp" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) ++ sh provider-register.sh -t @CIMSERVER@ -n "root/interop" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) + + preuninstall: + sh provider-register.sh -d -t @CIMSERVER@ -r $(REGISTRATIONS) -m $(SCHEMAS) +- sh provider-register.sh -d -t @CIMSERVER@ -n "root/PG_InterOp" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) ++ sh provider-register.sh -d -t @CIMSERVER@ -n "root/interop" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) + + dist-hook: + test -d "$(distdir)" && rm -rf `find $(distdir) -type d -name CVS` +Index: provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h,v +retrieving revision 1.1 +diff -u -r1.1 Linux_ElementConformsToProfile_Resource.h +--- provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h 30 Apr 2008 00:03:19 -0000 1.1 ++++ provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h 18 Dec 2008 17:38:51 -0000 +@@ -26,7 +26,7 @@ + #define _SRCPROPERTYNAME "ConformantStandard" + #define _TARGETPROPERTYNAME "ManagedElement" + #define _TARGETCLASSNS "root/cimv2" +-#define _SOURCECLASSNS "root/PG_InterOp" ++#define _SOURCECLASSNS "root/interop" + + typedef struct { + CMPIObjectPath *src; +Index: test/test-cmpi-dhcp.sh +=================================================================== +RCS file: /cvsroot/sblim/cmpi-dhcp/test/test-cmpi-dhcp.sh,v +retrieving revision 1.4 +diff -u -r1.4 test-cmpi-dhcp.sh +--- test/test-cmpi-dhcp.sh 18 Dec 2008 15:39:27 -0000 1.4 ++++ test/test-cmpi-dhcp.sh 18 Dec 2008 17:38:51 -0000 +@@ -82,8 +82,8 @@ + declare -i max=19; + declare -i i=1; + +-. ${SCRIPT_PATH}/run.sh Linux_DHCPRegisteredProfile -n /root/PG_InterOp || exit 1; +-. ${SCRIPT_PATH}/run.sh Linux_DHCPElementConformsToProfile -n /root/PG_InterOp || exit 1; ++. ${SCRIPT_PATH}/run.sh Linux_DHCPRegisteredProfile -n /root/interop || exit 1; ++. ${SCRIPT_PATH}/run.sh Linux_DHCPElementConformsToProfile -n /root/interop || exit 1; + + while(($i<=$max)) + do Index: sblim-cmpi-dhcp-1.0.tar.bz2 =================================================================== Binary file sblim-cmpi-dhcp-1.0.tar.bz2 has changed Index: sblim-cmpi-dhcp-0.5.5-automake.patch =================================================================== --- sblim-cmpi-dhcp-0.5.5-automake.patch (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp-0.5.5-automake.patch (working copy) @@ -1,22 +1,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -36,6 +36,7 @@ AC_ARG_VAR([CIMSERVER],[the target CIM s - # Checks for programs. - AC_PROG_AWK - AC_PROG_CC -+AM_PROG_CC_C_O - AC_PROG_INSTALL - AC_PROG_LIBTOOL - -Index: man/Makefile.am -=================================================================== ---- man/Makefile.am.orig -+++ man/Makefile.am -@@ -20,5 +20,3 @@ smt_dhcp_ra_support.conf.5: smt_dhcp_ra_ - man5_MANS = \ - smt_dhcp_ra_support.conf.5 - --dist_man_MANS = \ -- smt_dhcp_ra_support.conf.5 Index: sblim-cmpi-dhcp-0.5.5-interopnamespace.patch =================================================================== --- sblim-cmpi-dhcp-0.5.5-interopnamespace.patch (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp-0.5.5-interopnamespace.patch (working copy) @@ -1,154 +1,0 @@ -Index: model/registration/Linux_DHCPElementConformsToProfile.registration -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPElementConformsToProfile.registration,v -retrieving revision 1.1 -diff -u -r1.1 Linux_DHCPElementConformsToProfile.registration ---- model/registration/Linux_DHCPElementConformsToProfile.registration 29 Apr 2008 23:59:12 -0000 1.1 -+++ model/registration/Linux_DHCPElementConformsToProfile.registration 18 Dec 2008 17:38:51 -0000 -@@ -15,4 +15,4 @@ - # - # Classname - Namespace - Providername - Libraryname - Capabilities ... - Linux_DHCPElementConformsToProfile root/cimv2 Linux_DHCPElementConformsToProfileProvider cmpiLinux_DHCPElementConformsToProfile instance association --Linux_DHCPElementConformsToProfile root/PG_InterOp Linux_DHCPElementConformsToProfileProvider cmpiLinux_DHCPElementConformsToProfile instance association -+Linux_DHCPElementConformsToProfile root/interop Linux_DHCPElementConformsToProfileProvider cmpiLinux_DHCPElementConformsToProfile instance association -Index: model/registration/Linux_DHCPService.registration -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPService.registration,v -retrieving revision 1.1 -diff -u -r1.1 Linux_DHCPService.registration ---- model/registration/Linux_DHCPService.registration 4 Dec 2007 19:24:15 -0000 1.1 -+++ model/registration/Linux_DHCPService.registration 18 Dec 2008 17:38:51 -0000 -@@ -14,4 +14,4 @@ - # - # - # Classname - Namespace - Providername - Libraryname - Capabilities ... --Linux_DHCPService root/cimv2 Linux_DHCPServiceProvider cmpiLinux_DHCPService instance method -+Linux_DHCPService root/cimv2 Linux_DHCPServiceProvider cmpiLinux_DHCPService instance -Index: model/registration/Linux_DHCPServiceConfiguration.registration -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPServiceConfiguration.registration,v -retrieving revision 1.1 -diff -u -r1.1 Linux_DHCPServiceConfiguration.registration ---- model/registration/Linux_DHCPServiceConfiguration.registration 4 Dec 2007 19:24:15 -0000 1.1 -+++ model/registration/Linux_DHCPServiceConfiguration.registration 18 Dec 2008 17:38:51 -0000 -@@ -14,4 +14,4 @@ - # - # - # Classname - Namespace - Providername - Libraryname - Capabilities ... --Linux_DHCPServiceConfiguration root/cimv2 Linux_DHCPServiceConfigurationProvider cmpiLinux_DHCPServiceConfiguration instance method -+Linux_DHCPServiceConfiguration root/cimv2 Linux_DHCPServiceConfigurationProvider cmpiLinux_DHCPServiceConfiguration instance -Index: model/registration/Linux_DHCPRegisteredProfile.registration -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPRegisteredProfile.registration,v -retrieving revision 1.1 -diff -u -r1.1 Linux_DHCPRegisteredProfile.registration ---- model/registration/Linux_DHCPRegisteredProfile.registration 4 Dec 2007 19:24:14 -0000 1.1 -+++ model/registration/Linux_DHCPRegisteredProfile.registration 18 Dec 2008 17:38:51 -0000 -@@ -14,4 +14,4 @@ - # - # - # Classname - Namespace - Providername - Libraryname - Capabilities ... --Linux_DHCPRegisteredProfile root/PG_InterOp Linux_DHCPRegisteredProfileProvider cmpiLinux_DHCPRegisteredProfile instance -+Linux_DHCPRegisteredProfile root/interop Linux_DHCPRegisteredProfileProvider cmpiLinux_DHCPRegisteredProfile instance -Index: model/registration/Linux_DHCPGlobal.registration -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/model/registration/Linux_DHCPGlobal.registration,v -retrieving revision 1.1 -diff -u -r1.1 Linux_DHCPGlobal.registration ---- model/registration/Linux_DHCPGlobal.registration 4 Dec 2007 19:24:15 -0000 1.1 -+++ model/registration/Linux_DHCPGlobal.registration 18 Dec 2008 17:38:51 -0000 -@@ -14,4 +14,4 @@ - # - # - # Classname - Namespace - Providername - Libraryname - Capabilities ... --Linux_DHCPGlobal root/cimv2 Linux_DHCPGlobalProvider cmpiLinux_DHCPGlobal instance method -+Linux_DHCPGlobal root/cimv2 Linux_DHCPGlobalProvider cmpiLinux_DHCPGlobal instance -Index: sblim-cmpi-dhcp.spec.in -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/sblim-cmpi-dhcp.spec.in,v -retrieving revision 1.7 -diff -u -r1.7 sblim-cmpi-dhcp.spec.in ---- sblim-cmpi-dhcp.spec.in 13 May 2008 02:08:30 -0000 1.7 -+++ sblim-cmpi-dhcp.spec.in 18 Dec 2008 17:38:51 -0000 -@@ -103,7 +103,7 @@ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null - - %{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ -- -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null -+ -n "root/interop" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null - - fi - -@@ -114,7 +114,7 @@ - -v -r %{REGISTRATION} -m %{SCHEMA} > /dev/null - - %{_datadir}/%{name}/provider-register.sh %{?tog_pegasus:-t pegasus} \ -- -v -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null -+ -v -n "root/interop" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null - /sbin/ldconfig - - ############################################################################### -@@ -126,7 +126,7 @@ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null - - %{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ -- -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null -+ -n "root/interop" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null - fi - - ############################################################################### -Index: Makefile.am -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/Makefile.am,v -retrieving revision 1.2 -diff -u -r1.2 Makefile.am ---- Makefile.am 30 Apr 2008 00:06:11 -0000 1.2 -+++ Makefile.am 18 Dec 2008 17:38:51 -0000 -@@ -152,11 +152,11 @@ - # Register the provider(s) and class definition(s) to the current CIM server/CIMOM - postinstall: - sh provider-register.sh -t @CIMSERVER@ -r $(REGISTRATIONS) -m $(SCHEMAS) -- sh provider-register.sh -t @CIMSERVER@ -n "root/PG_InterOp" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) -+ sh provider-register.sh -t @CIMSERVER@ -n "root/interop" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) - - preuninstall: - sh provider-register.sh -d -t @CIMSERVER@ -r $(REGISTRATIONS) -m $(SCHEMAS) -- sh provider-register.sh -d -t @CIMSERVER@ -n "root/PG_InterOp" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) -+ sh provider-register.sh -d -t @CIMSERVER@ -n "root/interop" -r $(INTEROP_REGISTRATIONS) -m $(INTEROP_SCHEMAS) - - dist-hook: - test -d "$(distdir)" && rm -rf `find $(distdir) -type d -name CVS` -Index: provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h,v -retrieving revision 1.1 -diff -u -r1.1 Linux_ElementConformsToProfile_Resource.h ---- provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h 30 Apr 2008 00:03:19 -0000 1.1 -+++ provider/Linux_DHCPElementConformsToProfile/Linux_ElementConformsToProfile_Resource.h 18 Dec 2008 17:38:51 -0000 -@@ -26,7 +26,7 @@ - #define _SRCPROPERTYNAME "ConformantStandard" - #define _TARGETPROPERTYNAME "ManagedElement" - #define _TARGETCLASSNS "root/cimv2" --#define _SOURCECLASSNS "root/PG_InterOp" -+#define _SOURCECLASSNS "root/interop" - - typedef struct { - CMPIObjectPath *src; -Index: test/test-cmpi-dhcp.sh -=================================================================== -RCS file: /cvsroot/sblim/cmpi-dhcp/test/test-cmpi-dhcp.sh,v -retrieving revision 1.4 -diff -u -r1.4 test-cmpi-dhcp.sh ---- test/test-cmpi-dhcp.sh 18 Dec 2008 15:39:27 -0000 1.4 -+++ test/test-cmpi-dhcp.sh 18 Dec 2008 17:38:51 -0000 -@@ -82,8 +82,8 @@ - declare -i max=19; - declare -i i=1; - --. ${SCRIPT_PATH}/run.sh Linux_DHCPRegisteredProfile -n /root/PG_InterOp || exit 1; --. ${SCRIPT_PATH}/run.sh Linux_DHCPElementConformsToProfile -n /root/PG_InterOp || exit 1; -+. ${SCRIPT_PATH}/run.sh Linux_DHCPRegisteredProfile -n /root/interop || exit 1; -+. ${SCRIPT_PATH}/run.sh Linux_DHCPElementConformsToProfile -n /root/interop || exit 1; - - while(($i<=$max)) - do Index: sblim-cmpi-dhcp-0.5.5-open-missing-mode.patch =================================================================== --- sblim-cmpi-dhcp-0.5.5-open-missing-mode.patch (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp-0.5.5-open-missing-mode.patch (working copy) @@ -1,15 +1,0 @@ ---- - hashing/libuniquekey.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- hashing/libuniquekey.c.orig -+++ hashing/libuniquekey.c -@@ -506,7 +506,7 @@ int getUniqueKey(char * filepath, int li - LOG("getUniqueKey", "Forked - in the child process"); - for (i=getdtablesize();i>=0;--i) /** close all the opened files for this process */ - close(i); -- i=open(tmpfile, O_RDWR|O_CREAT|O_TRUNC); -+ i=open(tmpfile, O_RDWR|O_CREAT|O_TRUNC, 0600); - i = dup(i); - execlp("diff","diff", wbemname, filepath,(char *) 0); /** check if there exists any differences - between the copy of the config file and the Index: sblim-cmpi-dhcp-0.5.5-paths.patch =================================================================== --- sblim-cmpi-dhcp-0.5.5-paths.patch (revision 64ccaa172c3fed2c737da627f04b9dcb) +++ sblim-cmpi-dhcp-0.5.5-paths.patch (working copy) @@ -1,110 +1,0 @@ ---- - hashing/Makefile.am | 3 ++- - hashing/libuniquekey.c | 32 ++++++++++++++++++-------------- - include/sblim-dhcp.h.pre.in | 2 +- - 3 files changed, 21 insertions(+), 16 deletions(-) - ---- hashing/Makefile.am.orig -+++ hashing/Makefile.am -@@ -25,7 +25,8 @@ AM_CPPFLAGS = \ - -D_GNU_SOURCE \ - -DDEBUG \ - -DSBLIM_DEBUG\ -- -D_COMPILE_UNIX -+ -D_COMPILE_UNIX \ -+ -DSYSCONFDIR='"$(sysconfdir)"' - - - ################################################################################ ---- hashing/libuniquekey.c.orig -+++ hashing/libuniquekey.c -@@ -35,6 +35,10 @@ - #define LOG(s,t) - #endif - -+#ifndef SYSCONFDIR -+#define SYSCONFDIR "/usr/local/etc" -+#endif -+ - /** The structure _UQ_linkedList is a linked list. Each node in this list would carry */ - /** the line number and the line itself from a file that this list points to. */ - typedef struct _UQ_linkedList{ -@@ -164,7 +168,7 @@ void _UQ_setupFiles(char * filepath, cha - free(line); - - /** A file is created to store the final key value so that it stores the next value to start */ -- sprintf(idfile,"/usr/local/etc/UniqueKey/.%s.Id", filename); -+ sprintf(idfile,SYSCONFDIR "/UniqueKey/.%s.Id", filename); - - fclose(fconf); - fclose(fwbem); -@@ -227,7 +231,7 @@ void _UQ_insertEntity(char * filename, _ - first = (_UQ_linkedList *)malloc(sizeof(_UQ_linkedList)); - memset(first, '\0', sizeof(_UQ_linkedList)); - -- sprintf(idFile,"/usr/local/etc/UniqueKey/.%s.Id",filename); /** get the Id file */ -+ sprintf(idFile,SYSCONFDIR "/UniqueKey/.%s.Id",filename); /** get the Id file */ - - fd = fopen(idFile, "r"); /** Read the Id file to retrieve the value of the key stored */ - cptr = fgets(value, 19, fd); -@@ -265,7 +269,7 @@ void _UQ_reCreateKeys(char * filename,ch - LOG("reCreateKeys", "Entered"); - - /** picks up the seed from the .Id file */ -- sprintf(idFile, "/usr/local/etc/UniqueKey/.%s.Id", filename); -+ sprintf(idFile, SYSCONFDIR "/UniqueKey/.%s.Id", filename); - fd = fopen(idFile, "r"); - line = fgets(value, 19, fd); - line = NULL; -@@ -475,13 +479,13 @@ int getUniqueKey(char * filepath, int li - return 0; - - /** if the said directory does not exist, create one - access() checks the users permissions for the specified file */ -- if(access("/usr/local/etc/UniqueKey",F_OK)) -- mkdir("/usr/local/etc/UniqueKey", 0777); -+ if(access(SYSCONFDIR "/UniqueKey",F_OK)) -+ mkdir(SYSCONFDIR "/UniqueKey", 0777); - - filename = _UQ_extractServiceName(filepath); /** derive the filename */ -- sprintf( wbemname,"/usr/local/etc/UniqueKey/.%s.wbem",filename); /** create the names of the files preceeding with a . */ -- sprintf( keyname,"/usr/local/etc/UniqueKey/.%s.key",filename); -- sprintf(tmpfile,"/usr/local/etc/UniqueKey/.%s.tmp",filename); -+ sprintf( wbemname,SYSCONFDIR "/UniqueKey/.%s.wbem",filename); /** create the names of the files preceeding with a . */ -+ sprintf( keyname,SYSCONFDIR "/UniqueKey/.%s.key",filename); -+ sprintf(tmpfile,SYSCONFDIR "/UniqueKey/.%s.tmp",filename); - - if( access(filepath, R_OK)) /** check the users permissions to read the conf file */ - return -1; -@@ -545,7 +549,7 @@ unsigned long long * getAllUniqueKey(cha - - getUniqueKey(filepath, 1, &hashId); - filename = _UQ_extractServiceName(filepath); /** get the conf file name */ -- sprintf( keyfile,"/usr/local/etc/UniqueKey/.%s.key",filename); /** create the keyfile depending on the conf file name */ -+ sprintf( keyfile,SYSCONFDIR "/UniqueKey/.%s.key",filename); /** create the keyfile depending on the conf file name */ - - stat(keyfile, &fileStat); /** get the status and size of keyfile */ - fsize = (int)fileStat.st_size; -@@ -579,7 +583,7 @@ void modifiedEntity(char * filePath) - LOG("modifEntity", "Entered"); - - filename = _UQ_extractServiceName(filePath); /** get the conf file name from the path */ -- sprintf( wbemname,"/usr/local/etc/UniqueKey/.%s.wbem",filename); /** prepare the wbemname to retain a copy of the conf file */ -+ sprintf( wbemname,SYSCONFDIR "/UniqueKey/.%s.wbem",filename); /** prepare the wbemname to retain a copy of the conf file */ - - fconf = fopen(filePath, "r"); /** open conf file in read and wbemname file in write mode */ - fwbem = fopen(wbemname, "w"); -@@ -631,10 +635,10 @@ void resetFileData(char * filePath) - set the respective file names of files created to support hashing - delete all the files created */ - -- sprintf( wbemfile,"/usr/local/etc/UniqueKey/.%s.wbem",filename); -- sprintf( keyfile,"/usr/local/etc/UniqueKey/.%s.key",filename); -- sprintf( tmpfile,"/usr/local/etc/UniqueKey/.%s.tmp",filename); -- sprintf( idfile, "/usr/local/etc/UniqueKey/.%s.Id", filename); -+ sprintf( wbemfile,SYSCONFDIR "/UniqueKey/.%s.wbem",filename); -+ sprintf( keyfile,SYSCONFDIR "/UniqueKey/.%s.key",filename); -+ sprintf( tmpfile,SYSCONFDIR "/UniqueKey/.%s.tmp",filename); -+ sprintf( idfile, SYSCONFDIR "/UniqueKey/.%s.Id", filename); - - free(filename); - remove(wbemfile); Index: sblim-cmpi-dhcp-0.5.5.tar.bz2 =================================================================== Binary file sblim-cmpi-dhcp-0.5.5.tar.bz2 has changed
- fixed compilation with new automake
Displaying revisions 1 - 20 of 24