refresh some patches

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=163
This commit is contained in:
James Fehlig 2011-09-29 21:16:44 +00:00 committed by Git OBS Bridge
parent 5a72ff014a
commit ccfcfc25f2
2 changed files with 25 additions and 25 deletions

View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.5/configure.ac
Index: libvirt-0.9.6/configure.ac
===================================================================
--- libvirt-0.9.5.orig/configure.ac
+++ libvirt-0.9.5/configure.ac
--- libvirt-0.9.6.orig/configure.ac
+++ libvirt-0.9.6/configure.ac
@@ -63,6 +63,7 @@ AVAHI_REQUIRED="0.6.0"
POLKIT_REQUIRED="0.6"
PARTED_REQUIRED="1.8.0"
@ -69,10 +69,10 @@ Index: libvirt-0.9.5/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.5/daemon/Makefile.am
Index: libvirt-0.9.6/daemon/Makefile.am
===================================================================
--- libvirt-0.9.5.orig/daemon/Makefile.am
+++ libvirt-0.9.5/daemon/Makefile.am
--- libvirt-0.9.6.orig/daemon/Makefile.am
+++ libvirt-0.9.6/daemon/Makefile.am
@@ -141,6 +141,10 @@ endif
if WITH_NETCF
@ -84,10 +84,10 @@ Index: libvirt-0.9.5/daemon/Makefile.am
endif
if WITH_NODE_DEVICES
Index: libvirt-0.9.5/daemon/libvirtd.c
Index: libvirt-0.9.6/daemon/libvirtd.c
===================================================================
--- libvirt-0.9.5.orig/daemon/libvirtd.c
+++ libvirt-0.9.5/daemon/libvirtd.c
--- libvirt-0.9.6.orig/daemon/libvirtd.c
+++ libvirt-0.9.6/daemon/libvirtd.c
@@ -75,6 +75,10 @@
# endif
# ifdef WITH_NETCF
@ -110,10 +110,10 @@ Index: libvirt-0.9.5/daemon/libvirtd.c
# endif
# ifdef WITH_STORAGE_DIR
storageRegister();
Index: libvirt-0.9.5/src/Makefile.am
Index: libvirt-0.9.6/src/Makefile.am
===================================================================
--- libvirt-0.9.5.orig/src/Makefile.am
+++ libvirt-0.9.5/src/Makefile.am
--- libvirt-0.9.6.orig/src/Makefile.am
+++ libvirt-0.9.6/src/Makefile.am
@@ -923,6 +923,24 @@ libvirt_driver_interface_la_LIBADD += ..
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
endif
@ -139,10 +139,10 @@ Index: libvirt-0.9.5/src/Makefile.am
endif
if WITH_SECRETS
Index: libvirt-0.9.5/src/interface/netcf_driver.c
Index: libvirt-0.9.6/src/interface/netcf_driver.c
===================================================================
--- libvirt-0.9.5.orig/src/interface/netcf_driver.c
+++ libvirt-0.9.5/src/interface/netcf_driver.c
--- libvirt-0.9.6.orig/src/interface/netcf_driver.c
+++ libvirt-0.9.6/src/interface/netcf_driver.c
@@ -23,7 +23,13 @@
#include <config.h>
@ -208,11 +208,11 @@ Index: libvirt-0.9.5/src/interface/netcf_driver.c
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
Index: libvirt-0.9.5/tools/virsh.c
Index: libvirt-0.9.6/tools/virsh.c
===================================================================
--- libvirt-0.9.5.orig/tools/virsh.c
+++ libvirt-0.9.5/tools/virsh.c
@@ -16001,6 +16001,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
--- libvirt-0.9.6.orig/tools/virsh.c
+++ libvirt-0.9.6/tools/virsh.c
@@ -16011,6 +16011,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
#endif
#ifdef WITH_NETCF
vshPrint(ctl, " Netcf");

View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.5/daemon/libvirtd.conf
Index: libvirt-0.9.6/daemon/libvirtd.conf
===================================================================
--- libvirt-0.9.5.orig/daemon/libvirtd.conf
+++ libvirt-0.9.5/daemon/libvirtd.conf
--- libvirt-0.9.6.orig/daemon/libvirtd.conf
+++ libvirt-0.9.6/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@ -28,10 +28,10 @@ Index: libvirt-0.9.5/daemon/libvirtd.conf
# Override the default mDNS advertizement name. This must be
# unique on the immediate broadcast network.
Index: libvirt-0.9.5/daemon/libvirtd.c
Index: libvirt-0.9.6/daemon/libvirtd.c
===================================================================
--- libvirt-0.9.5.orig/daemon/libvirtd.c
+++ libvirt-0.9.5/daemon/libvirtd.c
--- libvirt-0.9.6.orig/daemon/libvirtd.c
+++ libvirt-0.9.6/daemon/libvirtd.c
@@ -846,7 +846,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}