rpms/libvirt/devel libvirt-0.6.4-svirt-sound.patch, 1.1, 1.2 libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch, 1.1, 1.2 libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch, 1.1, 1.2 libvirt-0.7.0-numa-ignore-fail.patch, 1.1, 1.2 libvirt-0.7.0-policy-kit-rewrite.patch, 1.1, 1.2 libvirt.spec, 1.169, 1.170

Mark McLoughlin markmc at fedoraproject.org
Mon Aug 17 08:08:48 UTC 2009 

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20576

Modified Files:
	libvirt-0.6.4-svirt-sound.patch 
	libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch 
	libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch 
	libvirt-0.7.0-numa-ignore-fail.patch 
	libvirt-0.7.0-policy-kit-rewrite.patch libvirt.spec 
Log Message:
Sync patches from git


libvirt-0.6.4-svirt-sound.patch:
 qemu_conf.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: libvirt-0.6.4-svirt-sound.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.6.4-svirt-sound.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.6.4-svirt-sound.patch	29 May 2009 17:28:28 -0000	1.1
+++ libvirt-0.6.4-svirt-sound.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,6 +1,21 @@
---- src/qemu_conf.c.orig	2009-05-29 19:24:59.000000000 +0200
-+++ src/qemu_conf.c	2009-05-29 19:19:39.000000000 +0200
-@@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr 
+From f9355301cf4dda452308b616e8c00e59be5aec0a Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 17 Aug 2009 08:32:08 +0100
+Subject: [PATCH] Disable sound cards when running sVirt
+
+Temporary hack till PulseAudio autostart problems are sorted out when
+SELinux enforcing (bz 486112)
+
+Fedora-patch: libvirt-0.6.4-svirt-sound.patch
+---
+ src/qemu_conf.c |   17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 6b0b404..53186e0 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -1384,6 +1384,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
      char uuid[VIR_UUID_STRING_BUFLEN];
      char domid[50];
      const char *cpu = NULL;
@@ -10,7 +25,7 @@
 +        driver->securityDriver->name &&
 +        STREQ(driver->securityDriver->name, "selinux") &&
 +        getuid() == 0) {
-+        static int soundWarned = 0; 
++        static int soundWarned = 0;
 +        skipSound = 1;
 +        if (def->nsounds &&
 +            !soundWarned) {
@@ -21,7 +36,7 @@
  
      uname_normalize(&ut);
  
-@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr 
+@@ -2015,7 +2029,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
      }
  
      /* Add sound hardware */
@@ -31,3 +46,6 @@
          int size = 100;
          char *modstr;
          if (VIR_ALLOC_N(modstr, size+1) < 0)
+-- 
+1.6.2.5
+

libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch:
 qemu_driver.c |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Index: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch	6 Aug 2009 15:01:49 -0000	1.1
+++ libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,4 +1,6 @@
+From 541cfdf5465ac3bba2c0c0901950547bc6638e47 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
+Date: Thu, 6 Aug 2009 15:14:19 +0100
 Subject: [PATCH] chown kernel/initrd before spawning qemu
 
 If we're running qemu unprivileged, we need to chown any supplied kernel
@@ -8,6 +10,10 @@ or initrd before spawning it.
   qemuDomainSetFileOwnership(), pass it a path string instead of a disk
   definition and use it for chowning the kernel/initrd in
   qemuDomainSetAllDeviceOwnership()
+
+(cherry picked from commit c42b39784534930791d1feb3de859d85a7848168)
+
+Fedora-patch: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
 ---
  src/qemu_driver.c |   20 ++++++++++++--------
  1 files changed, 12 insertions(+), 8 deletions(-)

libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch:
 network_driver.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch	10 Aug 2009 10:24:12 -0000	1.1
+++ libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,4 +1,6 @@
+From ddf0a7cb04debe60825d11186e68cc6de6fd1dd2 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
+Date: Mon, 10 Aug 2009 11:16:37 +0100
 Subject: [PATCH] Handle kernels with no ipv6 support
 
 If the ipv6 kernel module is not loaded, then we get this when starting
@@ -13,6 +15,10 @@ way.
 
 * src/network_driver.c: make networkDisableIPV6() not fail if the kernel
   has no ipv6 support
+
+(cherry picked from commit f5a8f969dd92ec2744e1eec5d35288d5fbcded22)
+
+Fedora-patch: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
 ---
  src/network_driver.c |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)

