rpm/libvirt-cim
SHA256
1
0
Fork 0
forked from pool/libvirt-cim
Code Pull Requests Activity

Compare commits

base: rpm:factory
Branches Tags
rpm:factory pool:factory
..
compare: pool:factory
Branches Tags
pool:factory rpm:factory

4 Commits
factory ... factory

Author SHA256 Message Date
Ana Guerrero
3f5faaeba8 Accepting request 1221695 from systemsmanagement:wbem 
update to fix build

OBS-URL: https://build.opensuse.org/request/show/1221695
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt-cim?expand=0&rev=51
 2024-11-06 15:56:13 +00:00
Klaus Kämpf
b44af83be5 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:wbem/libvirt-cim?expand=0&rev=38 2024-11-06 08:36:50 +00:00
Klaus Kämpf
2c0458485b - fix version number in _service 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:wbem/libvirt-cim?expand=0&rev=37
 2024-11-06 08:33:09 +00:00
Klaus Kämpf
2276b50922 - Update to version v0.6.3+git20230822.a5a073c: 
* ci: lcitool: Maintain project package deps lists here
  * README: Update link to upstream repo and drop mailing list refernce
  * ci: refresh with latest lcitool manifest
  * ci: mark bleeding edge distros as allowing failures
  * configure: convert to using xz archives for dist
  * ci: refresh with lcitool manifest
  * Switch to new GitHub repo-lockdown configuration
  * ci: remove obsolete refresh script and documentation
  * ci: re-generate containers/gitlab config from manifest
  * ci: define a CI manifest file
- add 0005-include-stdlib.h.patch, 0006-drop-base_schema.patch
- drop f6b7eeaf.patch, upstream
- rename
  provider-reg.patch to 0001-provider-reg.patch
  automake.patch to 0002-automake.patch
  libvirt-cim-0.6.3-fix-bashisms.patch to 0003-fix-bashisms.patch
  memory_leaks.patch to 0004-memory-leaks.patch

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:wbem/libvirt-cim?expand=0&rev=36
 2024-11-05 16:35:22 +00:00
15 changed files with 609 additions and 182 deletions
Expand all files Collapse all files

26
0001-provider-reg.patch Normal file
View File

@@ -0,0 +1,26 @@
From fd50bb9a521c26a6de4e9ab15ec0e71e4c4189c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Tue, 5 Nov 2024 16:50:11 +0100
Subject: [PATCH 1/6] provider-reg
add " around echo parameters
---
provider-register.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/provider-register.sh b/provider-register.sh
index f66fe54..cd44462 100755
--- a/provider-register.sh
+++ b/provider-register.sh
@@ -742,7 +742,7 @@ gb_getopt()
shift;;
esac
done
- echo $options $registrations $moffiles
+ echo "$options $registrations $moffiles"
}
prepargs=`gb_getopt $*`
--
2.47.0

412
0002-automake.patch Normal file
View File

