Compare commits
66 Commits
libvirt-0_
...
libvirt-0_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45b0b2bfa6 | ||
|
|
f29ea218b7 | ||
|
|
7d193b7810 | ||
|
|
3182a4df5a | ||
|
|
4f667910e9 | ||
|
|
b395a39f7b | ||
|
|
fdd7e87fe3 | ||
|
|
f06c387ab5 | ||
|
|
5ad8bc8190 | ||
|
|
31802de821 | ||
|
|
cc39758e17 | ||
|
|
55fabd69c0 | ||
|
|
b2a1a0e9ba | ||
|
|
cbe377ed29 | ||
|
|
06a21e388f | ||
|
|
d1a886ab31 | ||
|
|
c70baa5133 | ||
|
|
52b4d91272 | ||
|
|
338630edc8 | ||
|
|
a05e64b718 | ||
|
|
c003690dfc | ||
|
|
2cac8ea133 | ||
|
|
deefad73a9 | ||
|
|
f6cef943a9 | ||
|
|
7a6f0752c1 | ||
|
|
36d558635e | ||
|
|
98bceee6b1 | ||
|
|
4e70e5049f | ||
|
|
e66ceb7f97 | ||
|
|
23d5b99123 | ||
|
|
df8a62cdc8 | ||
|
|
8e36286f00 | ||
|
|
cd0f44cfff | ||
|
|
dcd808aefc | ||
|
|
8713d4b7ef | ||
|
|
68efefa919 | ||
|
|
1c5afbb774 | ||
|
|
e61694fd1d | ||
|
|
608f915ea7 | ||
|
|
b28edd6eab | ||
|
|
327fe785ba | ||
|
|
5c1d884231 | ||
|
|
54c7c9997c | ||
|
|
dec47cc4eb | ||
|
|
ecaf0eb615 | ||
|
|
ea6b32b5e4 | ||
|
|
313e00f3ac | ||
|
|
b3a53e18a9 | ||
|
|
24467d1235 | ||
|
|
fdaa69f5e3 | ||
|
|
cf2cd869d9 | ||
|
|
f2572ab2b4 | ||
|
|
90a17a6e65 | ||
|
|
9f2e4f2b21 | ||
|
|
bc485ef21f | ||
|
|
0d3a7da407 | ||
|
|
f68d725fc4 | ||
|
|
044e9b5c7b | ||
|
|
96a9b8bc2e | ||
|
|
66a051f485 | ||
|
|
609ab7cda8 | ||
|
|
0caeb23111 | ||
|
|
7599107322 | ||
|
|
861e11f3e4 | ||
|
|
2ea97c32dc | ||
|
|
cb54686f58 |
19
.cvsignore
19
.cvsignore
@@ -3,4 +3,23 @@ libvirt-0.0.4.tar.gz
|
|||||||
libvirt-0.0.5.tar.gz
|
libvirt-0.0.5.tar.gz
|
||||||
libvirt-0.0.6.tar.gz
|
libvirt-0.0.6.tar.gz
|
||||||
libvirt-0.1.0.tar.gz
|
libvirt-0.1.0.tar.gz
|
||||||
|
libvirt-0.1.2.tar.gz
|
||||||
libvirt-0.1.1.tar.gz
|
libvirt-0.1.1.tar.gz
|
||||||
|
libvirt-0.1.3.tar.gz
|
||||||
|
libvirt-0.1.4.tar.gz
|
||||||
|
libvirt-0.1.5.tar.gz
|
||||||
|
libvirt-0.1.6.tar.gz
|
||||||
|
libvirt-0.1.7.tar.gz
|
||||||
|
libvirt-0.1.8.tar.gz
|
||||||
|
libvirt-0.1.9.tar.gz
|
||||||
|
libvirt-0.1.10.tar.gz
|
||||||
|
libvirt-0.1.11.tar.gz
|
||||||
|
libvirt-0.2.0.tar.gz
|
||||||
|
libvirt-0.2.1.tar.gz
|
||||||
|
libvirt-0.2.2.tar.gz
|
||||||
|
libvirt-0.2.3.tar.gz
|
||||||
|
libvirt-0.3.0.tar.gz
|
||||||
|
libvirt-0.3.1.tar.gz
|
||||||
|
libvirt-0.3.2.tar.gz
|
||||||
|
libvirt-0.3.3.tar.gz
|
||||||
|
libvirt-0.4.0.tar.gz
|
||||||
|
|||||||
17
Makefile
17
Makefile
@@ -3,4 +3,19 @@
|
|||||||
NAME := libvirt
|
NAME := libvirt
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
SPECFILE = $(firstword $(wildcard *.spec))
|
||||||
|
|
||||||
include ../common/Makefile.common
|
define find-makefile-common
|
||||||
|
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||||
|
|
||||||
|
ifeq ($(MAKEFILE_COMMON),)
|
||||||
|
# attempt a checkout
|
||||||
|
define checkout-makefile-common
|
||||||
|
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(MAKEFILE_COMMON)
|
||||||
|
|||||||
83
libvirt-0.4.0-auth-null-cb-2.patch
Normal file
83
libvirt-0.4.0-auth-null-cb-2.patch
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
diff -rupN libvirt-0.4.0.orig/src/remote_internal.c libvirt-0.4.0.new/src/remote_internal.c
|
||||||
|
--- libvirt-0.4.0.orig/src/remote_internal.c 2008-01-11 10:39:34.000000000 -0500
|
||||||
|
+++ libvirt-0.4.0.new/src/remote_internal.c 2008-01-11 10:43:12.000000000 -0500
|
||||||
|
@@ -3054,8 +3054,12 @@ remoteAuthSASL (virConnectPtr conn, stru
|
||||||
|
if ((remoteAddr = addrToString(&sa, salen)) == NULL)
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
- if ((saslcb = remoteAuthMakeCallbacks(auth->credtype, auth->ncredtype)) == NULL)
|
||||||
|
- goto cleanup;
|
||||||
|
+ if (auth) {
|
||||||
|
+ if ((saslcb = remoteAuthMakeCallbacks(auth->credtype, auth->ncredtype)) == NULL)
|
||||||
|
+ goto cleanup;
|
||||||
|
+ } else {
|
||||||
|
+ saslcb = NULL;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* Setup a handle for being a client */
|
||||||
|
err = sasl_client_new("libvirt",
|
||||||
|
@@ -3168,15 +3172,21 @@ remoteAuthSASL (virConnectPtr conn, stru
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
/* Run the authentication callback */
|
||||||
|
- if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
|
||||||
|
+ if (auth && auth->cb) {
|
||||||
|
+ if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
|
||||||
|
+ __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
|
||||||
|
+ VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
|
||||||
|
+ "Failed to collect auth credentials");
|
||||||
|
+ goto cleanup;
|
||||||
|
+ }
|
||||||
|
+ remoteAuthFillInteract(cred, interact);
|
||||||
|
+ goto restart;
|
||||||
|
+ } else {
|
||||||
|
__virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
|
||||||
|
VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
|
||||||
|
- "Failed to collect auth credentials");
|
||||||
|
+ "No authentication callback available");
|
||||||
|
goto cleanup;
|
||||||
|
- return -1;
|
||||||
|
}
|
||||||
|
- remoteAuthFillInteract(cred, interact);
|
||||||
|
- goto restart;
|
||||||
|
}
|
||||||
|
free(iret.mechlist);
|
||||||
|
|
||||||
|
@@ -3240,15 +3250,22 @@ remoteAuthSASL (virConnectPtr conn, stru
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
/* Run the authentication callback */
|
||||||
|
- if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
|
||||||
|
+ if (auth && auth->cb) {
|
||||||
|
+ if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
|
||||||
|
+ __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
|
||||||
|
+ VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
|
||||||
|
+ "Failed to collect auth credentials");
|
||||||
|
+ goto cleanup;
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+ remoteAuthFillInteract(cred, interact);
|
||||||
|
+ goto restep;
|
||||||
|
+ } else {
|
||||||
|
__virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
|
||||||
|
VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
|
||||||
|
- "Failed to collect auth credentials");
|
||||||
|
+ "No authentication callback available");
|
||||||
|
goto cleanup;
|
||||||
|
- return -1;
|
||||||
|
}
|
||||||
|
- remoteAuthFillInteract(cred, interact);
|
||||||
|
- goto restep;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (serverin) {
|
||||||
|
@@ -3319,7 +3336,8 @@ remoteAuthSASL (virConnectPtr conn, stru
|
||||||
|
if (remoteAddr) free(remoteAddr);
|
||||||
|
if (serverin) free(serverin);
|
||||||
|
|
||||||
|
- free(saslcb);
|
||||||
|
+ if (saslcb)
|
||||||
|
+ free(saslcb);
|
||||||
|
remoteAuthFreeCredentials(cred, ncred);
|
||||||
|
if (ret != 0 && saslconn)
|
||||||
|
sasl_dispose(&saslconn);
|
||||||
44
libvirt-0.4.0-auth-null-cb.patch
Normal file
44
libvirt-0.4.0-auth-null-cb.patch
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
diff -rup libvirt-0.4.0.orig/src/remote_internal.c libvirt-0.4.0.new/src/remote_internal.c
|
||||||
|
--- libvirt-0.4.0.orig/src/remote_internal.c 2007-12-17 16:51:09.000000000 -0500
|
||||||
|
+++ libvirt-0.4.0.new/src/remote_internal.c 2008-01-02 16:28:44.000000000 -0500
|
||||||
|
@@ -3347,24 +3347,26 @@ remoteAuthPolkit (virConnectPtr conn, st
|
||||||
|
};
|
||||||
|
remoteDebug(priv, "Client initialize PolicyKit authentication");
|
||||||
|
|
||||||
|
- for (i = 0 ; i < auth->ncredtype ; i++) {
|
||||||
|
- if (auth->credtype[i] == VIR_CRED_EXTERNAL)
|
||||||
|
- allowcb = 1;
|
||||||
|
- }
|
||||||
|
+ if (auth && auth->cb) {
|
||||||
|
+ /* Check if the neccessary credential type for PolicyKit is supported */
|
||||||
|
+ for (i = 0 ; i < auth->ncredtype ; i++) {
|
||||||
|
+ if (auth->credtype[i] == VIR_CRED_EXTERNAL)
|
||||||
|
+ allowcb = 1;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- /* Run the authentication callback */
|
||||||
|
- if (allowcb) {
|
||||||
|
- if (auth && auth->cb &&
|
||||||
|
- (*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
|
||||||
|
- __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
|
||||||
|
- VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
|
||||||
|
- "Failed to collect auth credentials");
|
||||||
|
- return -1;
|
||||||
|
+ if (allowcb) {
|
||||||
|
+ /* Run the authentication callback */
|
||||||
|
+ if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
|
||||||
|
+ __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
|
||||||
|
+ VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
|
||||||
|
+ "Failed to collect auth credentials");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
} else {
|
||||||
|
- remoteDebug(priv, "No auth callback provided for PolicyKit");
|
||||||
|
+ remoteDebug(priv, "Client auth callback does not support PolicyKit");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
- remoteDebug(priv, "Client auth callback does not support PolicyKit");
|
||||||
|
+ remoteDebug(priv, "No auth callback provided");
|
||||||
|
}
|
||||||
|
|
||||||
|
memset (&ret, 0, sizeof ret);
|
||||||
12
libvirt-0.4.0-conffile-size.patch
Normal file
12
libvirt-0.4.0-conffile-size.patch
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
diff -rup libvirt-0.4.0.orig/src/conf.c libvirt-0.4.0.new/src/conf.c
|
||||||
|
--- libvirt-0.4.0.orig/src/conf.c 2007-12-12 08:30:49.000000000 -0500
|
||||||
|
+++ libvirt-0.4.0.new/src/conf.c 2008-01-02 16:30:12.000000000 -0500
|
||||||
|
@@ -705,7 +705,7 @@ error:
|
||||||
|
virConfPtr
|
||||||
|
__virConfReadFile(const char *filename)
|
||||||
|
{
|
||||||
|
- char content[4096];
|
||||||
|
+ char content[8192];
|
||||||
|
int fd;
|
||||||
|
int len;
|
||||||
|
|
||||||
22
libvirt-0.4.0-nodeinfo-compat.patch
Normal file
22
libvirt-0.4.0-nodeinfo-compat.patch
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
diff -rup libvirt-0.4.0.orig/src/xend_internal.c libvirt-0.4.0.new/src/xend_internal.c
|
||||||
|
--- libvirt-0.4.0.orig/src/xend_internal.c 2007-12-17 18:05:27.000000000 -0500
|
||||||
|
+++ libvirt-0.4.0.new/src/xend_internal.c 2008-01-18 21:13:30.000000000 -0500
|
||||||
|
@@ -1907,6 +1907,9 @@ sexpr_to_xend_node_info(struct sexpr *ro
|
||||||
|
info->mhz = sexpr_int(root, "node/cpu_mhz");
|
||||||
|
info->nodes = sexpr_int(root, "node/nr_nodes");
|
||||||
|
info->sockets = sexpr_int(root, "node/sockets_per_node");
|
||||||
|
+ info->cores = sexpr_int(root, "node/cores_per_socket");
|
||||||
|
+ info->threads = sexpr_int(root, "node/threads_per_core");
|
||||||
|
+
|
||||||
|
/* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'.
|
||||||
|
* Old Xen calculated sockets_per_node using its internal
|
||||||
|
* nr_cpus / (nodes*cores*threads), so fake it ourselves
|
||||||
|
@@ -1921,8 +1924,6 @@ sexpr_to_xend_node_info(struct sexpr *ro
|
||||||
|
if (info->sockets == 0)
|
||||||
|
info->sockets = 1;
|
||||||
|
}
|
||||||
|
- info->cores = sexpr_int(root, "node/cores_per_socket");
|
||||||
|
- info->threads = sexpr_int(root, "node/threads_per_core");
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
17
libvirt-0.4.0-remote-ssh.patch
Normal file
17
libvirt-0.4.0-remote-ssh.patch
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
diff -rup libvirt-0.4.0.orig/src/remote_internal.c libvirt-0.4.0.new/src/remote_internal.c
|
||||||
|
--- libvirt-0.4.0.orig/src/remote_internal.c 2008-01-14 19:32:25.000000000 -0500
|
||||||
|
+++ libvirt-0.4.0.new/src/remote_internal.c 2008-01-14 19:32:42.000000000 -0500
|
||||||
|
@@ -677,11 +677,12 @@ doRemoteOpen (virConnectPtr conn,
|
||||||
|
cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET);
|
||||||
|
cmd_argv[j++] = 0;
|
||||||
|
assert (j == nr_args);
|
||||||
|
- for (j = 0; j < nr_args; j++)
|
||||||
|
+ for (j = 0; j < (nr_args-1); j++) {
|
||||||
|
if (cmd_argv[j] == NULL) {
|
||||||
|
error (conn, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM));
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/*FALLTHROUGH*/
|
||||||
366
libvirt.spec
366
libvirt.spec
@@ -1,63 +1,136 @@
|
|||||||
Summary: Library providing an API to use the Xen virtualization
|
# -*- rpm-spec -*-
|
||||||
|
|
||||||
|
%if "%{fedora}" >= "8"
|
||||||
|
%define with_polkit 1
|
||||||
|
%define with_proxy no
|
||||||
|
%else
|
||||||
|
%define with_polkit 0
|
||||||
|
%define with_proxy yes
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Summary: Library providing a simple API virtualization
|
||||||
Name: libvirt
|
Name: libvirt
|
||||||
Version: 0.1.1
|
Version: 0.4.0
|
||||||
Release: 1
|
Release: 5%{?dist}%{?extra_release}
|
||||||
License: LGPL
|
License: LGPL
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source: libvirt-%{version}.tar.gz
|
Source: libvirt-%{version}.tar.gz
|
||||||
|
Patch1: libvirt-%{version}-auth-null-cb.patch
|
||||||
|
Patch2: libvirt-%{version}-conffile-size.patch
|
||||||
|
Patch3: libvirt-%{version}-auth-null-cb-2.patch
|
||||||
|
Patch4: libvirt-%{version}-remote-ssh.patch
|
||||||
|
Patch5: libvirt-%{version}-nodeinfo-compat.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
URL: http://libvir.org/
|
URL: http://libvirt.org/
|
||||||
BuildRequires: xen python python-devel
|
BuildRequires: python python-devel
|
||||||
Requires: xen
|
|
||||||
Requires: libxml2
|
Requires: libxml2
|
||||||
Requires: readline
|
Requires: readline
|
||||||
|
Requires: ncurses
|
||||||
|
Requires: dnsmasq
|
||||||
|
Requires: bridge-utils
|
||||||
|
Requires: iptables
|
||||||
|
# So remote clients can access libvirt over SSH tunnel
|
||||||
|
# (client invokes 'nc' against the UNIX socket on the server)
|
||||||
|
Requires: nc
|
||||||
|
Requires: cyrus-sasl
|
||||||
|
# Not technically required, but makes 'out-of-box' config
|
||||||
|
# work correctly & doesn't have onerous dependancies
|
||||||
|
Requires: cyrus-sasl-md5
|
||||||
|
%if %{with_polkit}
|
||||||
|
Requires: PolicyKit >= 0.6
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%ifarch i386 x86_64 ia64
|
||||||
|
BuildRequires: xen-devel
|
||||||
|
%endif
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: readline-devel
|
BuildRequires: readline-devel
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
BuildRequires: gettext
|
||||||
|
BuildRequires: gnutls-devel
|
||||||
|
BuildRequires: avahi-devel
|
||||||
|
BuildRequires: dnsmasq
|
||||||
|
BuildRequires: bridge-utils
|
||||||
|
BuildRequires: cyrus-sasl-devel
|
||||||
|
%if %{with_polkit}
|
||||||
|
BuildRequires: PolicyKit-devel >= 0.6
|
||||||
|
%endif
|
||||||
Obsoletes: libvir
|
Obsoletes: libvir
|
||||||
ExclusiveArch: i386 x86_64
|
|
||||||
|
# Fedora build root suckage
|
||||||
|
BuildRequires: gawk
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This C library provides an API to use the Xen virtualization framework,
|
Libvirt is a C toolkit to interract with the virtualization capabilities
|
||||||
and the virsh command line tool to control virtual domains.
|
of recent versions of Linux (and other OSes).
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Libraries, includes, etc. to compile with the libvirt library
|
Summary: Libraries, includes, etc. to compile with the libvirt library
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: libvirt = %{version}
|
Requires: libvirt = %{version}
|
||||||
|
Requires: pkgconfig
|
||||||
|
%ifarch i386 x86_64 ia64
|
||||||
|
Requires: xen-devel
|
||||||
|
%endif
|
||||||
Obsoletes: libvir-devel
|
Obsoletes: libvir-devel
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Includes and documentations for the C library providing an API to use
|
Includes and documentations for the C library providing an API to use
|
||||||
the Xen virtualization framework
|
the virtualization capabilities of recent versions of Linux (and other OSes).
|
||||||
|
|
||||||
%package python
|
%package python
|
||||||
Summary: Python bindings for the libvirt library
|
Summary: Python bindings for the libvirt library
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: libvirt = %{version}
|
Requires: libvirt = %{version}
|
||||||
Obsoletes: libvir-python
|
Obsoletes: libvir-python
|
||||||
Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`)
|
|
||||||
|
|
||||||
%description python
|
%description python
|
||||||
The libvirt-python package contains a module that permits applications
|
The libvirt-python package contains a module that permits applications
|
||||||
written in the Python programming language to use the interface
|
written in the Python programming language to use the interface
|
||||||
supplied by the libvirt library to use the Xen virtualization framework.
|
supplied by the libvirt library to use the the virtualization capabilities
|
||||||
|
of recent versions of Linux (and other OSes).
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
# Xen is availble only on i386 x86_64 ia64
|
||||||
|
%ifarch i386 i686 x86_64 ia64
|
||||||
|
%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
|
||||||
|
%else
|
||||||
|
%configure --without-xen --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
|
||||||
|
%endif
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -fr %{buildroot}
|
rm -fr %{buildroot}
|
||||||
|
|
||||||
%makeinstall
|
%makeinstall
|
||||||
(cd docs/examples ; make clean ; rm -rf .deps)
|
(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
|
||||||
|
(cd docs/examples/python ; rm -f Makefile Makefile.in)
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
|
rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
|
rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
|
||||||
|
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
|
||||||
|
|
||||||
|
# We don't want to install /etc/libvirt/qemu/networks in the main %files list
|
||||||
|
# because if the admin wants to delete the default network completely, we don't
|
||||||
|
# want to end up re-incarnating it on every RPM upgrade.
|
||||||
|
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/
|
||||||
|
cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
|
||||||
|
$RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
|
||||||
|
# Strip auto-generated UUID - we need it generated per-install
|
||||||
|
sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
|
||||||
|
%find_lang %{name}
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -fr %{buildroot}
|
rm -fr %{buildroot}
|
||||||
@@ -65,21 +138,67 @@ rm -fr %{buildroot}
|
|||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
# We want to install the default network for initial RPM installs
|
||||||
|
# or on the first upgrade from a non-network aware libvirt only.
|
||||||
|
# We check this by looking to see if the daemon is already installed
|
||||||
|
/sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
|
||||||
|
if [ $? != 0 ]
|
||||||
|
then
|
||||||
|
UUID=`/usr/bin/uuidgen`
|
||||||
|
sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \
|
||||||
|
< %{_datadir}/libvirt/networks/default.xml \
|
||||||
|
> %{_sysconfdir}/libvirt/qemu/networks/default.xml
|
||||||
|
ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
|
||||||
|
fi
|
||||||
|
|
||||||
|
/sbin/chkconfig --add libvirtd
|
||||||
|
|
||||||
|
%preun
|
||||||
|
if [ $1 = 0 ]; then
|
||||||
|
/sbin/service libvirtd stop 1>/dev/null 2>&1
|
||||||
|
/sbin/chkconfig --del libvirtd
|
||||||
|
fi
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files -f %{name}.lang
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
|
|
||||||
%doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
|
%doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
|
||||||
%doc %{_mandir}/man1/virsh.1*
|
%doc %{_mandir}/man1/virsh.1*
|
||||||
%{_bindir}/virsh
|
%{_bindir}/virsh
|
||||||
%{_libdir}/lib*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
|
||||||
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
|
||||||
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
|
||||||
|
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
|
||||||
|
%{_sysconfdir}/rc.d/init.d/libvirtd
|
||||||
|
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
|
||||||
|
%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
|
||||||
|
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
|
||||||
|
%dir %{_datadir}/libvirt/
|
||||||
|
%dir %{_datadir}/libvirt/networks/
|
||||||
|
%{_datadir}/libvirt/networks/default.xml
|
||||||
|
%dir %{_localstatedir}/run/libvirt/
|
||||||
|
%dir %{_localstatedir}/lib/libvirt/
|
||||||
|
%if %{with_polkit}
|
||||||
|
%{_datadir}/PolicyKit/policy/libvirtd.policy
|
||||||
|
%endif
|
||||||
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
||||||
|
%if %{with_proxy} == "yes"
|
||||||
|
%attr(4755, root, root) %{_libexecdir}/libvirt_proxy
|
||||||
|
%endif
|
||||||
|
%attr(0755, root, root) %{_sbindir}/libvirtd
|
||||||
|
%doc docs/*.rng
|
||||||
|
%doc docs/*.xml
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
|
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
|
%dir %{_includedir}/libvirt
|
||||||
%{_includedir}/libvirt/*.h
|
%{_includedir}/libvirt/*.h
|
||||||
%{_libdir}/pkgconfig/libvirt.pc
|
%{_libdir}/pkgconfig/libvirt.pc
|
||||||
%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
|
%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
|
||||||
@@ -103,6 +222,223 @@ rm -fr %{buildroot}
|
|||||||
%doc docs/examples/python
|
%doc docs/examples/python
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.4.0-5
|
||||||
|
- Autorebuild for GCC 4.3
|
||||||
|
|
||||||
|
* Fri Jan 18 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc9
|
||||||
|
- Fix SSH tunnelling (rhbz #428743)
|
||||||
|
- Fix back-compat for nodeinfo call changes.
|
||||||
|
|
||||||
|
* Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc9
|
||||||
|
- Fix crash when no auth callback
|
||||||
|
|
||||||
|
* Wed Jan 2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc9
|
||||||
|
- Fix reading large config files (rhbz #426425)
|
||||||
|
- Fix crash when connecting to a PolicyKit enabled server with not auth callback (rhbz #427107)
|
||||||
|
|
||||||
|
* Tue Dec 18 2007 Daniel Veillard <veillard@redhat.com> - 0.4.0-1.fc8
|
||||||
|
- Release of 0.4.0
|
||||||
|
- SASL based authentication
|
||||||
|
- PolicyKit authentication
|
||||||
|
- improved NUMA and statistics support
|
||||||
|
- lots of assorted improvements, bugfixes and cleanups
|
||||||
|
- documentation and localization improvements
|
||||||
|
|
||||||
|
* Mon Oct 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.3.3-2.fc8
|
||||||
|
- Added QEMU driver config file support
|
||||||
|
- Added example config files
|
||||||
|
|
||||||
|
* Sun Sep 30 2007 Daniel Veillard <veillard@redhat.com> - 0.3.3-1
|
||||||
|
- Release of 0.3.3
|
||||||
|
- Avahi support
|
||||||
|
- NUMA support
|
||||||
|
- lots of assorted improvements, bugfixes and cleanups
|
||||||
|
- documentation and localization improvements
|
||||||
|
|
||||||
|
* Fri Aug 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-2.fc8
|
||||||
|
- also build on arches where Xen is not available
|
||||||
|
|
||||||
|
* Tue Aug 21 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-1.fc8
|
||||||
|
- Release of 0.3.2
|
||||||
|
- API for domains migration
|
||||||
|
- APIs for collecting statistics on disks and interfaces
|
||||||
|
- lots of assorted bugfixes and cleanups
|
||||||
|
- documentation and localization improvements
|
||||||
|
|
||||||
|
* Thu Aug 16 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-4.fc8
|
||||||
|
- Fixes missing Requires for libvirt-devel
|
||||||
|
|
||||||
|
* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-3.fc8
|
||||||
|
- adds fix for bug #249594
|
||||||
|
|
||||||
|
* Wed Jul 25 2007 Jesse Keating <jkeating@redhat.com> - 0.3.1-2
|
||||||
|
- Rebuild for RH #249435
|
||||||
|
|
||||||
|
* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc8
|
||||||
|
- Release of 0.3.1
|
||||||
|
- localtime clock support
|
||||||
|
- PS/2 and USB input devices
|
||||||
|
- lots of assorted bugfixes and cleanups
|
||||||
|
- documentation and localization improvements
|
||||||
|
|
||||||
|
* Mon Jul 9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.0-1.fc8
|
||||||
|
- Release of 0.3.0
|
||||||
|
- Secure remote access support
|
||||||
|
- unification of daemons
|
||||||
|
- lots of assorted bugfixes and cleanups
|
||||||
|
- documentation and localization improvements
|
||||||
|
|
||||||
|
* Fri Jun 8 2007 Daniel Veillard <veillard@redhat.com> - 0.2.3-1.fc8
|
||||||
|
- Release of 0.2.3
|
||||||
|
- lot of assorted bugfixes and cleanups
|
||||||
|
- support for Xen-3.1
|
||||||
|
- new scheduler API
|
||||||
|
|
||||||
|
* Tue Apr 17 2007 Daniel Veillard <veillard@redhat.com> - 0.2.2-1
|
||||||
|
- Release of 0.2.2
|
||||||
|
- lot of assorted bugfixes and cleanups
|
||||||
|
- preparing for Xen-3.0.5
|
||||||
|
|
||||||
|
* Thu Mar 22 2007 Jeremy Katz <katzj@redhat.com> - 0.2.1-2.fc7
|
||||||
|
- don't require xen; we don't need the daemon and can control non-xen now
|
||||||
|
- fix scriptlet error (need to own more directories)
|
||||||
|
- update description text
|
||||||
|
|
||||||
|
* Fri Mar 16 2007 Daniel Veillard <veillard@redhat.com> - 0.2.1-1
|
||||||
|
- Release of 0.2.1
|
||||||
|
- lot of bug and portability fixes
|
||||||
|
- Add support for network autostart and init scripts
|
||||||
|
- New API to detect the virtualization capabilities of a host
|
||||||
|
- Documentation updates
|
||||||
|
|
||||||
|
* Fri Feb 23 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-4.fc7
|
||||||
|
- Fix loading of guest & network configs
|
||||||
|
|
||||||
|
* Fri Feb 16 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-3.fc7
|
||||||
|
- Disable kqemu support since its not in Fedora qemu binary
|
||||||
|
- Fix for -vnc arg syntax change in 0.9.0 QEMU
|
||||||
|
|
||||||
|
* Thu Feb 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-2.fc7
|
||||||
|
- Fixed path to qemu daemon for autostart
|
||||||
|
- Fixed generation of <features> block in XML
|
||||||
|
- Pre-create config directory at startup
|
||||||
|
|
||||||
|
* Wed Feb 14 2007 Daniel Veillard <veillard@redhat.com> 0.2.0-1.fc7
|
||||||
|
- support for KVM and QEmu
|
||||||
|
- support for network configuration
|
||||||
|
- assorted fixes
|
||||||
|
|
||||||
|
* Mon Jan 22 2007 Daniel Veillard <veillard@redhat.com> 0.1.11-1.fc7
|
||||||
|
- finish inactive Xen domains support
|
||||||
|
- memory leak fix
|
||||||
|
- RelaxNG schemas for XML configs
|
||||||
|
|
||||||
|
* Wed Dec 20 2006 Daniel Veillard <veillard@redhat.com> 0.1.10-1.fc7
|
||||||
|
- support for inactive Xen domains
|
||||||
|
- improved support for Xen display and vnc
|
||||||
|
- a few bug fixes
|
||||||
|
- localization updates
|
||||||
|
|
||||||
|
* Thu Dec 7 2006 Jeremy Katz <katzj@redhat.com> - 0.1.9-2
|
||||||
|
- rebuild against python 2.5
|
||||||
|
|
||||||
|
* Wed Nov 29 2006 Daniel Veillard <veillard@redhat.com> 0.1.9-1
|
||||||
|
- better error reporting
|
||||||
|
- python bindings fixes and extensions
|
||||||
|
- add support for shareable drives
|
||||||
|
- add support for non-bridge style networking
|
||||||
|
- hot plug device support
|
||||||
|
- added support for inactive domains
|
||||||
|
- API to dump core of domains
|
||||||
|
- various bug fixes, cleanups and improvements
|
||||||
|
- updated the localization
|
||||||
|
|
||||||
|
* Tue Nov 7 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-3
|
||||||
|
- it's pkgconfig not pgkconfig !
|
||||||
|
|
||||||
|
* Mon Nov 6 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-2
|
||||||
|
- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel
|
||||||
|
- Resolves: rhbz#202320
|
||||||
|
|
||||||
|
* Mon Oct 16 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-1
|
||||||
|
- fix missing page size detection code for ia64
|
||||||
|
- fix mlock size when getting domain info list from hypervisor
|
||||||
|
- vcpu number initialization
|
||||||
|
- don't label crashed domains as shut off
|
||||||
|
- fix virsh man page
|
||||||
|
- blktapdd support for alternate drivers like blktap
|
||||||
|
- memory leak fixes (xend interface and XML parsing)
|
||||||
|
- compile fix
|
||||||
|
- mlock/munlock size fixes
|
||||||
|
|
||||||
|
* Fri Sep 22 2006 Daniel Veillard <veillard@redhat.com> 0.1.7-1
|
||||||
|
- Fix bug when running against xen-3.0.3 hypercalls
|
||||||
|
- Fix memory bug when getting vcpus info from xend
|
||||||
|
|
||||||
|
* Fri Sep 22 2006 Daniel Veillard <veillard@redhat.com> 0.1.6-1
|
||||||
|
- Support for localization
|
||||||
|
- Support for new Xen-3.0.3 cdrom and disk configuration
|
||||||
|
- Support for setting VNC port
|
||||||
|
- Fix bug when running against xen-3.0.2 hypercalls
|
||||||
|
- Fix reconnection problem when talking directly to http xend
|
||||||
|
|
||||||
|
* Tue Sep 5 2006 Jeremy Katz <katzj@redhat.com> - 0.1.5-3
|
||||||
|
- patch from danpb to support new-format cd devices for HVM guests
|
||||||
|
|
||||||
|
* Tue Sep 5 2006 Daniel Veillard <veillard@redhat.com> 0.1.5-2
|
||||||
|
- reactivating ia64 support
|
||||||
|
|
||||||
|
* Tue Sep 5 2006 Daniel Veillard <veillard@redhat.com> 0.1.5-1
|
||||||
|
- new release
|
||||||
|
- bug fixes
|
||||||
|
- support for new hypervisor calls
|
||||||
|
- early code for config files and defined domains
|
||||||
|
|
||||||
|
* Mon Sep 4 2006 Daniel Berrange <berrange@redhat.com> - 0.1.4-5
|
||||||
|
- add patch to address dom0_ops API breakage in Xen 3.0.3 tree
|
||||||
|
|
||||||
|
* Mon Aug 28 2006 Jeremy Katz <katzj@redhat.com> - 0.1.4-4
|
||||||
|
- add patch to support paravirt framebuffer in Xen
|
||||||
|
|
||||||
|
* Mon Aug 21 2006 Daniel Veillard <veillard@redhat.com> 0.1.4-3
|
||||||
|
- another patch to fix network handling in non-HVM guests
|
||||||
|
|
||||||
|
* Thu Aug 17 2006 Daniel Veillard <veillard@redhat.com> 0.1.4-2
|
||||||
|
- patch to fix virParseUUID()
|
||||||
|
|
||||||
|
* Wed Aug 16 2006 Daniel Veillard <veillard@redhat.com> 0.1.4-1
|
||||||
|
- vCPUs and affinity support
|
||||||
|
- more complete XML, console and boot options
|
||||||
|
- specific features support
|
||||||
|
- enforced read-only connections
|
||||||
|
- various improvements, bug fixes
|
||||||
|
|
||||||
|
* Wed Aug 2 2006 Jeremy Katz <katzj@redhat.com> - 0.1.3-6
|
||||||
|
- add patch from pvetere to allow getting uuid from libvirt
|
||||||
|
|
||||||
|
* Wed Aug 2 2006 Jeremy Katz <katzj@redhat.com> - 0.1.3-5
|
||||||
|
- build on ia64 now
|
||||||
|
|
||||||
|
* Thu Jul 27 2006 Jeremy Katz <katzj@redhat.com> - 0.1.3-4
|
||||||
|
- don't BR xen, we just need xen-devel
|
||||||
|
|
||||||
|
* Thu Jul 27 2006 Daniel Veillard <veillard@redhat.com> 0.1.3-3
|
||||||
|
- need rebuild since libxenstore is now versionned
|
||||||
|
|
||||||
|
* Mon Jul 24 2006 Mark McLoughlin <markmc@redhat.com> - 0.1.3-2
|
||||||
|
- Add BuildRequires: xen-devel
|
||||||
|
|
||||||
|
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.1.3-1.1
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Tue Jul 11 2006 Daniel Veillard <veillard@redhat.com> 0.1.3-1
|
||||||
|
- support for HVM Xen guests
|
||||||
|
- various bugfixes
|
||||||
|
|
||||||
|
* Mon Jul 3 2006 Daniel Veillard <veillard@redhat.com> 0.1.2-1
|
||||||
|
- added a proxy mechanism for read only access using httpu
|
||||||
|
- fixed header includes paths
|
||||||
|
|
||||||
* Wed Jun 21 2006 Daniel Veillard <veillard@redhat.com> 0.1.1-1
|
* Wed Jun 21 2006 Daniel Veillard <veillard@redhat.com> 0.1.1-1
|
||||||
- extend and cleanup the driver infrastructure and code
|
- extend and cleanup the driver infrastructure and code
|
||||||
- python examples
|
- python examples
|
||||||
|
|||||||
Reference in New Issue
Block a user