libvirt-0.7.0-numa-ignore-fail.patch:
 capabilities.c |    1 +
 lxc_conf.c     |   12 ++++++++++--
 uml_conf.c     |   12 +++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

Index: libvirt-0.7.0-numa-ignore-fail.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-numa-ignore-fail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-numa-ignore-fail.patch	13 Aug 2009 15:30:19 -0000	1.1
+++ libvirt-0.7.0-numa-ignore-fail.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,16 +1,24 @@
-commit 19bac57b26c2d46ac8a7601158f210f34acdceac
-Author: Daniel P. Berrange <berrange at redhat.com>
-Date:   Thu Aug 13 11:56:31 2009 +0100
-
-    Make LXC / UML drivers robust against NUMA topology brokenness
-    
-    Some kernel versions expose broken NUMA topology for some machines.
-    This causes the LXC/UML drivers to fail to start. QEMU driver was
-    already fixed for this problem
-    
-    * src/lxc_conf.c: Log and ignore failure to populate NUMA info
-    * src/uml_conf.c: Log and ignore failure to populate NUMA info
-    * src/capabilities.c: Reset nnumaCell to 0 after freeing
+From 663bf081dc6737c7fcc68a7ca1169aca60fbf8e5 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Thu, 13 Aug 2009 11:56:31 +0100
+Subject: [PATCH] Make LXC / UML drivers robust against NUMA topology brokenness
+
+Some kernel versions expose broken NUMA topology for some machines.
+This causes the LXC/UML drivers to fail to start. QEMU driver was
+already fixed for this problem
+
+* src/lxc_conf.c: Log and ignore failure to populate NUMA info
+* src/uml_conf.c: Log and ignore failure to populate NUMA info
+* src/capabilities.c: Reset nnumaCell to 0 after freeing
+
+(cherry picked from commit 19bac57b26c2d46ac8a7601158f210f34acdceac)
+
+Fedora-patch: libvirt-0.7.0-numa-ignore-fail.patch
+---
+ src/capabilities.c |    1 +
+ src/lxc_conf.c     |   12 ++++++++++--
+ src/uml_conf.c     |   11 +++++++++--
+ 3 files changed, 20 insertions(+), 4 deletions(-)
 
 diff --git a/src/capabilities.c b/src/capabilities.c
 index c6766b6..193a9fe 100644
