rpms/libvirt/devel libvirt-0.2.2-bridge-init.patch, NONE, 1.1 libvirt-0.2.2-qemu-noreboot.patch, 1.1, 1.2 libvirt.spec, 1.54, 1.55

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv417

Modified Files:
	libvirt-0.2.2-qemu-noreboot.patch libvirt.spec 
Added Files:
	libvirt-0.2.2-bridge-init.patch 
Log Message:
Fixed stack overflow. Fixed bridge network when no virtual net is running

libvirt-0.2.2-bridge-init.patch:

--- NEW FILE libvirt-0.2.2-bridge-init.patch ---
diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
--- libvirt-0.2.2/qemud/conf.c	2007-05-14 10:38:52.000000000 -0400
+++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:38:34.000000000 -0400
@@ -1151,6 +1151,12 @@ qemudNetworkIfaceConnect(struct qemud_se
         goto error;
     }
 
+    if (!server->brctl && (err = brInit(&server->brctl))) {
+        qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
+                         "cannot initialize bridge support: %s", strerror(err));
+        goto error;
+    }
+
     if ((err = brAddTap(server->brctl, brname,
                         ifname, BR_IFNAME_MAXLEN, &tapfd))) {
         qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
Only in libvirt-0.2.2.new/qemud: conf.c.orig

libvirt-0.2.2-qemu-noreboot.patch:

Index: libvirt-0.2.2-qemu-noreboot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.2.2-qemu-noreboot.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libvirt-0.2.2-qemu-noreboot.patch	4 May 2007 14:18:11 -0000	1.1
+++ libvirt-0.2.2-qemu-noreboot.patch	14 May 2007 15:38:15 -0000	1.2
@@ -1,13 +1,14 @@
 diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
 --- libvirt-0.2.2/qemud/conf.c	2007-04-17 04:34:42.000000000 -0400
-+++ libvirt-0.2.2.new/qemud/conf.c	2007-05-01 18:16:46.000000000 -0400
++++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:36:12.000000000 -0400
 @@ -245,21 +245,25 @@ static int qemudExtractVersionInfo(const
      cleanup1:
          _exit(-1); /* Just in case */
      } else { /* Parent */
 -        char help[4096]; /* Ought to be enough to hold QEMU help screen */
+-        int got, ret = -1;
 +        char help[8192]; /* Ought to be enough to hold QEMU help screen */
-         int got, ret = -1;
++        int got = 0, ret = -1;
          int major, minor, micro;
  
          if (close(newstdout[1]) < 0)
@@ -107,7 +108,7 @@
          goto no_memory;
 diff -rup libvirt-0.2.2/qemud/internal.h libvirt-0.2.2.new/qemud/internal.h
 --- libvirt-0.2.2/qemud/internal.h	2007-04-11 10:13:36.000000000 -0400
-+++ libvirt-0.2.2.new/qemud/internal.h	2007-05-01 17:53:42.000000000 -0400
++++ libvirt-0.2.2.new/qemud/internal.h	2007-05-14 10:36:02.000000000 -0400
 @@ -161,6 +161,7 @@ enum qemud_vm_grapics_type {
  enum qemud_cmd_flags {
      QEMUD_CMD_FLAG_KQEMU = 1,
@@ -125,4 +126,3 @@
      struct qemud_vm_os_def os;
  
      int features;
-Only in libvirt-0.2.2.new/qemud: libvirt-0.2.2-qemu-noreboot.patch


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libvirt.spec	4 May 2007 14:18:11 -0000	1.54
+++ libvirt.spec	14 May 2007 15:38:15 -0000	1.55
@@ -9,7 +9,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.2.2
-Release: 3%{?_extra_release}
+Release: 4%{?_extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -18,6 +18,7 @@
 Patch3: libvirt-0.2.2-qemu-noreboot.patch
 Patch4: libvirt-0.2.2-sync-daemon-restart.patch
 Patch5: libvirt-0.2.2-graphics-hvm.patch
+Patch6: libvirt-0.2.2-bridge-init.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -69,6 +70,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid
@@ -180,6 +182,10 @@
 %doc docs/examples/python
 
 %changelog
+* Mon May 14 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.2-4.fc7
+- Fixed uninitialized value causing stack overflow
+- Fixed bridged networking when no virtual network is defined (bz 239273)
+
 * Thu May  3 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.2-3.fc7
 - Fixed init script restart race
 - Remove duplicate <graphics> tag for HVM