pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 123118 from Virtualization

Browse Source 
- Add capability 'audit_write' to libvirtd apparmor profile
  update install-apparmor-profiles.patch
  bnc#764388
- Update to libvirt 0.9.11.3 stable release

OBS-URL: https://build.opensuse.org/request/show/123118
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=98
This commit is contained in:
Stephan Kulow 2012-06-01 05:20:58 +00:00 committed by Git OBS Bridge
commit 43dc917158
14 changed files with 103 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
4eb1c256-viruri-user.patch
View File

@ -1,92 +0,0 @@
commit 4eb1c2560d1ab8bae620788d343e9e7b32ddc066
Author: Guido Günther <agx@sigxcpu.org>
Date: Thu Apr 5 17:52:42 2012 +0200
virURIParse: don't forget to copy the user part
This got dropped with 300e60e15b22387dda41ed5985a9ebadfd86dd25
Cheers,
-- Guido
diff --git a/src/util/viruri.c b/src/util/viruri.c
index 2c6de51..a41f345 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -185,7 +185,9 @@ virURIParse(const char *uri)
if (xmluri->fragment &&
!(ret->fragment = strdup(xmluri->fragment)))
goto no_memory;
-
+ if (xmluri->user &&
+ !(ret->user = strdup(xmluri->user)))
+ goto no_memory;
/* First check: does it even make sense to jump inside */
if (ret->server != NULL &&
@@ -249,6 +251,7 @@ virURIFormat(virURIPtr uri)
xmluri.query = uri->query;
#endif
xmluri.fragment = uri->fragment;
+ xmluri.user = uri->user;
/* First check: does it make sense to do anything */
if (xmluri.server != NULL &&
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 3570217..4bb6a03 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -42,6 +42,7 @@ struct URIParseData {
const char *path;
const char *query;
const char *fragment;
+ const char *user;
virURIParamPtr params;
};
@@ -143,33 +144,34 @@ mymain(void)
signal(SIGPIPE, SIG_IGN);
#define TEST_FULL(uri, uri_out, scheme, server, port, path, query, \
- fragment, params) \
+ fragment, user, params) \
do { \
const struct URIParseData data = { \
uri, (uri_out) ? (uri_out) : (uri), scheme, server, port, \
- path, query, fragment, params \
+ path, query, fragment, user, params \
}; \
if (virtTestRun("Test URI " # uri, 1, testURIParse, &data) < 0) \
ret = -1; \
} while (0)
-#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, params) \
- TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, params)
+#define TEST_PARSE(uri, scheme, server, port, path, query, fragment, user, params) \
+ TEST_FULL(uri, NULL, scheme, server, port, path, query, fragment, user, params)
#define TEST_PARAMS(query_in, query_out, params) \
TEST_FULL("test://example.com/?" query_in, \
*query_out ? "test://example.com/?" query_out : NULL, \
- "test", "example.com", 0, "/", query_in, NULL, params)
+ "test", "example.com", 0, "/", query_in, NULL, NULL, params)
virURIParam params[] = {
{ (char*)"name", (char*)"value" },
{ NULL, NULL },
};
- TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL);
- TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL);
- TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", params);
- TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL);
- TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL);
- TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL);
+ TEST_PARSE("test://example.com", "test", "example.com", 0, NULL, NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://foo@example.com", "test", "example.com", 0, NULL, NULL, NULL, "foo", NULL);
+ TEST_PARSE("test://example.com:123", "test", "example.com", 123, NULL, NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://example.com:123/system?name=value#foo", "test", "example.com", 123, "/system", "name=value", "foo", NULL, params);
+ TEST_PARSE("test://127.0.0.1:123/system", "test", "127.0.0.1", 123, "/system", NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://[::1]:123/system", "test", "::1", 123, "/system", NULL, NULL, NULL, NULL);
+ TEST_PARSE("test://[2001:41c8:1:4fd4::2]:123/system", "test", "2001:41c8:1:4fd4::2", 123, "/system", NULL, NULL, NULL, NULL);
virURIParam params1[] = {
{ (char*)"foo", (char*)"one" },

12
AF_PACKET.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.11/src/util/virnetdev.c
Index: libvirt-0.9.11.3/src/util/virnetdev.c
===================================================================
--- libvirt-0.9.11.orig/src/util/virnetdev.c
+++ libvirt-0.9.11/src/util/virnetdev.c
--- libvirt-0.9.11.3.orig/src/util/virnetdev.c
+++ libvirt-0.9.11.3/src/util/virnetdev.c
@@ -85,7 +85,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr)
@ -11,10 +11,10 @@ Index: libvirt-0.9.11/src/util/virnetdev.c
}
#endif
Index: libvirt-0.9.11/src/util/virnetdevbridge.c
Index: libvirt-0.9.11.3/src/util/virnetdevbridge.c
===================================================================
--- libvirt-0.9.11.orig/src/util/virnetdevbridge.c
+++ libvirt-0.9.11/src/util/virnetdevbridge.c
--- libvirt-0.9.11.3.orig/src/util/virnetdevbridge.c
+++ libvirt-0.9.11.3/src/util/virnetdevbridge.c
@@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr)

31
install-apparmor-profiles.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.11/examples/apparmor/Makefile.am
Index: libvirt-0.9.11.3/examples/apparmor/Makefile.am
===================================================================
--- libvirt-0.9.11.orig/examples/apparmor/Makefile.am
+++ libvirt-0.9.11/examples/apparmor/Makefile.am
--- libvirt-0.9.11.3.orig/examples/apparmor/Makefile.am
+++ libvirt-0.9.11.3/examples/apparmor/Makefile.am
@@ -1,8 +1,39 @@
## Copyright (C) 2005-2011 Red Hat, Inc.
## See COPYING.LIB for the License of this software
@ -47,10 +47,10 @@ Index: libvirt-0.9.11/examples/apparmor/Makefile.am
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+
+endif
Index: libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
Index: libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
+++ libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@
+# Last Modified: Fri Aug 19 11:21:48 2011
+#include <tunables/global>
@ -92,9 +92,9 @@ Index: libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
Index: libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper
Index: libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
--- libvirt-0.9.11.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
--- libvirt-0.9.11.3.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@ -135,9 +135,9 @@ Index: libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r,
-}
Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd
Index: libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd
===================================================================
--- libvirt-0.9.11.orig/examples/apparmor/usr.sbin.libvirtd
--- libvirt-0.9.11.3.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@ -192,11 +192,11 @@ Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
-
-}
Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in
Index: libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
+++ libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,57 @@
+++ libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,58 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include <tunables/global>
+@{LIBVIRT}="libvirt"
@ -222,6 +222,7 @@ Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in
+ capability mknod,
+ capability fsetid,
+ capability ipc_lock,
+ capability audit_write,
+
+ network inet stream,
+ network inet dgram,
@ -254,10 +255,10 @@ Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
Index: libvirt-0.9.11/examples/apparmor/libvirt-qemu
Index: libvirt-0.9.11.3/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-0.9.11.orig/examples/apparmor/libvirt-qemu
+++ libvirt-0.9.11/examples/apparmor/libvirt-qemu
--- libvirt-0.9.11.3.orig/examples/apparmor/libvirt-qemu
+++ libvirt-0.9.11.3/examples/apparmor/libvirt-qemu
@@ -52,6 +52,7 @@
# access to firmware's etc
/usr/share/kvm/** r,

3
libvirt-0.9.11.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f9a4fd33ee9e88b0dc1431799b583feba0539e224db87e1c4b2c44ddae52afa
size 13800939

3
libvirt-0.9.11.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9db610ea0b23e215aed54c8553e9b219ffe1160bab09cf49eb2351a7bd3966a8
size 13731838

42
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.11/configure.ac
Index: libvirt-0.9.11.3/configure.ac
===================================================================
--- libvirt-0.9.11.orig/configure.ac
+++ libvirt-0.9.11/configure.ac
--- libvirt-0.9.11.3.orig/configure.ac
+++ libvirt-0.9.11.3/configure.ac
@@ -63,6 +63,7 @@ AVAHI_REQUIRED="0.6.0"
POLKIT_REQUIRED="0.6"
PARTED_REQUIRED="1.8.0"
@ -10,7 +10,7 @@ Index: libvirt-0.9.11/configure.ac
UDEV_REQUIRED=145
PCIACCESS_REQUIRED=0.10.0
XMLRPC_REQUIRED=1.14.0
@@ -1716,6 +1717,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
@@ -1741,6 +1742,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
AC_SUBST([NETCF_CFLAGS])
AC_SUBST([NETCF_LIBS])
@ -49,7 +49,7 @@ Index: libvirt-0.9.11/configure.ac
AC_ARG_WITH([secrets],
AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes])
@@ -2660,6 +2693,7 @@ AC_MSG_NOTICE([ Remote: $with_remote])
@@ -2686,6 +2719,7 @@ AC_MSG_NOTICE([ Remote: $with_remote])
AC_MSG_NOTICE([ Network: $with_network])
AC_MSG_NOTICE([Libvirtd: $with_libvirtd])
AC_MSG_NOTICE([ netcf: $with_netcf])
@ -57,7 +57,7 @@ Index: libvirt-0.9.11/configure.ac
AC_MSG_NOTICE([ macvtap: $with_macvtap])
AC_MSG_NOTICE([virtport: $with_virtualport])
AC_MSG_NOTICE([])
@@ -2791,6 +2825,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
@@ -2817,6 +2851,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
else
AC_MSG_NOTICE([ netcf: no])
fi
@ -69,10 +69,10 @@ Index: libvirt-0.9.11/configure.ac
if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then
AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS])
else
Index: libvirt-0.9.11/daemon/Makefile.am
Index: libvirt-0.9.11.3/daemon/Makefile.am
===================================================================
--- libvirt-0.9.11.orig/daemon/Makefile.am
+++ libvirt-0.9.11/daemon/Makefile.am
--- libvirt-0.9.11.3.orig/daemon/Makefile.am
+++ libvirt-0.9.11.3/daemon/Makefile.am
@@ -143,6 +143,10 @@ endif
if WITH_NETCF
@ -84,10 +84,10 @@ Index: libvirt-0.9.11/daemon/Makefile.am
endif
if WITH_NODE_DEVICES
Index: libvirt-0.9.11/daemon/libvirtd.c
Index: libvirt-0.9.11.3/daemon/libvirtd.c
===================================================================
--- libvirt-0.9.11.orig/daemon/libvirtd.c
+++ libvirt-0.9.11/daemon/libvirtd.c
--- libvirt-0.9.11.3.orig/daemon/libvirtd.c
+++ libvirt-0.9.11.3/daemon/libvirtd.c
@@ -76,6 +76,10 @@
# endif
# ifdef WITH_NETCF
@ -110,10 +110,10 @@ Index: libvirt-0.9.11/daemon/libvirtd.c
# endif
# ifdef WITH_STORAGE_DIR
storageRegister();
Index: libvirt-0.9.11/src/Makefile.am
Index: libvirt-0.9.11.3/src/Makefile.am
===================================================================
--- libvirt-0.9.11.orig/src/Makefile.am
+++ libvirt-0.9.11/src/Makefile.am
--- libvirt-0.9.11.3.orig/src/Makefile.am
+++ libvirt-0.9.11.3/src/Makefile.am
@@ -967,6 +967,24 @@ libvirt_driver_interface_la_LIBADD += ..
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
endif
@ -139,10 +139,10 @@ Index: libvirt-0.9.11/src/Makefile.am
endif
if WITH_SECRETS
Index: libvirt-0.9.11/src/interface/netcf_driver.c
Index: libvirt-0.9.11.3/src/interface/netcf_driver.c
===================================================================
--- libvirt-0.9.11.orig/src/interface/netcf_driver.c
+++ libvirt-0.9.11/src/interface/netcf_driver.c
--- libvirt-0.9.11.3.orig/src/interface/netcf_driver.c
+++ libvirt-0.9.11.3/src/interface/netcf_driver.c
@@ -23,7 +23,13 @@
#include <config.h>
@ -208,10 +208,10 @@ Index: libvirt-0.9.11/src/interface/netcf_driver.c
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
Index: libvirt-0.9.11/tools/virsh.c
Index: libvirt-0.9.11.3/tools/virsh.c
===================================================================
--- libvirt-0.9.11.orig/tools/virsh.c
+++ libvirt-0.9.11/tools/virsh.c
--- libvirt-0.9.11.3.orig/tools/virsh.c
+++ libvirt-0.9.11.3/tools/virsh.c
@@ -19821,6 +19821,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
#endif
#ifdef WITH_NETCF

8
libvirt.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 30 16:00:38 MDT 2012 - jfehlig@suse.com
- Add capability 'audit_write' to libvirtd apparmor profile
update install-apparmor-profiles.patch
bnc#764388
- Update to libvirt 0.9.11.3 stable release
-------------------------------------------------------------------
Wed Apr 25 12:26:25 MDT 2012 - jfehlig@suse.com

4
libvirt.spec
View File

@ -327,7 +327,7 @@ BuildRequires: systemd
Name: libvirt
Url: http://libvirt.org/
Version: 0.9.11
Version: 0.9.11.3
Release: 0
Summary: A C toolkit to interact with the virtualization capabilities of Linux
License: LGPL-2.1+
@ -410,7 +410,6 @@ Source1: libvirtd.init
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
Patch0: 4eb1c256-viruri-user.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@ -546,7 +545,6 @@ Authors:
%prep
%setup -q
%patch0 -p1
%patch100 -p1
%patch101
%patch102 -p1

12
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.11/daemon/libvirtd.conf
Index: libvirt-0.9.11.3/daemon/libvirtd.conf
===================================================================
--- libvirt-0.9.11.orig/daemon/libvirtd.conf
+++ libvirt-0.9.11/daemon/libvirtd.conf
--- libvirt-0.9.11.3.orig/daemon/libvirtd.conf
+++ libvirt-0.9.11.3/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@ -13,10 +13,10 @@ Index: libvirt-0.9.11/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-0.9.11/daemon/libvirtd.c
Index: libvirt-0.9.11.3/daemon/libvirtd.c
===================================================================
--- libvirt-0.9.11.orig/daemon/libvirtd.c
+++ libvirt-0.9.11/daemon/libvirtd.c
--- libvirt-0.9.11.3.orig/daemon/libvirtd.c
+++ libvirt-0.9.11.3/daemon/libvirtd.c
@@ -872,7 +872,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}

6
relax-qemu-usergroup-check.patch
View File

@ -7,10 +7,10 @@ drivers as loadable modules instead of built-in to the
daemon. Then the qemu driver would only be loaded when needed,
which would never be the case on a xen-only configuration.
Index: libvirt-0.9.11/src/qemu/qemu_conf.c
Index: libvirt-0.9.11.3/src/qemu/qemu_conf.c
===================================================================
--- libvirt-0.9.11.orig/src/qemu/qemu_conf.c
+++ libvirt-0.9.11/src/qemu/qemu_conf.c
--- libvirt-0.9.11.3.orig/src/qemu/qemu_conf.c
+++ libvirt-0.9.11.3/src/qemu/qemu_conf.c
@@ -271,9 +271,7 @@ int qemudLoadDriverConfig(struct qemud_d
return -1;
}

6
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.11/src/qemu/qemu.conf
Index: libvirt-0.9.11.3/src/qemu/qemu.conf
===================================================================
--- libvirt-0.9.11.orig/src/qemu/qemu.conf
+++ libvirt-0.9.11/src/qemu/qemu.conf
--- libvirt-0.9.11.3.orig/src/qemu/qemu.conf
+++ libvirt-0.9.11.3/src/qemu/qemu.conf
@@ -136,7 +136,16 @@
# leaving SELinux enabled for the host in general, then set this
# to 'none' instead.

45
use-init-script-redhat.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.11/tools/Makefile.am
Index: libvirt-0.9.11.3/tools/Makefile.am
===================================================================
--- libvirt-0.9.11.orig/tools/Makefile.am
+++ libvirt-0.9.11/tools/Makefile.am
--- libvirt-0.9.11.3.orig/tools/Makefile.am
+++ libvirt-0.9.11.3/tools/Makefile.am
@@ -182,24 +182,22 @@ install-data-local: install-init install
uninstall-local: uninstall-init uninstall-systemd
@ -33,10 +33,10 @@ Index: libvirt-0.9.11/tools/Makefile.am
if LIBVIRT_INIT_SCRIPT_RED_HAT
Index: libvirt-0.9.11/tools/libvirt-guests.sysconf
Index: libvirt-0.9.11.3/tools/libvirt-guests.sysconf
===================================================================
--- libvirt-0.9.11.orig/tools/libvirt-guests.sysconf
+++ libvirt-0.9.11/tools/libvirt-guests.sysconf
--- libvirt-0.9.11.3.orig/tools/libvirt-guests.sysconf
+++ libvirt-0.9.11.3/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt
+
@ -101,10 +101,10 @@ Index: libvirt-0.9.11/tools/libvirt-guests.sysconf
# some file systems.
-#BYPASS_CACHE=0
+BYPASS_CACHE=0
Index: libvirt-0.9.11/tools/libvirt-guests.init.sh
Index: libvirt-0.9.11.3/tools/libvirt-guests.init.sh
===================================================================
--- libvirt-0.9.11.orig/tools/libvirt-guests.init.sh
+++ libvirt-0.9.11/tools/libvirt-guests.init.sh
--- libvirt-0.9.11.3.orig/tools/libvirt-guests.init.sh
+++ libvirt-0.9.11.3/tools/libvirt-guests.init.sh
@@ -4,10 +4,10 @@
#
### BEGIN INIT INFO
@ -252,11 +252,11 @@ Index: libvirt-0.9.11/tools/libvirt-guests.init.sh
esac
-exit $RETVAL
+rc_exit
Index: libvirt-0.9.11/daemon/Makefile.am
Index: libvirt-0.9.11.3/daemon/Makefile.am
===================================================================
--- libvirt-0.9.11.orig/daemon/Makefile.am
+++ libvirt-0.9.11/daemon/Makefile.am
@@ -249,34 +249,23 @@ uninstall-logrotate:
--- libvirt-0.9.11.3.orig/daemon/Makefile.am
+++ libvirt-0.9.11.3/daemon/Makefile.am
@@ -249,22 +249,16 @@ uninstall-logrotate:
rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
install-sysconfig:
@ -265,39 +265,42 @@ Index: libvirt-0.9.11/daemon/Makefile.am
$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
+
uninstall-sysconfig:
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+ rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
if WITH_SYSCTL
install-sysctl:
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d
- $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
- $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
-
uninstall-sysctl:
- rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
- rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || :
if LIBVIRT_INIT_SCRIPT_RED_HAT
else
install-sysctl:
uninstall-sysctl:
@@ -275,13 +269,7 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT
BUILT_SOURCES += libvirtd.init
install-init-redhat: install-sysconfig libvirtd.init
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
- $(INSTALL_SCRIPT) libvirtd.init \
- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
-
uninstall-init-redhat: uninstall-sysconfig
- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
- rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
else
install-init-redhat:
uninstall-init-redhat:
Index: libvirt-0.9.11/daemon/libvirtd.sysconf
Index: libvirt-0.9.11.3/daemon/libvirtd.sysconf
===================================================================
--- libvirt-0.9.11.orig/daemon/libvirtd.sysconf
+++ libvirt-0.9.11/daemon/libvirtd.sysconf
--- libvirt-0.9.11.3.orig/daemon/libvirtd.sysconf
+++ libvirt-0.9.11.3/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+

18
xen-name-for-devid.patch
View File

@ -13,10 +13,10 @@ Date: Wed Jan 27 16:11:41 2010 -0700
This approach allows removing a disk when domain is inactive. We
obviously can't search xenstore when the domain is inactive.
Index: libvirt-0.9.11/src/xen/xend_internal.c
Index: libvirt-0.9.11.3/src/xen/xend_internal.c
===================================================================
--- libvirt-0.9.11.orig/src/xen/xend_internal.c
+++ libvirt-0.9.11/src/xen/xend_internal.c
--- libvirt-0.9.11.3.orig/src/xen/xend_internal.c
+++ libvirt-0.9.11.3/src/xen/xend_internal.c
@@ -60,6 +60,7 @@
static int
@ -25,7 +25,7 @@ Index: libvirt-0.9.11/src/xen/xend_internal.c
virDomainDeviceDefPtr dev,
char *class,
char *ref,
@@ -2752,7 +2753,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
@@ -2757,7 +2758,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf);
@ -34,7 +34,7 @@ Index: libvirt-0.9.11/src/xen/xend_internal.c
/* device doesn't exist, define it */
ret = xend_op(domain->conn, domain->name, "op", "device_create",
"config", sexpr, NULL);
@@ -2873,7 +2874,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
@@ -2878,7 +2879,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf);
@ -43,7 +43,7 @@ Index: libvirt-0.9.11/src/xen/xend_internal.c
virXendError(VIR_ERR_OPERATION_INVALID, "%s",
_("requested device does not exist"));
goto cleanup;
@@ -2968,7 +2969,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
@@ -2973,7 +2974,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
def, xml, VIR_DOMAIN_XML_INACTIVE)))
goto cleanup;
@ -52,7 +52,7 @@ Index: libvirt-0.9.11/src/xen/xend_internal.c
goto cleanup;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
@@ -3914,6 +3915,7 @@ struct xenUnifiedDriver xenDaemonDriver
@@ -3919,6 +3920,7 @@ struct xenUnifiedDriver xenDaemonDriver
*/
static int
virDomainXMLDevID(virDomainPtr domain,
@ -60,7 +60,7 @@ Index: libvirt-0.9.11/src/xen/xend_internal.c
virDomainDeviceDefPtr dev,
char *class,
char *ref,
@@ -3922,8 +3924,12 @@ virDomainXMLDevID(virDomainPtr domain,
@@ -3927,8 +3929,12 @@ virDomainXMLDevID(virDomainPtr domain,
xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *xref;
char *tmp;
@ -73,7 +73,7 @@ Index: libvirt-0.9.11/src/xen/xend_internal.c
if (dev->data.disk->driverName &&
STREQ(dev->data.disk->driverName, "tap"))
strcpy(class, "tap");
@@ -3933,19 +3939,21 @@ virDomainXMLDevID(virDomainPtr domain,
@@ -3938,19 +3944,21 @@ virDomainXMLDevID(virDomainPtr domain,
else
strcpy(class, "vbd");

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.11/src/xenxs/xen_sxpr.c
Index: libvirt-0.9.11.3/src/xenxs/xen_sxpr.c
===================================================================
--- libvirt-0.9.11.orig/src/xenxs/xen_sxpr.c
+++ libvirt-0.9.11/src/xenxs/xen_sxpr.c
--- libvirt-0.9.11.3.orig/src/xenxs/xen_sxpr.c
+++ libvirt-0.9.11.3/src/xenxs/xen_sxpr.c
@@ -340,7 +340,7 @@ error:
static int
xenParseSxprDisks(virDomainDefPtr def,