OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=17

clone.patch

@@ -1,7 +1,7 @@
-Index: src/lxc_container.c
+Index: src/lxc/lxc_container.c
 ===================================================================
---- src/lxc_container.c.orig
+--- src/lxc/lxc_container.c.orig
-+++ src/lxc_container.c
++++ src/lxc/lxc_container.c
 @@ -796,6 +796,9 @@ int lxcContainerStart(virDomainDefPtr de
      lxc_child_argv_t args = { def, nveths, veths, control, ttyPath };
  

detach-disk.patch

@@ -1,7 +1,7 @@
-Index: libvirt-0.7.1/src/xend_internal.c
+Index: libvirt-0.7.1/src/xen/xend_internal.c
 ===================================================================
---- libvirt-0.7.1.orig/src/xend_internal.c
+--- libvirt-0.7.1.orig/src/xen/xend_internal.c
-+++ libvirt-0.7.1/src/xend_internal.c
++++ libvirt-0.7.1/src/xen/xend_internal.c
 @@ -5877,7 +5877,7 @@ virDomainXMLDevID(virDomainPtr domain,
              return -1;
          xenUnifiedLock(priv);
@@ -11,10 +11,10 @@ Index: libvirt-0.7.1/src/xend_internal.c
          xenUnifiedUnlock(priv);
          if (xref == NULL)
              return -1;
-Index: libvirt-0.7.1/src/xs_internal.c
+Index: libvirt-0.7.1/src/xen/xs_internal.c
 ===================================================================
---- libvirt-0.7.1.orig/src/xs_internal.c
+--- libvirt-0.7.1.orig/src/xen/xs_internal.c
-+++ libvirt-0.7.1/src/xs_internal.c
++++ libvirt-0.7.1/src/xen/xs_internal.c
 @@ -966,7 +966,8 @@ xenStoreDomainGetNetworkID(virConnectPtr
   *         freed by the caller.
   */
@@ -34,10 +34,10 @@ Index: libvirt-0.7.1/src/xs_internal.c
      list = xs_directory(priv->xshandle, 0, dir, &num);
      if (list != NULL) {
          for (i = 0; i < num; i++) {
-Index: libvirt-0.7.1/src/xs_internal.h
+Index: libvirt-0.7.1/src/xen/xs_internal.h
 ===================================================================
---- libvirt-0.7.1.orig/src/xs_internal.h
+--- libvirt-0.7.1.orig/src/xen/xs_internal.h
-+++ libvirt-0.7.1/src/xs_internal.h
++++ libvirt-0.7.1/src/xen/xs_internal.h
 @@ -49,7 +49,8 @@ char *		xenStoreDomainGetNetworkID(virCo
                                           const char *mac);
  char *		xenStoreDomainGetDiskID(virConnectPtr conn,

fs-ocfs2.patch

@@ -1,7 +1,7 @@
-Index: libvirt-0.7.1/src/storage_conf.c
+Index: libvirt-0.7.1/src/conf/storage_conf.c
 ===================================================================
---- libvirt-0.7.1.orig/src/storage_conf.c
+--- libvirt-0.7.1.orig/src/conf/storage_conf.c
-+++ libvirt-0.7.1/src/storage_conf.c
++++ libvirt-0.7.1/src/conf/storage_conf.c
 @@ -59,7 +59,7 @@ VIR_ENUM_IMPL(virStoragePoolFormatFileSy
                VIR_STORAGE_POOL_FS_LAST,
                "auto", "ext2", "ext3",
@@ -11,10 +11,10 @@ Index: libvirt-0.7.1/src/storage_conf.c
  
  VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet,
                VIR_STORAGE_POOL_NETFS_LAST,
-Index: libvirt-0.7.1/src/storage_conf.h
+Index: libvirt-0.7.1/src/conf/storage_conf.h
 ===================================================================
---- libvirt-0.7.1.orig/src/storage_conf.h
+--- libvirt-0.7.1.orig/src/conf/storage_conf.h
-+++ libvirt-0.7.1/src/storage_conf.h
++++ libvirt-0.7.1/src/conf/storage_conf.h
 @@ -395,6 +395,7 @@ enum virStoragePoolFormatFileSystem {
      VIR_STORAGE_POOL_FS_VFAT,
      VIR_STORAGE_POOL_FS_HFSPLUS,

libvirt-0.7.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8edde9577fbf0e90d0b33d4b328a79c51cc821c78a4c04b101007c1d6eed1909
-size 5440029

libvirt-0.7.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:311817f34ace89ee44b09a4d4854bbc3a5c0567bf9a8e8a6772c494432f94b33
+size 5563880

libvirt.spec

@@ -35,7 +35,7 @@
 %endif
 
 Name:           libvirt
-BuildRequires:  bridge-utils cyrus-sasl-devel device-mapper-devel fdupes gettext gnutls-devel hal-devel iptables-devel libxml2-devel lvm2 ncurses-devel parted-devel pkg-config python-devel readline-devel util-linux xhtml-dtd
+BuildRequires:  bridge-utils cyrus-sasl-devel device-mapper-devel fdupes gettext gnutls-devel hal-devel iptables-devel libxml2-devel lvm2 ncurses-devel parted-devel pkg-config python-devel python-xml readline-devel util-linux xhtml-dtd
 %if %{with_xen}
 BuildRequires:  xen-devel
 %endif
@@ -64,7 +64,7 @@ Url:            http://libvirt.org/
 License:        LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    yes
-Version:        0.7.1
+Version:        0.7.2
 Release:        3
 Summary:        A C toolkit to interract with the virtualization capabilities of Linux
 Requires:       readline
@@ -92,10 +92,7 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        libvirtd.init
 # Upstream patches
 Patch0:         devmap-no-pkgconfig.patch
-Patch1:         xen-refcnt.patch
+Patch1:         fs-ocfs2.patch
-Patch2:         vshdeinit-recurse.patch
-Patch3:         msg-proc-memleak.patch
-Patch4:         fs-ocfs2.patch
 # Need to go upstream
 Patch100:       socat.patch
 Patch101:       clone.patch
@@ -105,7 +102,7 @@ Patch104:       detach-disk.patch
 # Our patches
 Patch200:       libvirtd-defaults.patch
 Patch201:       suse-network.patch
-Patch202:       snapshots.patch
+#BFRPatch202:       snapshots.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -199,9 +196,6 @@ Authors:
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 %patch100 -p1
 %patch101 
 %patch102 -p1
@@ -209,7 +203,7 @@ Authors:
 %patch104 -p1
 %patch200 -p1
 %patch201 -p1
-%patch202 -p1
+#BFR%patch202 -p1
 
 %build
 %if ! %{with_xen}
@@ -231,6 +225,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
            --with-init-script=none \
            --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \
            --with-xen-proxy=no \
+           --with-selinux=no \
            ac_cv_path_DNSMASQ=/usr/sbin/dnsmasq \
            ac_cv_path_QEMU_IMG=/usr/bin/qemu-img-xen \
            ac_cv_path_ISCSIADM=/sbin/iscsiadm \
@@ -249,7 +244,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@latin
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/libvirt
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/{*.c,examples.x*}
 rm $RPM_BUILD_ROOT%{_libdir}/*.*a $RPM_BUILD_ROOT%{py_sitedir}/*.*a
 ln_dupes()
 {
@@ -290,12 +284,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_bindir}/virsh
 %{_bindir}/virt-xml-validate
+%{_bindir}/virt-pki-validate
 %{_sbindir}/libvirtd
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/[CNRT]*
 %doc %{_docdir}/%{name}/AUTHORS
 %doc %{_mandir}/man1/virsh.1*
 %doc %{_mandir}/man1/virt-xml-validate.1*
+%doc %{_mandir}/man1/virt-pki-validate.1*
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
 %if 0%{?suse_version} > 1030
@@ -308,6 +304,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%if %{with_lxc}
+%config %{_sysconfdir}/libvirt/lxc.conf
+%endif
 %config %{_sysconfdir}/libvirt/qemu/networks/default.xml
 %config %{_sysconfdir}/logrotate.d/libvirtd
 %dir /%{_localstatedir}/run/libvirt/
@@ -334,7 +333,6 @@ rm -rf $RPM_BUILD_ROOT
 %files doc
 %defattr(-, root, root)
 %{_datadir}/gtk-doc/html/libvirt
-%doc %{_docdir}/%{name}/*.gif
 %doc %{_docdir}/%{name}/*.png
 %doc %{_docdir}/%{name}/*.html
 %doc %{_docdir}/%{name}/html

libvirtd-defaults.patch

@@ -1,7 +1,7 @@
-Index: libvirt-0.7.1/qemud/libvirtd.conf
+Index: libvirt-0.7.1/daemon/libvirtd.conf
 ===================================================================
---- libvirt-0.7.1.orig/qemud/libvirtd.conf
+--- libvirt-0.7.1.orig/daemon/libvirtd.conf
-+++ libvirt-0.7.1/qemud/libvirtd.conf
++++ libvirt-0.7.1/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.7.1/qemud/libvirtd.conf
  
  # Override the default mDNS advertizement name. This must be
  # unique on the immediate broadcast network.
-Index: libvirt-0.7.1/qemud/qemud.c
+Index: libvirt-0.7.1/daemon/libvirtd.c
 ===================================================================
---- libvirt-0.7.1.orig/qemud/qemud.c
+--- libvirt-0.7.1.orig/daemon/libvirtd.c
-+++ libvirt-0.7.1/qemud/qemud.c
++++ libvirt-0.7.1/daemon/libvirtd.c
 @@ -134,7 +134,7 @@ static int sigwrite = -1;       /* Signa
  static int ipsock = 0;          /* -l  Listen for TCP/IP */
  

migrate-params.patch

@@ -1,7 +1,7 @@
-Index: libvirt-0.6.5/src/xend_internal.c
+Index: libvirt-0.6.5/src/xen/xend_internal.c
 ===================================================================
---- libvirt-0.6.5.orig/src/xend_internal.c
+--- libvirt-0.6.5.orig/src/xen/xend_internal.c
-+++ libvirt-0.6.5/src/xend_internal.c
++++ libvirt-0.6.5/src/xen/xend_internal.c
 @@ -4480,6 +4480,8 @@ xenDaemonDomainMigratePerform (virDomain
                     "node", "-1",
                     "ssl", "0",

msg-proc-memleak.patch

@@ -1,48 +0,0 @@
-Index: libvirt-0.7.1/qemud/dispatch.c
-===================================================================
---- libvirt-0.7.1.orig/qemud/dispatch.c
-+++ libvirt-0.7.1/qemud/dispatch.c
-@@ -191,6 +191,7 @@ remoteSerializeError(struct qemud_client
- 
- xdr_error:
-     xdr_destroy(&xdr);
-+    VIR_FREE(msg);
- fatal_error:
-     xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
-     return -1;
-@@ -336,6 +337,7 @@ remoteDispatchClientRequest (struct qemu
-                              struct qemud_client *client,
-                              struct qemud_client_message *msg)
- {
-+    int ret;
-     remote_error rerr;
- 
-     memset(&rerr, 0, sizeof rerr);
-@@ -364,7 +366,12 @@ remoteDispatchClientRequest (struct qemu
-     }
- 
- error:
--    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
-+    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
-+
-+    if (ret >= 0)
-+        VIR_FREE(msg);
-+
-+    return ret;
- }
- 
- 
-@@ -521,8 +528,12 @@ remoteDispatchClientCall (struct qemud_s
- rpc_error:
-     /* Semi-bad stuff happened, we can still try to send back
-      * an RPC error message to client */
--    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
-+    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
-+
-+    if (rv >= 0)
-+        VIR_FREE(msg);
- 
-+    return rv;
- 
- xdr_error:
-     /* Seriously bad stuff happened, so we'll kill off this client

socat.patch

@@ -1,7 +1,7 @@
-Index: libvirt-0.7.1/src/remote_internal.c
+Index: libvirt-0.7.1/src/remote/remote_driver.c
 ===================================================================
---- libvirt-0.7.1.orig/src/remote_internal.c
+--- libvirt-0.7.1.orig/src/remote/remote_driver.c
-+++ libvirt-0.7.1/src/remote_internal.c
++++ libvirt-0.7.1/src/remote/remote_driver.c
 @@ -728,12 +728,29 @@ doRemoteOpen (virConnectPtr conn,
              cmd_argv[j++] = strdup ("none");
          }

suse-network.patch

@@ -1,7 +1,7 @@
-Index: libvirt-0.7.1/src/network_conf.c
+Index: libvirt-0.7.1/src/conf/network_conf.c
 ===================================================================
---- libvirt-0.7.1.orig/src/network_conf.c
+--- libvirt-0.7.1.orig/src/conf/network_conf.c
-+++ libvirt-0.7.1/src/network_conf.c
++++ libvirt-0.7.1/src/conf/network_conf.c
 @@ -770,6 +770,137 @@ error:
      return NULL;
  }
@@ -148,10 +148,10 @@ Index: libvirt-0.7.1/src/network_conf.c
      return 0;
  }
  
-Index: libvirt-0.7.1/src/network_conf.h
+Index: libvirt-0.7.1/src/conf/network_conf.h
 ===================================================================
---- libvirt-0.7.1.orig/src/network_conf.h
+--- libvirt-0.7.1.orig/src/conf/network_conf.h
-+++ libvirt-0.7.1/src/network_conf.h
++++ libvirt-0.7.1/src/conf/network_conf.h
 @@ -89,6 +89,7 @@ struct _virNetworkObj {
      unsigned int active : 1;
      unsigned int autostart : 1;
@@ -160,10 +160,10 @@ Index: libvirt-0.7.1/src/network_conf.h
  
      virNetworkDefPtr def; /* The current definition */
      virNetworkDefPtr newDef; /* New definition to activate at shutdown */
-Index: libvirt-0.7.1/src/network_driver.c
+Index: libvirt-0.7.1/src/network/bridge_driver.c
 ===================================================================
---- libvirt-0.7.1.orig/src/network_driver.c
+--- libvirt-0.7.1.orig/src/network/bridge_driver.c
-+++ libvirt-0.7.1/src/network_driver.c
++++ libvirt-0.7.1/src/network/bridge_driver.c
 @@ -963,6 +963,11 @@ static int networkShutdownNetworkDaemon(
      unlink(stateFile);
      VIR_FREE(stateFile);

xen-pv-cdrom.patch

@@ -1,7 +1,7 @@
-Index: libvirt-0.7.1/src/xend_internal.c
+Index: libvirt-0.7.1/src/xen/xend_internal.c
 ===================================================================
---- libvirt-0.7.1.orig/src/xend_internal.c
+--- libvirt-0.7.1.orig/src/xen/xend_internal.c
-+++ libvirt-0.7.1/src/xend_internal.c
++++ libvirt-0.7.1/src/xen/xend_internal.c
 @@ -5306,7 +5306,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co
      } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
          virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst);

xen-refcnt.patch

@@ -1,41 +0,0 @@
-Index: libvirt-0.7.1/src/xen_inotify.c
-===================================================================
---- libvirt-0.7.1.orig/src/xen_inotify.c
-+++ libvirt-0.7.1/src/xen_inotify.c
-@@ -463,7 +463,6 @@ xenInotifyOpen(virConnectPtr conn ATTRIB
-         DEBUG0("Failed to add inotify handle, disabling events");
-     }
- 
--    virConnectRef(conn);
-     return 0;
- }
- 
-@@ -486,7 +485,6 @@ xenInotifyClose(virConnectPtr conn)
-     if (priv->inotifyWatch != -1)
-         virEventRemoveHandle(priv->inotifyWatch);
-     close(priv->inotifyFD);
--    virUnrefConnect(conn);
- 
-     return 0;
- }
-Index: libvirt-0.7.1/src/xs_internal.c
-===================================================================
---- libvirt-0.7.1.orig/src/xs_internal.c
-+++ libvirt-0.7.1/src/xs_internal.c
-@@ -1139,8 +1139,6 @@ int xenStoreAddWatch(virConnectPtr conn,
-     list->watches[n] = watch;
-     list->count++;
- 
--    conn->refs++;
--
-     return xs_watch(priv->xshandle, watch->path, watch->token);
- }
- 
-@@ -1190,7 +1188,6 @@ int xenStoreRemoveWatch(virConnectPtr co
-                 ; /* Failure to reduce memory allocation isn't fatal */
-             }
-             list->count--;
--            virUnrefConnect(conn);
-             return 0;
-         }
-     }