@@ -0,0 +1,412 @@
From 8393769c95a491d7c92f02445db178c7fa0d64c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Tue, 5 Nov 2024 16:51:59 +0100
Subject: [PATCH 2/6] automake
add missing files
---
AUTHORS | 1 +
ChangeLog | 1 +
INSTALL | 365 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
NEWS | 1 +
4 files changed, 368 insertions(+)
create mode 100644 AUTHORS
create mode 100644 ChangeLog
create mode 100644 INSTALL
create mode 100644 NEWS
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..a43b026
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Dan Smith <danms@us.ibm.com>
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b873268
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1 @@
+See http://libvirt.org/CIM/
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..d3b6e4e
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,365 @@
+Installation Instructions
+*************************
+
+Basic Installation
+==================
+
+ The following shell commands:
+
+ test -f configure || ./bootstrap
+ ./configure
+ make
+ make install
+
+should configure, build, and install this package. The first line,
+which bootstraps, is intended for developers; when building from
+distribution tarballs it does nothing and can be skipped.
+
+ The following more-detailed instructions are generic; see the
+‘README’ file for instructions specific to this package. Some packages
+provide this ‘INSTALL’ file but do not implement all of the features
+documented below. The lack of an optional feature in a given package is
+not necessarily a bug. More recommendations for GNU packages can be
+found in the GNU Coding Standards.
+
+ Many packages have scripts meant for developers instead of ordinary
+builders, as they may use developer tools that are less commonly
+installed, or they may access the network, which has privacy
+implications. If the ‘bootstrap’ shell script exists, it attempts to
+build the ‘configure’ shell script and related files, possibly using
+developer tools or the network. Because the output of ‘bootstrap’ is
+system-independent, it is normally run by a package developer so that
+its output can be put into the distribution tarball and ordinary
+builders and users need not run ‘bootstrap’. Some packages have
+commands like ‘./autopull.sh’ and ‘./autogen.sh’ that you can run
+instead of ‘./bootstrap’, for more fine-grained control over
+bootstrapping.
+
+ The ‘configure’ shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a ‘Makefile’ in each directory of the package.
+It may also create one or more ‘.h’ files containing system-dependent
+definitions. Finally, it creates a shell script ‘config.status’ that
+you can run in the future to recreate the current configuration, and a
+file ‘config.log’ containing output useful for debugging ‘configure’.
+
+ It can also use an optional file (typically called ‘config.cache’ and
+enabled with ‘--cache-file=config.cache’ or simply ‘-C’) that saves the
+results of its tests to speed up reconfiguring. Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how ‘configure’ could check whether to do them, and mail
+diffs or instructions to the address given in the ‘README’ so they can
+be considered for the next release. If you are using the cache, and at
+some point ‘config.cache’ contains results you don’t want to keep, you
+may remove or edit it.
+
+ The ‘autoconf’ program generates ‘configure’ from the file
+‘configure.ac’. Normally you should edit ‘configure.ac’ instead of
+editing ‘configure’ directly.
+
+ The simplest way to compile this package is:
+
+ 1. ‘cd’ to the directory containing the package’s source code.
+
+ 2. If this is a developer checkout and file ‘configure’ does not yet
+ exist, type ‘./bootstrap’ to create it. You may need special
+ developer tools and network access to bootstrap, and the network
+ access may have privacy implications.
+
+ 3. Type ‘./configure’ to configure the package for your system. This
+ might take a while. While running, ‘configure’ prints messages
+ telling which features it is checking for.
+
+ 4. Type ‘make’ to compile the package.
+
+ 5. Optionally, type ‘make check’ to run any self-tests that come with
+ the package, generally using the just-built uninstalled binaries.
+
+ 6. Type ‘make install’ to install the programs and any data files and
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the ‘make install’ phase executed with root
+ privileges.
+
+ 7. Optionally, type ‘make installcheck’ to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior ‘make install’ required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 8. You can remove the program binaries and object files from the
+ source code directory by typing ‘make clean’. To also remove the
+ files that ‘configure’ created (so you can compile the package for
+ a different kind of computer), type ‘make distclean’. There is
+ also a ‘make maintainer-clean’ target, but that is intended mainly
+ for the package’s developers. If you use it, you may have to
+ bootstrap again.
+
+ 9. If the package follows the GNU Coding Standards, you can type ‘make
+ uninstall’ to remove the installed files.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the ‘configure’ script does not know about. Run ‘./configure --help’
+for details on some of the pertinent environment variables.
+
+ You can give ‘configure’ initial values for configuration parameters
+by setting variables in the command line or in the environment. Here is
+an example:
+
+ ./configure CC=gcc CFLAGS=-g LIBS=-lposix
+
+ See “Defining Variables” for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each system in their own
+directory. To do this, you can use GNU ‘make’. ‘cd’ to the directory
+where you want the object files and executables to go and run the
+‘configure’ script. ‘configure’ automatically checks for the source
+code in the directory that ‘configure’ is in and in ‘..’. This is known
+as a “VPATH” build.
+
+ With a non-GNU ‘make’, it is safer to compile the package for one
+system at a time in the source code directory. After you have installed
+the package for one system, use ‘make distclean’ before reconfiguring
+for another system.
+
+ Some platforms, notably macOS, support “fat” or “universal” binaries,
+where a single binary can execute on different architectures. On these
+platforms you can configure and compile just once, with options specific
+to that platform.
+
+Installation Names
+==================
+
+ By default, ‘make install’ installs the package’s commands under
+‘/usr/local/bin’, include files under ‘/usr/local/include’, etc. You
+can specify an installation prefix other than ‘/usr/local’ by giving
+‘configure’ the option ‘--prefix=PREFIX’, where PREFIX must be an
+absolute file name.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option ‘--exec-prefix=PREFIX’ to ‘configure’, the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like ‘--bindir=DIR’ to specify different values for particular
+kinds of files. Run ‘configure --help’ for a list of the directories
+you can set and what kinds of files go in them. In general, the default
+for these options is expressed in terms of ‘${prefix}’, so that
+specifying just ‘--prefix’ will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to ‘configure’; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+‘make install’ command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, ‘make install
+prefix=/alternate/directory’ will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+‘${prefix}’. Any directories that were specified during ‘configure’,
+but not in terms of ‘${prefix}’, must each be overridden at install time
+for the entire installation to be relocated. The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation. However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the ‘DESTDIR’ variable. For
+example, ‘make install DESTDIR=/alternate/directory’ will prepend
+‘/alternate/directory’ before all installation names. The approach of
+‘DESTDIR’ overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of ‘${prefix}’
+at ‘configure’ time.
+
+Optional Features
+=================
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving ‘configure’ the
+option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
+
+ Some packages pay attention to ‘--enable-FEATURE’ and
+‘--disable-FEATURE’ options to ‘configure’, where FEATURE indicates an
+optional part of the package. They may also pay attention to
+‘--with-PACKAGE’ and ‘--without-PACKAGE’ options, where PACKAGE is
+something like ‘gnu-ld’. ‘./configure --help’ should mention the
+‘--enable-...’ and ‘--with-...’ options that the package recognizes.
+
+ Some packages offer the ability to configure how verbose the
+execution of ‘make’ will be. For these packages, running ‘./configure
+--enable-silent-rules’ sets the default to minimal output, which can be
+overridden with ‘make V=1’; while running ‘./configure
+--disable-silent-rules’ sets the default to verbose, which can be
+overridden with ‘make V=0’.
+
+Specifying a System Type
+========================
+
+ By default ‘configure’ builds for the current system. To create
+binaries that can run on a different system type, specify a
+‘--host=TYPE’ option along with compiler variables that specify how to
+generate object code for TYPE. For example, to create binaries intended
+to run on a 64-bit ARM processor:
+
+ ./configure --host=aarch64-linux-gnu \
+ CC=aarch64-linux-gnu-gcc \
+ CXX=aarch64-linux-gnu-g++
+
+If done on a machine that can execute these binaries (e.g., via
+‘qemu-aarch64’, ‘$QEMU_LD_PREFIX’, and Linux’s ‘binfmt_misc’
+capability), the build behaves like a native build. Otherwise it is a
+cross-build: ‘configure’ will make cross-compilation guesses instead of
+running test programs, and ‘make check’ will not work.
+
+ A system type can either be a short name like ‘mingw64’, or a
+canonical name like ‘x86_64-pc-linux-gnu’. Canonical names have the
+form CPU-COMPANY-SYSTEM where SYSTEM is either OS or KERNEL-OS. To
+canonicalize and validate a system type, you can run the command
+‘config.sub’, which is often squirreled away in a subdirectory like
+‘build-aux’. For example:
+
+ $ build-aux/config.sub arm64-linux
+ aarch64-unknown-linux-gnu
+ $ build-aux/config.sub riscv-lnx
+ Invalid configuration 'riscv-lnx': OS 'lnx' not recognized
+
+You can look at the ‘config.sub’ file to see which types are recognized.
+If the file is absent, this package does not need the system type.
+
+ If ‘configure’ fails with the diagnostic “cannot guess build type”.
+‘config.sub’ did not recognize your system’s type. In this case, first
+fetch the newest versions of these files from the GNU config package
+(https://savannah.gnu.org/projects/config). If that fixes things,
+please report it to the maintainers of the package containing
+‘configure’. Otherwise, you can try the configure option ‘--build=TYPE’
+where TYPE comes close to your system type; also, please report the
+problem to <config-patches@gnu.org>.
+
+ For more details about configuring system types, see the Autoconf
+documentation.
+
+Sharing Defaults
+================
+
+ If you want to set default values for ‘configure’ scripts to share,
+you can create a site shell script called ‘config.site’ that gives
+default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
+‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
+‘PREFIX/etc/config.site’ if it exists. Or, you can set the
+‘CONFIG_SITE’ environment variable to the location of the site script.
+A warning: not all ‘configure’ scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to ‘configure’. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the ‘configure’ command line, using ‘VAR=value’. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified ‘gcc’ to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for ‘CONFIG_SHELL’ due to an
+Autoconf limitation. Until the limitation is lifted, you can use this
+workaround:
+
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+‘configure’ Invocation
+======================
+
+ ‘configure’ recognizes the following options to control how it
+operates.
+
+‘--help’
+‘-h’
+ Print a summary of all of the options to ‘configure’, and exit.
+
+‘--help=short’
+‘--help=recursive’
+ Print a summary of the options unique to this package’s
+ ‘configure’, and exit. The ‘short’ variant lists options used only
+ in the top level, while the ‘recursive’ variant lists options also
+ present in any nested packages.
+
+‘--version’
+‘-V’
+ Print the version of Autoconf used to generate the ‘configure’
+ script, and exit.
+
+‘--cache-file=FILE’
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally ‘config.cache’. FILE defaults to ‘/dev/null’ to
+ disable caching.
+
+‘--config-cache’
+‘-C’
+ Alias for ‘--cache-file=config.cache’.
+
+‘--srcdir=DIR’
+ Look for the package’s source code in directory DIR. Usually
+ ‘configure’ can determine that directory automatically.
+
+‘--prefix=DIR’
+ Use DIR as the installation prefix. See “Installation Names” for
+ more details, including other options available for fine-tuning the
+ installation locations.
+
+‘--host=TYPE’
+ Build binaries for system TYPE. See “Specifying a System Type”.
+
+‘--enable-FEATURE’
+‘--disable-FEATURE’
+ Enable or disable the optional FEATURE. See “Optional Features”.
+
+‘--with-PACKAGE’
+‘--without-PACKAGE’
+ Use or omit PACKAGE when building. See “Optional Features”.
+
+‘--quiet’
+‘--silent’
+‘-q’
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to ‘/dev/null’ (any error
+ messages will still be shown).
+
+‘--no-create’
+‘-n’
+ Run the configure checks, but stop before creating any output
+ files.
+
+‘configure’ also recognizes several environment variables, and accepts
+some other, less widely useful, options. Run ‘configure --help’ for
+more details.
+
+Copyright notice
+================
+
+ Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2024 Free Software
+Foundation, Inc.
+
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..6011c7f
--- /dev/null
+++ b/NEWS
@@ -0,0 +1 @@
+See http://libvirt.org
--
2.47.0

23
libvirt-cim-0.6.3-fix-bashisms.patch → 0003-fix-bashisms.patch
View File

@@ -1,7 +1,17 @@
diff -Ndur libvirt-cim-0.6.3/provider-register.sh libvirt-cim-0.6.3-fix-bashisms/provider-register.sh
--- libvirt-cim-0.6.3/provider-register.sh 2013-04-08 12:40:35.000000000 +0300
+++ libvirt-cim-0.6.3-fix-bashisms/provider-register.sh 2014-11-29 22:21:08.224843458 +0200
@@ -146,12 +146,12 @@
From 010f6e617eb8d7b1ff7e9fe5f27953e3f8b58cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Tue, 5 Nov 2024 16:53:28 +0100
Subject: [PATCH 3/6] fix bashisms
---
provider-register.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/provider-register.sh b/provider-register.sh
index cd44462..0b60a9a 100755
--- a/provider-register.sh
+++ b/provider-register.sh
@@ -146,12 +146,12 @@ EOFP
done
#produce Capabilities
@@ -16,7 +26,7 @@ diff -Ndur libvirt-cim-0.6.3/provider-register.sh libvirt-cim-0.6.3-fix-bashisms
numcap=
for cap in $CAPS
do
@@ -772,14 +772,14 @@
@@ -792,14 +792,14 @@ mofs=$*
if [ "$help" = "1" ]
then
usage
@@ -39,3 +49,6 @@ diff -Ndur libvirt-cim-0.6.3/provider-register.sh libvirt-cim-0.6.3-fix-bashisms
echo
echo Use this command to install schema mofs and register providers.
echo CIM Server Type is required as well as at least one registration file and one mof.
--
2.47.0

36
memory_leaks.patch → 0004-memory-leaks.patch
View File

@@ -1,13 +1,20 @@
Author: Adam Majer <amajer@suse.de>
Date: Thu Dec 7 15:10:07 CET 2017
From d07f47b783e8de1a49a744354ef9744334906fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Tue, 5 Nov 2024 17:19:57 +0100
Subject: [PATCH 4/6] memory leaks
Other asprintf memory leaks found. Forwarded upstream.
Author: Adam Majer <amajer@suse.de>
---
src/Virt_ComputerSystem.c | 2 ++
src/Virt_SettingsDefineCapabilities.c | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
Index: libvirt-cim-0.6.3/src/Virt_ComputerSystem.c
===================================================================
--- libvirt-cim-0.6.3.orig/src/Virt_ComputerSystem.c
+++ libvirt-cim-0.6.3/src/Virt_ComputerSystem.c
@@ -417,6 +417,8 @@ static int set_other_id_info(const CMPIB
diff --git a/src/Virt_ComputerSystem.c b/src/Virt_ComputerSystem.c
index da07f93..c6cbfd2 100644
--- a/src/Virt_ComputerSystem.c
+++ b/src/Virt_ComputerSystem.c
@@ -417,6 +417,8 @@ static int set_other_id_info(const CMPIBroker *broker,
CMPI_string);
}
@@ -16,11 +23,11 @@ Index: libvirt-cim-0.6.3/src/Virt_ComputerSystem.c
CMSetProperty(instance, "OtherIdentifyingInfo",
&id_info, CMPI_stringA);
Index: libvirt-cim-0.6.3/src/Virt_SettingsDefineCapabilities.c
===================================================================
--- libvirt-cim-0.6.3.orig/src/Virt_SettingsDefineCapabilities.c
+++ libvirt-cim-0.6.3/src/Virt_SettingsDefineCapabilities.c
@@ -1977,7 +1977,6 @@ static CMPIStatus set_input_props(const
diff --git a/src/Virt_SettingsDefineCapabilities.c b/src/Virt_SettingsDefineCapabilities.c
index 85cb27a..9750217 100644
--- a/src/Virt_SettingsDefineCapabilities.c
+++ b/src/Virt_SettingsDefineCapabilities.c
@@ -1980,7 +1980,6 @@ static CMPIStatus set_input_props(const CMPIObjectPath *ref,
char *cap;
if (get_input_dev_caption(type, bus, &cap) != 1) {
@@ -28,7 +35,7 @@ Index: libvirt-cim-0.6.3/src/Virt_SettingsDefineCapabilities.c
cu_statusf(_BROKER, &s,
CMPI_RC_ERR_NOT_FOUND,
"Unable to build input caption");
@@ -1985,12 +1984,15 @@ static CMPIStatus set_input_props(const
@@ -1988,12 +1987,15 @@ static CMPIStatus set_input_props(const CMPIObjectPath *ref,
}
if (caption != NULL) {
@@ -45,3 +52,6 @@ Index: libvirt-cim-0.6.3/src/Virt_SettingsDefineCapabilities.c
}
inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_INPUT, DEVICE_RASD);
--
2.47.0

37
0005-include-stdlib.h.patch Normal file
View File

@@ -0,0 +1,37 @@
From a3b3538d3a2a3d3193b044811ddeb0b53243d134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Tue, 5 Nov 2024 17:24:24 +0100
Subject: [PATCH 5/6] include stdlib.h
to reduce warnings aroung malloc/realloc/free
---
libxkutil/infostore.c | 1 +
libxkutil/xml_parse_test.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/libxkutil/infostore.c b/libxkutil/infostore.c
index d2b2f71..060a83b 100644
--- a/libxkutil/infostore.c
+++ b/libxkutil/infostore.c
@@ -26,6 +26,7 @@
#include <sys/stat.h>
#include <sys/file.h>
#include <string.h>
+#include <stdlib.h>
#include <libvirt/libvirt.h>
#include <libxml/parser.h>
diff --git a/libxkutil/xml_parse_test.c b/libxkutil/xml_parse_test.c
index 303880d..62bf224 100644
--- a/libxkutil/xml_parse_test.c
+++ b/libxkutil/xml_parse_test.c
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <inttypes.h>
+#include <stdlib.h>
#include <getopt.h>
--
2.47.0

27
0006-drop-base_schema.patch Normal file
View File

@@ -0,0 +1,27 @@
From 2604c1377e7c0525f813569b24309cc3bc14dbef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Tue, 5 Nov 2024 17:28:18 +0100
Subject: [PATCH 6/6] drop base_schema
the respective CIM MOF files are provided via the cim-schema runtime
requirement
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index bebaf60..91f847e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Copyright IBM Corp. 2007-2014
AUTOMAKE_OPTIONS=dist-bzip2
-SUBDIRS = libxkutil src doc base_schema
+SUBDIRS = libxkutil src doc
MOFS = \
$(top_srcdir)/schema/ComputerSystem.mof \
--
2.47.0

20
_service Normal file
View File

@@ -0,0 +1,20 @@
<services>
<service name="download_files" mode="manual"/>
<service name="tar_scm" mode="manual">
<param name="url">https://gitlab.com/libvirt/libvirt-cim.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="manual">
<param name="file">libvirt-cim-*.tar</param>
<param name="compression">gz</param>
</service>
<service name="set_version" mode="manual">
<param name="basename">libvirt-cim</param>
</service>
</services>

4
_servicedata Normal file
View File

@@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.com/libvirt/libvirt-cim.git</param>
<param name="changesrevision">a5a073cf241a168da261e69b566e106b4366b4ba</param></service></servicedata>

24
automake.patch
View File

@@ -1,24 +0,0 @@
Index: libvirt-cim-0.5.8/AUTHORS
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.8/AUTHORS
@@ -0,0 +1 @@
+Dan Smith <danms@us.ibm.com>
Index: libvirt-cim-0.5.8/ChangeLog
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.8/ChangeLog
@@ -0,0 +1 @@
+See http://libvirt.org/CIM/
Index: libvirt-cim-0.5.8/INSTALL
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.8/INSTALL
@@ -0,0 +1 @@
+See http://libvirt.org/CIM/
Index: libvirt-cim-0.5.8/NEWS
===================================================================
--- /dev/null
+++ libvirt-cim-0.5.8/NEWS
@@ -0,0 +1 @@
+See http://libvirt.org/CIM/

107
f6b7eeaf.patch
View File

@@ -1,107 +0,0 @@
Ported by: Adam Majer <amajer@suse.de>
Date: Tue Jan 9 09:57:22 CET 2018
commit f6b7eeaf097b6441ed7928c7130582a83bba5f7d
Author: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Date: Fri Sep 6 14:09:55 2013 +0200
libxkutil: Plug memory leaks in device parsing
Fixed a number of memory leaks detected while running xml_parse_test
under valgrind.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Index: libvirt-cim-0.6.3/libxkutil/device_parsing.c
===================================================================
--- libvirt-cim-0.6.3.orig/libxkutil/device_parsing.c
+++ libvirt-cim-0.6.3/libxkutil/device_parsing.c
@@ -94,6 +94,8 @@ static void cleanup_net_device(struct ne
free(dev->device);
free(dev->net_mode);
free(dev->filter_ref);
+ free(dev->poolid);
+ cleanup_vsi_device(&dev->vsi);
}
static void cleanup_emu_device(struct emu_device *dev)
@@ -594,6 +596,7 @@ static int parse_mem_device(xmlNode *nod
struct virt_device *vdev = NULL;
struct mem_device *mdev = NULL;
char *content = NULL;
+ int ret = 0;
vdev = calloc(1, sizeof(*vdev));
if (vdev == NULL)
@@ -608,17 +611,15 @@ static int parse_mem_device(xmlNode *nod
else if (XSTREQ(node->name, "memory"))
sscanf(content, "%" PRIu64, &mdev->maxsize);
- free(content);
-
*vdevs = vdev;
-
- return 1;
+ vdev = NULL;
+ ret = 1;
err:
free(content);
free(vdev);
- return 0;
+ return ret;
}
static char *get_attr_value_default(xmlNode *node, char *attrname,
@@ -806,7 +807,10 @@ static int do_parse(xmlNodeSet *nsv, dev
}
out:
- *l = list;
+ if (list) {
+ free(*l);
+ *l = list;
+ }
return lstidx;
}
@@ -1159,7 +1163,7 @@ static int parse_features(struct domain
static void set_action(int *val, xmlNode *child)
{
- const char *action = (char *)xmlNodeGetContent(child);
+ char *action = (char *)xmlNodeGetContent(child);
if (action == NULL)
*val = CIM_VSSD_RECOVERY_NONE;
@@ -1171,6 +1175,8 @@ static void set_action(int *val, xmlNode
*val = CIM_VSSD_RECOVERY_RESTART;
else
*val = CIM_VSSD_RECOVERY_NONE;
+
+ xmlFree(action);
}
static int parse_domain(xmlNodeSet *nsv, struct domain *dominfo)
@@ -1318,9 +1324,11 @@ void cleanup_dominfo(struct domain **dom
dom = *dominfo;
free(dom->name);
+ free(dom->typestr);
free(dom->uuid);
free(dom->bootloader);
free(dom->bootloader_args);
+ free(dom->clock);
if (dom->type == DOMAIN_XENPV) {
free(dom->os_info.pv.type);
@@ -1345,6 +1353,7 @@ void cleanup_dominfo(struct domain **dom
CU_DEBUG("Unknown domain type %i", dom->type);
}
+ cleanup_virt_devices(&dom->dev_emu, 1);
cleanup_virt_devices(&dom->dev_mem, dom->dev_mem_ct);
cleanup_virt_devices(&dom->dev_net, dom->dev_net_ct);
cleanup_virt_devices(&dom->dev_disk, dom->dev_disk_ct);

3
libvirt-cim-0.6.3+git92.a5a073c.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:562d072fb850ba697098aaba4a49507e2fcc10dcbcedc273333a262c181a3948
size 1099768

3
libvirt-cim-0.6.3.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36a104557d853ea5d5bf737494ddae3344d4c66df0ee5bf4ebba8a76ec5d8c36
size 2173646

30
libvirt-cim.changes
View File

@@ -1,3 +1,33 @@
-------------------------------------------------------------------
Wed Nov 6 08:32:58 UTC 2024 - Klaus Kämpf <kkaempf@suse.de>
- fix version number in _service
-------------------------------------------------------------------
Tue Nov 05 15:47:35 UTC 2024 - kkaempf@suse.de
- Update to version v0.6.3+git20230822.a5a073c:
* ci: lcitool: Maintain project package deps lists here
* README: Update link to upstream repo and drop mailing list refernce
* ci: refresh with latest lcitool manifest
* ci: mark bleeding edge distros as allowing failures
* configure: convert to using xz archives for dist
* ci: refresh with lcitool manifest
* Switch to new GitHub repo-lockdown configuration
* ci: remove obsolete refresh script and documentation
* ci: re-generate containers/gitlab config from manifest
* ci: define a CI manifest file
- add 0005-include-stdlib.h.patch, 0006-drop-base_schema.patch
- drop f6b7eeaf.patch, upstream
- rename
provider-reg.patch to 0001-provider-reg.patch
automake.patch to 0002-automake.patch
libvirt-cim-0.6.3-fix-bashisms.patch to 0003-fix-bashisms.patch
memory_leaks.patch to 0004-memory-leaks.patch
-------------------------------------------------------------------
Fri Mar 1 10:17:28 UTC 2024 - pgajdos@suse.com

27
libvirt-cim.spec
View File

@@ -23,20 +23,21 @@
Name: libvirt-cim
Url: http://libvirt.org/CIM/
Url: http://libvirt.org
License: LGPL-2.1+
Group: System/Management
Version: 0.6.3
Version: 0.6.3+git92.a5a073c
Release: 0
Summary: CMPI-based CIM provider implementing DMTF SVPC model
Source: %{name}-%{version}.tar.bz2
Source: %{name}-%{version}.tar.gz
Source1: libvirt-cim-rpmlintrc
Source2: README.SUSE
Patch0: provider-reg.patch
Patch1: automake.patch
Patch2: libvirt-cim-0.6.3-fix-bashisms.patch
Patch3: f6b7eeaf.patch
Patch4: memory_leaks.patch
Patch1: 0001-provider-reg.patch
Patch2: 0002-automake.patch
Patch3: 0003-fix-bashisms.patch
Patch4: 0004-memory-leaks.patch
Patch5: 0005-include-stdlib.h.patch
Patch6: 0006-drop-base_schema.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
BuildRequires: autoconf
@@ -71,12 +72,6 @@ virtualization model. The goal is to support most of the features
exported by libvirt itself, enabling management of multiple platforms
with a single provider.
Authors:
--------
Dan Smith <danms@us.ibm.com>
%define REGISTRATION %{_datadir}/%{name}/*.registration
%define SCHEMA %{_datadir}/%{name}/*.mof
%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile,ReferencedProfile}.registration
@@ -122,7 +117,6 @@ fi
%post
/sbin/ldconfig
%{_datadir}/%{name}/install_base_schema.sh %{_datadir}/%{name}
# Register libvirt-cim on the sfcb's providers list
%{_datadir}/%{name}/provider-register.sh -t sfcb \
-n root/virt \
@@ -171,9 +165,6 @@ fi
%{_datadir}/%{name}/*.sh
%{_datadir}/%{name}/*.mof
%{_datadir}/%{name}/*.registration
%{_datadir}/%{name}/cim_schema_*-MOFs.zip
%{_datadir}/%{name}/cimv*-cimv2_mof
%{_datadir}/%{name}/cimv*-interop_mof
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/cim
%if 0%{?suse_version}

12
provider-reg.patch
View File

@@ -1,12 +0,0 @@
diff -ru a/provider-register.sh b/provider-register.sh
--- a/provider-register.sh 2008-05-06 15:12:37.000000000 -0600
+++ b/provider-register.sh 2008-05-16 11:31:02.000000000 -0600
@@ -656,7 +656,7 @@
shift;;
esac
done
- echo $options $registrations $moffiles
+ echo "$options $registrations $moffiles"
}
prepargs=`gb_getopt $*`