@@ -83,3 +91,6 @@ index 48e05a8..4f756d4 100644
  
      if ((guest = virCapabilitiesAddGuest(caps,
                                           "uml",
+-- 
+1.6.2.5
+

libvirt-0.7.0-policy-kit-rewrite.patch:
 b/configure.in            |   73 +++++++++++++++++++++++++++--------------
 b/qemud/Makefile.am       |   11 +++++-
 b/qemud/libvirtd.policy-0 |   42 +++++++++++++++++++++++
 b/qemud/libvirtd.policy-1 |   42 +++++++++++++++++++++++
 b/qemud/qemud.c           |    4 +-
 b/qemud/qemud.h           |    4 +-
 b/qemud/remote.c          |   81 +++++++++++++++++++++++++++++++++++++++++++---
 b/src/remote_internal.c   |    8 +++-
 qemud/libvirtd.policy     |   42 -----------------------
 9 files changed, 230 insertions(+), 77 deletions(-)

Index: libvirt-0.7.0-policy-kit-rewrite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-0.7.0-policy-kit-rewrite.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-0.7.0-policy-kit-rewrite.patch	13 Aug 2009 15:27:42 -0000	1.1
+++ libvirt-0.7.0-policy-kit-rewrite.patch	17 Aug 2009 08:08:46 -0000	1.2
@@ -1,6 +1,28 @@
-diff -rupN libvirt-0.7.0/configure.in libvirt-0.7.0.new/configure.in
---- libvirt-0.7.0/configure.in	2009-08-05 08:53:49.000000000 -0400
-+++ libvirt-0.7.0.new/configure.in	2009-08-13 08:37:22.393897620 -0400
+From d54fc5008d465d192101a0cb78fd02c437dff736 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange at redhat.com>
+Date: Mon, 17 Aug 2009 08:32:08 +0100
+Subject: [PATCH] Policykit rewrite (bug #499970)
+
+Fedora-patch: libvirt-0.7.0-policy-kit-rewrite.patch
+---
+ configure.in            |   73 ++++++++++++++++++++++++++++--------------
+ qemud/Makefile.am       |   11 +++++-
+ qemud/libvirtd.policy   |   42 ------------------------
+ qemud/libvirtd.policy-0 |   42 ++++++++++++++++++++++++
+ qemud/libvirtd.policy-1 |   42 ++++++++++++++++++++++++
+ qemud/qemud.c           |    4 +-
+ qemud/qemud.h           |    4 +-
+ qemud/remote.c          |   81 ++++++++++++++++++++++++++++++++++++++++++++--
+ src/remote_internal.c   |    7 ++++
+ 9 files changed, 230 insertions(+), 76 deletions(-)
+ delete mode 100644 qemud/libvirtd.policy
+ create mode 100644 qemud/libvirtd.policy-0
+ create mode 100644 qemud/libvirtd.policy-1
+
+diff --git a/configure.in b/configure.in
+index 45fa9ed..d28c44a 100644
+--- a/configure.in
++++ b/configure.in
 @@ -641,40 +641,61 @@ AC_SUBST([SASL_LIBS])
  dnl PolicyKit library
  POLKIT_CFLAGS=
@@ -99,9 +121,48 @@ diff -rupN libvirt-0.7.0/configure.in li
  else
  AC_MSG_NOTICE([  polkit: no])
  fi
-diff -rupN libvirt-0.7.0/qemud/libvirtd.policy libvirt-0.7.0.new/qemud/libvirtd.policy
---- libvirt-0.7.0/qemud/libvirtd.policy	2009-07-22 09:37:32.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/libvirtd.policy	1969-12-31 19:00:00.000000000 -0500
+diff --git a/qemud/Makefile.am b/qemud/Makefile.am
+index 959ff88..3d143da 100644
+--- a/qemud/Makefile.am
++++ b/qemud/Makefile.am
+@@ -21,7 +21,8 @@ EXTRA_DIST =						\
+ 	remote_protocol.x				\
+ 	libvirtd.conf					\
+ 	libvirtd.init.in				\
+-	libvirtd.policy					\
++	libvirtd.policy-0				\
++	libvirtd.policy-1				\
+ 	libvirtd.sasl					\
+ 	libvirtd.sysconf				\
+ 	libvirtd.aug                                    \
+@@ -147,7 +148,13 @@ endif
+ libvirtd_LDADD += ../src/libvirt.la
+ 
+ if HAVE_POLKIT
++if HAVE_POLKIT0
+ policydir = $(datadir)/PolicyKit/policy
++policyfile = libvirtd.policy-0
++else
++policydir = $(datadir)/polkit-1/actions
++policyfile = libvirtd.policy-1
++endif
+ endif
+ 
+ if HAVE_AVAHI
+@@ -197,7 +204,7 @@ endif
+ if HAVE_POLKIT
+ install-data-polkit:: install-init
+ 	mkdir -p $(DESTDIR)$(policydir)
+-	$(INSTALL_DATA) $(srcdir)/libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
++	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+ uninstall-data-polkit:: install-init
+ 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+ else
+diff --git a/qemud/libvirtd.policy b/qemud/libvirtd.policy
+deleted file mode 100644
+index b6da946..0000000
+--- a/qemud/libvirtd.policy
++++ /dev/null
 @@ -1,42 +0,0 @@
 -<!DOCTYPE policyconfig PUBLIC
 - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
@@ -145,9 +206,11 @@ diff -rupN libvirt-0.7.0/qemud/libvirtd.
 -      </defaults>
 -    </action>
 -</policyconfig>
-diff -rupN libvirt-0.7.0/qemud/libvirtd.policy-0 libvirt-0.7.0.new/qemud/libvirtd.policy-0
---- libvirt-0.7.0/qemud/libvirtd.policy-0	1969-12-31 19:00:00.000000000 -0500
-+++ libvirt-0.7.0.new/qemud/libvirtd.policy-0	2009-08-13 08:37:22.408883879 -0400
+diff --git a/qemud/libvirtd.policy-0 b/qemud/libvirtd.policy-0
+new file mode 100644
+index 0000000..b6da946
+--- /dev/null
++++ b/qemud/libvirtd.policy-0
 @@ -0,0 +1,42 @@
 +<!DOCTYPE policyconfig PUBLIC
 + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
@@ -191,9 +254,11 @@ diff -rupN libvirt-0.7.0/qemud/libvirtd.
 +      </defaults>
 +    </action>
 +</policyconfig>
-diff -rupN libvirt-0.7.0/qemud/libvirtd.policy-1 libvirt-0.7.0.new/qemud/libvirtd.policy-1
---- libvirt-0.7.0/qemud/libvirtd.policy-1	1969-12-31 19:00:00.000000000 -0500
-+++ libvirt-0.7.0.new/qemud/libvirtd.policy-1	2009-08-13 08:37:22.412905763 -0400
+diff --git a/qemud/libvirtd.policy-1 b/qemud/libvirtd.policy-1
+new file mode 100644
+index 0000000..6fa3a5e
+--- /dev/null
++++ b/qemud/libvirtd.policy-1
 @@ -0,0 +1,42 @@
 +<!DOCTYPE policyconfig PUBLIC
 + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
@@ -237,46 +302,11 @@ diff -rupN libvirt-0.7.0/qemud/libvirtd.
 +      </defaults>
 +    </action>
 +</policyconfig>
-diff -rupN libvirt-0.7.0/qemud/Makefile.am libvirt-0.7.0.new/qemud/Makefile.am
---- libvirt-0.7.0/qemud/Makefile.am	2009-07-22 09:37:32.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/Makefile.am	2009-08-13 08:37:22.398915449 -0400
-@@ -21,7 +21,8 @@ EXTRA_DIST =						\
- 	remote_protocol.x				\
- 	libvirtd.conf					\
- 	libvirtd.init.in				\
--	libvirtd.policy					\
-+	libvirtd.policy-0				\
-+	libvirtd.policy-1				\
- 	libvirtd.sasl					\
- 	libvirtd.sysconf				\
- 	libvirtd.aug                                    \
-@@ -147,7 +148,13 @@ endif
- libvirtd_LDADD += ../src/libvirt.la
- 
- if HAVE_POLKIT
-+if HAVE_POLKIT0
- policydir = $(datadir)/PolicyKit/policy
-+policyfile = libvirtd.policy-0
-+else
-+policydir = $(datadir)/polkit-1/actions
-+policyfile = libvirtd.policy-1
-+endif
- endif
- 
- if HAVE_AVAHI
-@@ -197,7 +204,7 @@ endif
- if HAVE_POLKIT
- install-data-polkit:: install-init
- 	mkdir -p $(DESTDIR)$(policydir)
--	$(INSTALL_DATA) $(srcdir)/libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-+	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- uninstall-data-polkit:: install-init
- 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- else
-diff -rupN libvirt-0.7.0/qemud/qemud.c libvirt-0.7.0.new/qemud/qemud.c
---- libvirt-0.7.0/qemud/qemud.c	2009-07-22 09:37:32.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/qemud.c	2009-08-13 08:37:22.419878018 -0400
-@@ -895,7 +895,7 @@ static struct qemud_server *qemudNetwork
+diff --git a/qemud/qemud.c b/qemud/qemud.c
+index 3e551ca..50b0cdd 100644
+--- a/qemud/qemud.c
++++ b/qemud/qemud.c
+@@ -895,7 +895,7 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
      }
  #endif
  
@@ -285,7 +315,7 @@ diff -rupN libvirt-0.7.0/qemud/qemud.c l
      if (auth_unix_rw == REMOTE_AUTH_POLKIT ||
          auth_unix_ro == REMOTE_AUTH_POLKIT) {
          DBusError derr;
-@@ -982,7 +982,7 @@ static struct qemud_server *qemudNetwork
+@@ -982,7 +982,7 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
              sock = sock->next;
          }
  
@@ -294,9 +324,10 @@ diff -rupN libvirt-0.7.0/qemud/qemud.c l
          if (server->sysbus)
              dbus_connection_unref(server->sysbus);
  #endif
-diff -rupN libvirt-0.7.0/qemud/qemud.h libvirt-0.7.0.new/qemud/qemud.h
---- libvirt-0.7.0/qemud/qemud.h	2009-07-23 12:33:02.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/qemud.h	2009-08-13 08:37:22.425909852 -0400
+diff --git a/qemud/qemud.h b/qemud/qemud.h
+index 254db44..e8ce209 100644
+--- a/qemud/qemud.h
++++ b/qemud/qemud.h
 @@ -34,7 +34,7 @@
  #include <sasl/sasl.h>
  #endif
@@ -315,9 +346,10 @@ diff -rupN libvirt-0.7.0/qemud/qemud.h l
      DBusConnection *sysbus;
  #endif
  };
-diff -rupN libvirt-0.7.0/qemud/remote.c libvirt-0.7.0.new/qemud/remote.c
---- libvirt-0.7.0/qemud/remote.c	2009-07-23 12:33:02.000000000 -0400
-+++ libvirt-0.7.0.new/qemud/remote.c	2009-08-13 08:37:22.431865087 -0400
+diff --git a/qemud/remote.c b/qemud/remote.c
+index d32d513..490a807 100644
+--- a/qemud/remote.c
++++ b/qemud/remote.c
 @@ -43,7 +43,7 @@
  #include <fnmatch.h>
  #include "virterror_internal.h"
@@ -327,7 +359,7 @@ diff -rupN libvirt-0.7.0/qemud/remote.c 
  #include <polkit/polkit.h>
  #include <polkit-dbus/polkit-dbus.h>
  #endif
-@@ -3106,7 +3106,80 @@ remoteDispatchAuthSaslStep (struct qemud
+@@ -3106,7 +3106,80 @@ remoteDispatchAuthSaslStep (struct qemud_server *server ATTRIBUTE_UNUSED,
  #endif /* HAVE_SASL */
  
  
@@ -418,7 +450,7 @@ diff -rupN libvirt-0.7.0/qemud/remote.c 
  
  static int
  remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED,
-@@ -3231,7 +3304,7 @@ remoteDispatchAuthPolkit (struct qemud_s
+@@ -3231,7 +3304,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED,
      remoteDispatchAuthError(rerr);
      return -1;
  }
@@ -427,10 +459,11 @@ diff -rupN libvirt-0.7.0/qemud/remote.c 
  
  
  /***************************************************************
-diff -rupN libvirt-0.7.0/src/remote_internal.c libvirt-0.7.0.new/src/remote_internal.c
---- libvirt-0.7.0/src/remote_internal.c	2009-07-29 10:42:15.000000000 -0400
-+++ libvirt-0.7.0.new/src/remote_internal.c	2009-08-13 10:55:57.607899170 -0400
-@@ -6201,6 +6201,7 @@ remoteAuthPolkit (virConnectPtr conn, st
+diff --git a/src/remote_internal.c b/src/remote_internal.c
+index a58b768..e98c99b 100644
+--- a/src/remote_internal.c
++++ b/src/remote_internal.c
+@@ -6201,6 +6201,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
                    virConnectAuthPtr auth)
  {
      remote_auth_polkit_ret ret;
@@ -438,7 +471,7 @@ diff -rupN libvirt-0.7.0/src/remote_inte
      int i, allowcb = 0;
      virConnectCredential cred = {
          VIR_CRED_EXTERNAL,
-@@ -6210,8 +6211,10 @@ remoteAuthPolkit (virConnectPtr conn, st
+@@ -6210,8 +6211,10 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
          NULL,
          0,
      };
@@ -449,7 +482,7 @@ diff -rupN libvirt-0.7.0/src/remote_inte
      if (auth && auth->cb) {
          /* Check if the necessary credential type for PolicyKit is supported */
          for (i = 0 ; i < auth->ncredtype ; i++) {
-@@ -6220,6 +6223,7 @@ remoteAuthPolkit (virConnectPtr conn, st
+@@ -6220,6 +6223,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
          }
  
          if (allowcb) {
@@ -457,7 +490,7 @@ diff -rupN libvirt-0.7.0/src/remote_inte
              /* Run the authentication callback */
              if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
                  virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
-@@ -6233,6 +6237,9 @@ remoteAuthPolkit (virConnectPtr conn, st
+@@ -6233,6 +6237,9 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
      } else {
          DEBUG0("No auth callback provided");
      }
@@ -467,3 +500,6 @@ diff -rupN libvirt-0.7.0/src/remote_inte
  
      memset (&ret, 0, sizeof ret);
      if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT,
+-- 
+1.6.2.5
+


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- libvirt.spec	13 Aug 2009 15:43:14 -0000	1.169
+++ libvirt.spec	17 Aug 2009 08:08:46 -0000	1.170
@@ -78,7 +78,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.0
-Release: 4%{?dist}%{?extra_release}
+Release: 5%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -282,7 +282,7 @@ of recent versions of Linux (and other O
 %patch03 -p1
 %patch04 -p1
 
-%patch200 -p0
+%patch200 -p1
 
 %build
 %if ! %{with_xen}

More information about the fedora-extras-commits mailing list