diff --git a/0f590c62-polkit0.patch b/0f590c62-polkit0.patch deleted file mode 100644 index b21a25a..0000000 --- a/0f590c62-polkit0.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 0f590c62b2af15247cafc2cc53815a7edbf5532e -Author: Jim Fehlig -Date: Tue Nov 15 15:11:49 2011 -0700 - - Fix build with polkit0 - - I missed adding libvirt_driver_remote.la to libvirtd_LDADD in - commit b8adfcc6, which didn't cause a problem in 0.9.6 but - results in this build error in 0.9.7 - - libvirtd-remote.o: In function `remoteDispatchAuthPolkit': - remote.c:(.text+0x188dd): undefined reference to `virNetServerGetDBusConn' - -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index e8c47ae..59db217 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -156,6 +156,10 @@ endif - if WITH_NWFILTER - libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la - endif -+ -+if HAVE_POLKIT0 -+ libvirtd_LDADD += ../src/libvirt_driver_remote.la -+endif - endif - - libvirtd_LDADD += ../src/libvirt.la diff --git a/d47ab3fe-polkit0.patch b/d47ab3fe-polkit0.patch new file mode 100644 index 0000000..f01a66d --- /dev/null +++ b/d47ab3fe-polkit0.patch @@ -0,0 +1,25 @@ +commit d47ab3fe6115de6c54f999ba598fe58418840653 +Author: Jim Fehlig +Date: Wed Nov 16 11:35:08 2011 -0700 + + Fix build with polkit0 + + I missed adding virNetServerGetDBusConn() to libvirtd_private.syms + in commit b8adfcc6, which didn't cause a problem in 0.9.6 but + results in this build error in 0.9.7 + + libvirtd-remote.o: In function `remoteDispatchAuthPolkit': + remote.c:(.text+0x188dd): undefined reference to `virNetServerGetDBusConn' + +Index: libvirt-0.9.7/src/libvirt_private.syms +=================================================================== +--- libvirt-0.9.7.orig/src/libvirt_private.syms ++++ libvirt-0.9.7/src/libvirt_private.syms +@@ -1217,6 +1217,7 @@ virNetServerAddSignalHandler; + virNetServerAutoShutdown; + virNetServerClose; + virNetServerFree; ++virNetServerGetDBusConn; + virNetServerIsPrivileged; + virNetServerNew; + virNetServerQuit; diff --git a/libvirt.changes b/libvirt.changes index f179c2d..cf5803c 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -2,7 +2,7 @@ Tue Nov 15 15:05:36 MST 2011 - jfehlig@suse.com - Fix build when using older PolicyKit - polkit0.patch + d47ab3fe-polkit0.patch ------------------------------------------------------------------- Wed Nov 9 18:52:18 MST 2011 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 057c645..629e2c9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -380,7 +380,7 @@ Source1: libvirtd.init Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: 0f590c62-polkit0.patch +Patch0: d47ab3fe-polkit0.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch diff --git a/use-init-script-redhat.patch b/use-init-script-redhat.patch index 3886ea5..04ae33c 100644 --- a/use-init-script-redhat.patch +++ b/use-init-script-redhat.patch @@ -230,7 +230,7 @@ Index: libvirt-0.9.7/daemon/Makefile.am =================================================================== --- libvirt-0.9.7.orig/daemon/Makefile.am +++ libvirt-0.9.7/daemon/Makefile.am -@@ -240,20 +240,12 @@ install-logrotate: $(LOGROTATE_CONFS) +@@ -236,20 +236,12 @@ install-logrotate: $(LOGROTATE_CONFS) if LIBVIRT_INIT_SCRIPT_RED_HAT install-init: libvirtd.init