- Update to libvirt 1.0.2

- LXC improvements - S390 architecture improvements - Power architecture improvements - large Coverity report cleanups and associated bug fixes - virTypedParams* APIs to help with those data structures - libxenlight driver improvements - Drop upstream patches: 68e7bc45-libxl-link-fix.patch, 462a6962-script-fixes1.patch, cb854b8f-script-fixes2.patch, 5ec4b22b-script-fixes3.patch, a1fd56cb-script-fixes4.patch, 66ff2ddc-virtlockd-systemd-file-perms.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=242
2013-01-30 18:45:29 +00:00 · 2013-01-30 18:45:29 +00:00 · 49fa466c51
commit 49fa466c51
parent 13d485c1ee
22 changed files with 178 additions and 790 deletions
--- a/462a6962-script-fixes1.patch
+++ b/462a6962-script-fixes1.patch
@ -1,401 +0,0 @@
-commit 462a69621e232c83990dbe6a711326b671262d47
-Author: Eric Blake <eblake@redhat.com>
-Date:   Fri Jan 4 13:35:04 2013 -0700
-
-    build: use common .in replacement mechanism
-    
-    We had several different styles of .in conversion in our Makefiles:
-    ALLCAPS, @ALLCAPS@, @lower@, ::lower::
-    Canonicalize on one form, to make it easier to copy and paste
-    between .in files.
-    
-    Also, we were using some non-portable sed constructs: \@ is an
-    undefined escape sequence (it happens to be @ itself in GNU sed,
-    but POSIX allows it to mean something else), as well as risky
-    behavior (failure to consistently quote things means a space
-    in $(sysconfdir) could throw things off; also, Autoconf recommends
-    using | rather than , or ! in the s||| operator, because | has to
-    be quoted in shell and is therefore less likely to appear in file
-    names than , or !).
-    
-    Fix all of these uses to follow the same syntax.
-    
-    * daemon/libvirtd.8.in: Switch to @var@.
-    * tools/virt-xml-validate.in: Likewise.
-    * tools/virt-pki-validate.in: Likewise.
-    * src/locking/virtlockd.init.in: Likewise.
-    * daemon/Makefile.am: Prefer | over ! in sed.
-    (libvirtd.8): Prefer consistent substitution.
-    (libvirtd.init, libvirtd.service): Avoid non-portable sed.
-    * tools/Makefile.am (libvirt-guests.sh, libvirt-guests.init)
-    (libvirt-guests.service): Likewise.
-    (virt-xml-validate, virt-pki-validate, virt-sanlock-cleanup):
-    Prefer consistent capitalization.
-    * src/Makefile.am (virtlockd.init, virtlockd.service)
-    (virtlockd.socket): Prefer consistent substitution.
-
-Index: libvirt-1.0.1/daemon/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/daemon/Makefile.am
-+++ libvirt-1.0.1/daemon/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
-## Copyright (C) 2005-2012 Red Hat, Inc.
-+## Copyright (C) 2005-2013 Red Hat, Inc.
- ## See COPYING.LIB for the License of this software
- 
- INCLUDES = \
-@@ -84,8 +84,8 @@ CLEANFILES += test_libvirtd.aug
- 
- libvirtd.8: $(srcdir)/libvirtd.8.in
- 	$(AM_V_GEN)sed \
-	    -e 's!SYSCONFDIR!$(sysconfdir)!g' \
-	    -e 's!LOCALSTATEDIR!$(localstatedir)!g' \
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
- 	    < $< > $@-t && \
- 	mv $@-t $@
- 
-@@ -181,7 +181,7 @@ endif
- 
- libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status
- 	$(AM_V_GEN) sed \
-	    -e 's![@]authaction[@]!$(policyauth)!g' \
-+	    -e 's|[@]authaction[@]|$(policyauth)|g' \
- 	    < $< > $@-t && \
- 	mv $@-t $@
- BUILT_SOURCES += libvirtd.policy
-@@ -222,25 +222,25 @@ BUILT_SOURCES += $(LOGROTATE_CONFS)
- 
- libvirtd.logrotate: libvirtd.logrotate.in
- 	$(AM_V_GEN)sed						\
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g'	\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
- 	    < $< > $@-t && \
- 	mv $@-t $@
- 
- libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
- 	$(AM_V_GEN)sed						\
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g'	\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
- 	    < $< > $@-t && \
- 	mv $@-t $@
- 
- libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
- 	$(AM_V_GEN)sed						\
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g'	\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
- 	    < $< > $@-t &&					\
- 	    mv $@-t $@
- 
- libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
- 	$(AM_V_GEN)sed						\
-	    -e 's![@]localstatedir[@]!$(localstatedir)!g'	\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
- 	    < $< > $@-t &&					\
- 	    mv $@-t $@
- 
-@@ -340,21 +340,21 @@ uninstall-init-systemd:
- endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
- 
- libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e s!\@localstatedir\@!$(localstatedir)!g	\
-	    -e s!\@sbindir\@!$(sbindir)!g		\
-	    -e s!\@sysconfdir\@!$(sysconfdir)!g		\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-+	$(AM_V_GEN)sed						\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-+	    < $< > $@-t &&					\
-+	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e s!\@localstatedir\@!$(localstatedir)!g	\
-	    -e s!\@sbindir\@!$(sbindir)!g		\
-	    -e s!\@sysconfdir\@!$(sysconfdir)!g		\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-+	$(AM_V_GEN)sed						\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-+	    < $< > $@-t &&					\
-+	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- 
-Index: libvirt-1.0.1/src/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/src/Makefile.am
-+++ libvirt-1.0.1/src/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
-## Copyright (C) 2005-2012 Red Hat, Inc.
-+## Copyright (C) 2005-2013 Red Hat, Inc.
- ## See COPYING.LIB for the License of this software
- 
- # No libraries with the exception of LIBXML should be listed
-@@ -1662,12 +1662,12 @@ uninstall-init::
- endif
- 
- virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e "s!::localstatedir::!$(localstatedir)!g"	\
-	    -e "s!::sbindir::!$(sbindir)!g"		\
-	    -e "s!::sysconfdir::!$(sysconfdir)!g"	\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-+	$(AM_V_GEN)sed						\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-+	    < $< > $@-t &&					\
-+	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- 
-@@ -1703,21 +1703,21 @@ uninstall-systemd:
- endif
- 
- virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e "s!::localstatedir::!$(localstatedir)!g"	\
-	    -e "s!::sbindir::!$(sbindir)!g"		\
-	    -e "s!::sysconfdir::!$(sysconfdir)!g"	\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-+	$(AM_V_GEN)sed						\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-+	    < $< > $@-t &&					\
-+	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e "s!::localstatedir::!$(localstatedir)!g"	\
-	    -e "s!::sbindir::!$(sbindir)!g"		\
-	    -e "s!::sysconfdir::!$(sysconfdir)!g"	\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-+	$(AM_V_GEN)sed						\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-+	    < $< > $@-t &&					\
-+	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- 
-Index: libvirt-1.0.1/src/locking/virtlockd.init.in
-===================================================================
--- libvirt-1.0.1.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.0.1/src/locking/virtlockd.init.in
-@@ -20,19 +20,19 @@
- #               on virtual machine disk images
- #
- # processname: virtlockd
-# pidfile: ::localstatedir::/run/libvirt/virtlockd.pid
-+# pidfile: @localstatedir@/run/libvirt/virtlockd.pid
- #
- 
- # Source function library.
-. ::sysconfdir::/rc.d/init.d/functions
-+. @sysconfdir@/rc.d/init.d/functions
- 
- SERVICE=virtlockd
- PROCESS=virtlockd
-PIDFILE=::localstatedir::/run/libvirt/lockd/$SERVICE.pid
-+PIDFILE=@localstatedir@/run/libvirt/lockd/$SERVICE.pid
- 
- VIRTLOCKD_ARGS=
- 
-test -f ::sysconfdir::/sysconfig/virtlockd && . ::sysconfdir::/sysconfig/virtlockd
-+test -f @sysconfdir@/sysconfig/virtlockd && . @sysconfdir@/sysconfig/virtlockd
- 
- RETVAL=0
- 
-@@ -41,7 +41,7 @@ start() {
-     daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOCKD_ARGS
-     RETVAL=$?
-     echo
-    [ $RETVAL -eq 0 ] && touch ::localstatedir::/lock/subsys/$SERVICE
-+    [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
- }
- 
- stop() {
-@@ -51,7 +51,7 @@ stop() {
-     RETVAL=$?
-     echo
-     if [ $RETVAL -eq 0 ]; then
-        rm -f ::localstatedir::/lock/subsys/$SERVICE
-+        rm -f @localstatedir@/lock/subsys/$SERVICE
-         rm -f $PIDFILE
-     fi
- }
-@@ -83,7 +83,7 @@ case "$1" in
-         reload
-         ;;
-     condrestart|try-restart)
-        [ -f ::localstatedir::/lock/subsys/$SERVICE ] && restart || :
-+        [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || :
-         ;;
-     *)
-         echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload|try-restart}"
-Index: libvirt-1.0.1/tools/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/tools/Makefile.am
-+++ libvirt-1.0.1/tools/Makefile.am
-@@ -1,4 +1,4 @@
-## Copyright (C) 2005-2012 Red Hat, Inc.
-+## Copyright (C) 2005-2013 Red Hat, Inc.
- ## See COPYING.LIB for the License of this software
- 
- INCLUDES = \
-@@ -58,7 +58,7 @@ dist_man8_MANS = virt-sanlock-cleanup.8
- endif
- 
- virt-xml-validate: virt-xml-validate.in Makefile
-	$(AM_V_GEN)sed -e 's,[@]SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ \
-+	$(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|' < $< > $@ \
- 	    || (rm $@ && exit 1) && chmod +x $@
- 
- virt-xml-validate.1: virt-xml-validate.in
-@@ -67,7 +67,7 @@ virt-xml-validate.1: virt-xml-validate.i
- 		rm $(srcdir)/$@; exit 1; fi
- 
- virt-pki-validate: virt-pki-validate.in Makefile
-	$(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' < $< > $@ \
-+	$(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' < $< > $@ \
- 	    || (rm $@ && exit 1) && chmod +x $@
- 
- virt-pki-validate.1: virt-pki-validate.in
-@@ -81,8 +81,8 @@ virt-host-validate.1: virt-host-validate
- 		rm $(srcdir)/$@; exit 1; fi
- 
- virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
-	$(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' \
-	    -e 's,[@]LOCALSTATEDIR@,$(localstatedir),' < $< > $@ \
-+	$(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' \
-+	    -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \
- 	    || (rm $@ && exit 1) && chmod +x $@
- 
- virt-sanlock-cleanup.8: virt-sanlock-cleanup.in
-@@ -210,21 +210,21 @@ uninstall-init:
- endif # LIBVIRT_INIT_SCRIPT_RED_HAT
- 
- libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e 's!\@PACKAGE\@!$(PACKAGE)!g'		\
-	    -e 's!\@bindir\@!$(bindir)!g'		\
-	    -e 's!\@localedir\@!$(localedir)!g'		\
-	    -e 's!\@localstatedir\@!$(localstatedir)!g'	\
-	    -e 's!\@sbindir\@!$(sbindir)!g'		\
-	    -e 's!\@sysconfdir\@!$(sysconfdir)!g'	\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-+	$(AM_V_GEN)sed						\
-+	    -e 's|[@]PACKAGE[@]|$(PACKAGE)|g'			\
-+	    -e 's|[@]bindir[@]|$(bindir)|g'			\
-+	    -e 's|[@]localedir[@]|$(localedir)|g'		\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-+	    < $< > $@-t &&					\
-+	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- BUILT_SOURCES += libvirt-guests.sh
- 
- libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
- 	$(AM_V_GEN)sed \
-		-e 's!\@libexecdir\@!$(libexecdir)!g' \
-+		-e 's|[@]libexecdir[@]|$(libexecdir)|g' \
- 	< $< > $@-t && \
- 	chmod a+x $@-t && \
- 	mv $@-t $@
-@@ -251,16 +251,16 @@ uninstall-systemd:
- endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
- 
- libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed					\
-	    -e 's!\@PACKAGE\@!$(PACKAGE)!g'		\
-	    -e 's!\@bindir\@!$(bindir)!g'		\
-	    -e 's!\@localedir\@!$(localedir)!g'		\
-	    -e 's!\@localstatedir\@!$(localstatedir)!g'	\
-	    -e 's!\@sbindir\@!$(sbindir)!g'		\
-	    -e 's!\@sysconfdir\@!$(sysconfdir)!g'	\
-	    -e 's!\@libexecdir\@!$(libexecdir)!g'	\
-	    < $< > $@-t &&				\
-	    chmod a+x $@-t &&				\
-+	$(AM_V_GEN)sed						\
-+	    -e 's|[@]PACKAGE[@]|$(PACKAGE)|g'			\
-+	    -e 's|[@]bindir[@]|$(bindir)|g'			\
-+	    -e 's|[@]localedir[@]|$(localedir)|g'		\
-+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-+	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-+	    -e 's|[@]libexecdir[@]|$(libexecdir)|g'		\
-+	    < $< > $@-t &&					\
-+	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- 
-Index: libvirt-1.0.1/tools/virt-pki-validate.in
-===================================================================
--- libvirt-1.0.1.orig/tools/virt-pki-validate.in
-+++ libvirt-1.0.1/tools/virt-pki-validate.in
-@@ -25,7 +25,7 @@ echo Found "$CERTOOL"
- #
- # Check the directory structure
- #
-SYSCONFDIR="@SYSCONFDIR@"
-+SYSCONFDIR="@sysconfdir@"
- PKI="$SYSCONFDIR/pki"
- if [ ! -d "$PKI" ]
- then
-Index: libvirt-1.0.1/tools/virt-sanlock-cleanup.in
-===================================================================
--- libvirt-1.0.1.orig/tools/virt-sanlock-cleanup.in
-+++ libvirt-1.0.1/tools/virt-sanlock-cleanup.in
-@@ -10,9 +10,9 @@ fi
- 
- LOCKSPACE="__LIBVIRT__DISKS__"
- 
-LOCKDIR=`augtool print '/files@SYSCONFDIR@/libvirt/qemu-sanlock.conf/disk_lease_dir'`
-+LOCKDIR=`augtool print '/files@sysconfdir@/libvirt/qemu-sanlock.conf/disk_lease_dir'`
- if test $? != 0 || "x$LOCKDIR" = "x" ; then
-  LOCKDIR="@LOCALSTATEDIR@/lib/libvirt/sanlock"
-+  LOCKDIR="@localstatedir@/lib/libvirt/sanlock"
- fi
- 
- notify() {
-@@ -80,7 +80,7 @@ Alternatively report bugs to your softwa
- 
- =head1 COPYRIGHT
- 
-Copyright (C) 2011 Red Hat, Inc.
-+Copyright (C) 2011, 2013 Red Hat, Inc.
- 
- =head1 LICENSE
- 
-Index: libvirt-1.0.1/tools/virt-xml-validate.in
-===================================================================
--- libvirt-1.0.1.orig/tools/virt-xml-validate.in
-+++ libvirt-1.0.1/tools/virt-xml-validate.in
-@@ -57,7 +57,7 @@ if [ -z "$TYPE" ]; then
-   esac
- fi
- 
-SCHEMA="@SCHEMADIR@/${TYPE}.rng"
-+SCHEMA="@schemadir@/${TYPE}.rng"
- 
- if [ ! -f "$SCHEMA" ]; then
-   echo "$0: schema $SCHEMA does not exist"
--- a/5ec4b22b-script-fixes3.patch
+++ b/5ec4b22b-script-fixes3.patch
@ -1,57 +0,0 @@
-commit 5ec4b22b777b4505d159c6e8d1631d4d774a7be7
-Author: Eric Blake <eblake@redhat.com>
-Date:   Fri Jan 4 13:50:39 2013 -0700
-
-    build: .service files don't need to be executable
-    
-    See also commit 66ff2dd, where we avoided installing these files
-    as executables.
-    
-    * daemon/Makefile.am (libvirtd.service): Drop chmod.
-    * tools/Makefile.am (libvirt-guests.service): Likewise.
-    * src/Makefile.am (virtlockd.service, virtlockd.socket):
-    Likewise.
-
-Index: libvirt-1.0.1/daemon/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/daemon/Makefile.am
-+++ libvirt-1.0.1/daemon/Makefile.am
-@@ -354,7 +354,6 @@ libvirtd.service: libvirtd.service.in $(
- 	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
- 	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
- 	    < $< > $@-t &&					\
-	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- 
-Index: libvirt-1.0.1/src/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/src/Makefile.am
-+++ libvirt-1.0.1/src/Makefile.am
-@@ -1706,14 +1706,12 @@ virtlockd.service: locking/virtlockd.ser
- 	$(AM_V_GEN)sed						\
- 	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
- 	    < $< > $@-t &&					\
-	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status
- 	$(AM_V_GEN)sed						\
- 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
- 	    < $< > $@-t &&					\
-	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- 
-Index: libvirt-1.0.1/tools/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/tools/Makefile.am
-+++ libvirt-1.0.1/tools/Makefile.am
-@@ -260,7 +260,6 @@ libvirt-guests.service: libvirt-guests.s
- 	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
- 	    -e 's|[@]libexecdir[@]|$(libexecdir)|g'		\
- 	    < $< > $@-t &&					\
-	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
- 
- 
--- a/66ff2ddc-virtlockd-systemd-file-perms.patch
+++ b/66ff2ddc-virtlockd-systemd-file-perms.patch
@ -1,24 +0,0 @@
-commit 66ff2ddc29298da43b3be3b7780683418e2ead76
-Author: Guido Günther <agx@sigxcpu.org>
-Date:   Thu Jan 3 22:39:14 2013 +0100
-
-    Install virtlockd.{socket,service} non executable
-    
-    since they're not scripts but systemd service files.
-
-Index: libvirt-1.0.1/src/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/src/Makefile.am
-+++ libvirt-1.0.1/src/Makefile.am
-@@ -1684,9 +1684,9 @@ DISTCLEANFILES += virtlockd.service virt
- 
- install-systemd: virtlockd.service virtlockd.socket install-sysconfig
- 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
-	$(INSTALL_SCRIPT) virtlockd.service \
-+	$(INSTALL_DATA) virtlockd.service \
- 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
-	$(INSTALL_SCRIPT) virtlockd.socket \
-+	$(INSTALL_DATA) virtlockd.socket \
- 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
- 
- uninstall-systemd: uninstall-sysconfig
--- a/68e7bc45-libxl-link-fix.patch
+++ b/68e7bc45-libxl-link-fix.patch
@ -1,24 +0,0 @@
-commit 68e7bc4561783d742d1e266b7f1f0e3516d5117e
-Author: Jim Fehlig <jfehlig@suse.com>
-Date:   Mon Jan 7 10:15:56 2013 -0700
-
-    build: Add libxenctrl to LIBXL_LIBS
-    
-    Commit dfa1e1dd removed libxenctrl from LIBXL_LIBS, but the libxl
-    driver uses a symbol from this library.  Explicitly link with
-    libxenctrl instead of relying on the build system to support
-    implicit DSO linking.
-
-Index: libvirt-1.0.1/configure.ac
-===================================================================
--- libvirt-1.0.1.orig/configure.ac
-+++ libvirt-1.0.1/configure.ac
-@@ -727,7 +727,7 @@ if test "$with_libxl" != "no" ; then
-     LIBS="$LIBS $LIBXL_LIBS"
-     AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [
-         with_libxl=yes
-        LIBXL_LIBS="$LIBXL_LIBS -lxenlight"
-+        LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl"
-     ],[
-         if test "$with_libxl" = "yes"; then
-             fail=1
--- a/AF_PACKET.patch
+++ b/AF_PACKET.patch
@ -1,7 +1,7 @@
-Index: libvirt-1.0.1/src/util/virnetdev.c
+Index: libvirt-1.0.2/src/util/virnetdev.c
 ===================================================================
--- libvirt-1.0.1.orig/src/util/virnetdev.c
-+++ libvirt-1.0.1/src/util/virnetdev.c
+--- libvirt-1.0.2.orig/src/util/virnetdev.c
+++ libvirt-1.0.2/src/util/virnetdev.c
@@ -81,7 +81,7 @@ static int virNetDevSetupControlFull(con
 static int virNetDevSetupControl(const char *ifname,
                                  struct ifreq *ifr)
@ -11,11 +11,11 @@ Index: libvirt-1.0.1/src/util/virnetdev.c
 }
 #endif
 
-Index: libvirt-1.0.1/src/util/virnetdevbridge.c
+Index: libvirt-1.0.2/src/util/virnetdevbridge.c
 ===================================================================
--- libvirt-1.0.1.orig/src/util/virnetdevbridge.c
-+++ libvirt-1.0.1/src/util/virnetdevbridge.c
-@@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con
+--- libvirt-1.0.2.orig/src/util/virnetdevbridge.c
+++ libvirt-1.0.2/src/util/virnetdevbridge.c
+@@ -85,7 +85,7 @@ static int virNetDevSetupControlFull(con
 static int virNetDevSetupControl(const char *ifname,
                                  struct ifreq *ifr)
 {
--- a/a1fd56cb-script-fixes4.patch
+++ b/a1fd56cb-script-fixes4.patch
@ -1,58 +0,0 @@
-commit a1fd56cb3057c45cffbf5d41eaf70a26d2116b20
-Author: Eric Blake <eblake@redhat.com>
-Date:   Fri Jan 4 14:21:59 2013 -0700
-
-    build: install libvirt sysctl file correctly
-    
-    https://bugzilla.redhat.com/show_bug.cgi?id=887017 reports that
-    even though libvirt attempts to set fs.aio-max-nr via sysctl,
-    the file was installed with the wrong name and gets ignored by
-    sysctl.  Furthermore, 'man systcl.d' recommends that packages
-    install into hard-coded /usr/lib/sysctl.d (even when libdir is
-    /usr/lib64), so that sysadmins can use /etc/sysctl.d for overrides.
-    
-    * daemon/Makefile.am (install-sysctl, uninstall-sysctl): Use
-    correct location.
-    * libvirt.spec.in (network_files): Reflect this.
-
-Index: libvirt-1.0.1/daemon/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/daemon/Makefile.am
-+++ libvirt-1.0.1/daemon/Makefile.am
-@@ -273,14 +273,16 @@ uninstall-sysconfig:
- 	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
- 
- if WITH_SYSCTL
-+# Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
-+# /usr/lib/sysctl.d/ even when libdir is /usr/lib64
- install-sysctl:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d
-+	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
- 	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
-	  $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
-+	  $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
- 
- uninstall-sysctl:
-	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
-	rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || :
-+	rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
-+	rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
- else
- install-sysctl:
- uninstall-sysctl:
-Index: libvirt-1.0.1/libvirt.spec.in
-===================================================================
--- libvirt-1.0.1.orig/libvirt.spec.in
-+++ libvirt-1.0.1/libvirt.spec.in
-@@ -1678,9 +1678,9 @@ fi
- %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
- %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
- %if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
-%config(noreplace) %{_sysconfdir}/sysctl.d/libvirtd
-+%config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf
- %else
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
-+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf
- %endif
- %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
- %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
--- a/cb854b8f-script-fixes2.patch
+++ b/cb854b8f-script-fixes2.patch
@ -1,51 +0,0 @@
-commit cb854b8f6128002306c1bc07113cf038a50be8bc
-Author: Eric Blake <eblake@redhat.com>
-Date:   Fri Jan 4 13:48:30 2013 -0700
-
-    build: properly substitute virtlockd.socket
-    
-    virtlockd.service could be installed to a configurable root,
-    but virtlockd.socket was hardcoded to installation into a
-    distro.
-    
-    * src/Makefile.am (virtlockd.service, virtlockd.socket): Drop
-    unused substitutions.
-    * src/locking/virtlockd.socket.in (ListenStream): Don't hard-code
-    /var.
-
-Index: libvirt-1.0.1/src/Makefile.am
-===================================================================
--- libvirt-1.0.1.orig/src/Makefile.am
-+++ libvirt-1.0.1/src/Makefile.am
-@@ -1704,9 +1704,7 @@ endif
- 
- virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status
- 	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
- 	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
- 	    < $< > $@-t &&					\
- 	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
-@@ -1714,8 +1712,6 @@ virtlockd.service: locking/virtlockd.ser
- virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status
- 	$(AM_V_GEN)sed						\
- 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
- 	    < $< > $@-t &&					\
- 	    chmod a+x $@-t &&					\
- 	    mv $@-t $@
-Index: libvirt-1.0.1/src/locking/virtlockd.socket.in
-===================================================================
--- libvirt-1.0.1.orig/src/locking/virtlockd.socket.in
-+++ libvirt-1.0.1/src/locking/virtlockd.socket.in
-@@ -2,7 +2,7 @@
- Description=Virtual machine lock manager socket
- 
- [Socket]
-ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
-+ListenStream=@localstatedir@/run/libvirt/virtlockd/virtlockd.sock
- 
- [Install]
- WantedBy=multi-user.target
--- a/clone.patch
+++ b/clone.patch
@ -2,7 +2,7 @@ Index: src/lxc/lxc_container.c
 ===================================================================
 --- src/lxc/lxc_container.c.orig
 +++ src/lxc/lxc_container.c
-@@ -1982,6 +1982,9 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -2358,6 +2358,9 @@ int lxcContainerStart(virDomainDefPtr de
                               ttyPaths, nttyPaths, handshakefd};
 
     /* allocate a stack for the container */
@ -12,7 +12,7 @@ Index: src/lxc/lxc_container.c
     if (VIR_ALLOC_N(stack, stacksize) < 0) {
         virReportOOMError();
         return -1;
-@@ -2001,7 +2004,11 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -2377,7 +2380,11 @@ int lxcContainerStart(virDomainDefPtr de
         cflags |= CLONE_NEWNET;
     }
 
@ -24,7 +24,7 @@ Index: src/lxc/lxc_container.c
     VIR_FREE(stack);
     VIR_DEBUG("clone() completed, new container PID is %d", pid);
 
-@@ -2027,6 +2034,7 @@ int lxcContainerAvailable(int features)
+@@ -2403,6 +2410,7 @@ int lxcContainerAvailable(int features)
     int cpid;
     char *childStack;
     char *stack;
@ -32,7 +32,7 @@ Index: src/lxc/lxc_container.c
 
     if (features & LXC_CONTAINER_FEATURE_USER)
         flags |= CLONE_NEWUSER;
-@@ -2034,14 +2042,21 @@ int lxcContainerAvailable(int features)
+@@ -2410,14 +2418,21 @@ int lxcContainerAvailable(int features)
     if (features & LXC_CONTAINER_FEATURE_NET)
         flags |= CLONE_NEWNET;
 
--- a/install-apparmor-profiles.patch
+++ b/install-apparmor-profiles.patch
@ -1,7 +1,7 @@
-Index: libvirt-1.0.1/examples/apparmor/Makefile.am
+Index: libvirt-1.0.2/examples/apparmor/Makefile.am
 ===================================================================
--- libvirt-1.0.1.orig/examples/apparmor/Makefile.am
-+++ libvirt-1.0.1/examples/apparmor/Makefile.am
+--- libvirt-1.0.2.orig/examples/apparmor/Makefile.am
+++ libvirt-1.0.2/examples/apparmor/Makefile.am
@@ -1,8 +1,39 @@
 ## Copyright (C) 2005-2011 Red Hat, Inc.
 ## See COPYING.LIB for the License of this software
@ -47,10 +47,10 @@ Index: libvirt-1.0.1/examples/apparmor/Makefile.am
 +	rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
 +
 +endif
-Index: libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-1.0.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
 ===================================================================
 --- /dev/null
-+++ libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-1.0.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@
 +# Last Modified: Fri Aug 19 11:21:48 2011
 +#include <tunables/global>
@ -92,9 +92,9 @@ Index: libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
 +  /var/lib/kvm/images/ r,
 +  /var/lib/kvm/images/** r,
 +}
-Index: libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-1.0.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 ===================================================================
--- libvirt-1.0.1.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-1.0.2.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 +++ /dev/null
@@ -1,38 +0,0 @@
 -# Last Modified: Mon Apr  5 15:10:27 2010
@ -135,9 +135,9 @@ Index: libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 -  /var/lib/libvirt/images/ r,
 -  /var/lib/libvirt/images/** r,
 -}
-Index: libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-1.0.2/examples/apparmor/usr.sbin.libvirtd
 ===================================================================
--- libvirt-1.0.1.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-1.0.2.orig/examples/apparmor/usr.sbin.libvirtd
 +++ /dev/null
@@ -1,52 +0,0 @@
 -# Last Modified: Mon Apr  5 15:03:58 2010
@ -192,10 +192,10 @@ Index: libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd
 -  change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
 -
 -}
-Index: libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-1.0.2/examples/apparmor/usr.sbin.libvirtd.in
 ===================================================================
 --- /dev/null
-+++ libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd.in
+++ libvirt-1.0.2/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,57 @@
 +# Last Modified: Fri Aug 19 11:20:36 2011
 +#include <tunables/global>
@ -254,10 +254,10 @@ Index: libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd.in
 +  change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
 +
 +}
-Index: libvirt-1.0.1/examples/apparmor/libvirt-qemu
+Index: libvirt-1.0.2/examples/apparmor/libvirt-qemu
 ===================================================================
--- libvirt-1.0.1.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.0.1/examples/apparmor/libvirt-qemu
+--- libvirt-1.0.2.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.0.2/examples/apparmor/libvirt-qemu
@@ -52,6 +52,7 @@
   # access to firmware's etc
   /usr/share/kvm/** r,
--- a/libvirt-1.0.1.tar.bz2
+++ b/libvirt-1.0.1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a53542204dbcc252676bc07e24155507924ae67a130aadd3390a04b8a5c27e54
-size 16039800
--- a/libvirt-1.0.2.tar.bz2
+++ b/libvirt-1.0.2.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8e8c9d18b7d105ee45342a7a5ac5fc1580057f8a6346b322ba3404888773fde
+size 16375455
--- a/libvirt-guests-init-script.patch
+++ b/libvirt-guests-init-script.patch
@ -1,9 +1,9 @@
 Adjust libvirt-guests init files to conform to SUSE standards

-Index: libvirt-1.0.1/tools/libvirt-guests.init.in
+Index: libvirt-1.0.2/tools/libvirt-guests.init.in
 ===================================================================
--- libvirt-1.0.1.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.0.1/tools/libvirt-guests.init.in
+--- libvirt-1.0.2.orig/tools/libvirt-guests.init.in
+++ libvirt-1.0.2/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@
 # the following is the LSB init header
 #
@ -28,10 +28,10 @@ Index: libvirt-1.0.1/tools/libvirt-guests.init.in
 ### END INIT INFO
 
 # the following is chkconfig init header
-Index: libvirt-1.0.1/tools/libvirt-guests.sh.in
+Index: libvirt-1.0.2/tools/libvirt-guests.sh.in
 ===================================================================
--- libvirt-1.0.1.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.0.1/tools/libvirt-guests.sh.in
+--- libvirt-1.0.2.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.0.2/tools/libvirt-guests.sh.in
@@ -1,13 +1,12 @@
 #!/bin/sh
 
@ -187,10 +187,10 @@ Index: libvirt-1.0.1/tools/libvirt-guests.sh.in
 esac
 -exit $RETVAL
 +rc_exit
-Index: libvirt-1.0.1/tools/libvirt-guests.sysconf
+Index: libvirt-1.0.2/tools/libvirt-guests.sysconf
 ===================================================================
--- libvirt-1.0.1.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.0.1/tools/libvirt-guests.sysconf
+--- libvirt-1.0.2.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.0.2/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
 +## Path: System/Virtualization/libvirt-guests
 +
--- a/libvirt-suse-netcontrol.patch
+++ b/libvirt-suse-netcontrol.patch
@ -1,55 +1,16 @@
-Index: libvirt-1.0.1/configure.ac
+Index: libvirt-1.0.2/configure.ac
 ===================================================================
--- libvirt-1.0.1.orig/configure.ac
-+++ libvirt-1.0.1/configure.ac
-@@ -102,6 +102,7 @@ AVAHI_REQUIRED="0.6.0"
- POLKIT_REQUIRED="0.6"
- PARTED_REQUIRED="1.8.0"
- NETCF_REQUIRED="0.1.4"
-+NETCONTROL_REQUIRED="0.2.0"
- UDEV_REQUIRED=145
- PCIACCESS_REQUIRED=0.10.0
- XMLRPC_REQUIRED=1.14.0
-@@ -2005,6 +2006,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
- AC_SUBST([NETCF_CFLAGS])
- AC_SUBST([NETCF_LIBS])
- 
-+AC_ARG_WITH([netcontrol],
-+  AC_HELP_STRING([--with-netcontrol], [SUSE netcontrol support to configure physical host network interfaces @<:@default=check@:>@]),
-+    [],
-+    [test "$with_netcontrol" = "yes" && with_netcontrol=no || with_netcontrol=check])
-+
-+NETCONTROL_CFLAGS=
-+NETCONTROL_LIBS=
-+if test "$with_netcf" = "yes"; then
-+  if test "$with_netcontrol" = "yes" || test "$with_netcontrol" = "check"; then
-+    AC_MSG_WARN([netcf and netcontrol cannot be used together, disabling netcontrol])
-+    with_netcontrol=no
-+  fi
-+fi
-+
-+if test "$with_netcontrol" = "yes" || test "$with_netcontrol" = "check"; then
-+  PKG_CHECK_MODULES(NETCONTROL, netcontrol >= $NETCONTROL_REQUIRED,
-+    [with_netcontrol=yes], [
-+    if test "$with_netcontrol" = "check" ; then
-+      with_netcontrol=no
-+    else
-+      AC_MSG_ERROR(
-+        [You must install netcontrol >= $NETCONTROL_REQUIRED to compile libvirt])
-+    fi
-+  ])
-+  if test "$with_netcontrol" = "yes" ; then
-+    AC_DEFINE_UNQUOTED([WITH_NETCONTROL], 1,
-+      [whether libnetcontrol is available to configure physical host network interfaces])
-+  fi
-+fi
-+AM_CONDITIONAL([WITH_NETCONTROL], [test "$with_netcontrol" = "yes"])
-+AC_SUBST([NETCONTROL_CFLAGS])
-+AC_SUBST([NETCONTROL_LIBS])
- 
- AC_ARG_WITH([secrets],
-   AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes])
-@@ -2863,11 +2896,12 @@ if test "$with_libvirtd" = "no" ; then
+--- libvirt-1.0.2.orig/configure.ac
+++ libvirt-1.0.2/configure.ac
+@@ -153,6 +153,7 @@ LIBVIRT_CHECK_DBUS
+ LIBVIRT_CHECK_FUSE
+ LIBVIRT_CHECK_HAL
+ LIBVIRT_CHECK_NETCF
+LIBVIRT_CHECK_NETCONTROL
+ LIBVIRT_CHECK_NUMACTL
+ LIBVIRT_CHECK_OPENWSMAN
+ LIBVIRT_CHECK_PCIACCESS
+@@ -2199,11 +2200,12 @@ if test "$with_libvirtd" = "no" ; then
   with_interface=no
 fi
 
@ -65,23 +26,19 @@ Index: libvirt-1.0.1/configure.ac
 esac
 
 if test "$with_interface" = "yes" ; then
-@@ -3253,6 +3287,11 @@ AC_MSG_NOTICE([   netcf: $NETCF_CFLAGS $
- else
- AC_MSG_NOTICE([   netcf: no])
- fi
-+if test "$with_netcontrol" = "yes" ; then
-+AC_MSG_NOTICE([ netctrl: $NETCONTROL_CFLAGS $NETCONTROL_LIBS])
-+else
-+AC_MSG_NOTICE([ netctrl: no])
-+fi
- if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then
- AC_MSG_NOTICE([    pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS])
- else
-Index: libvirt-1.0.1/src/Makefile.am
+@@ -2473,6 +2475,7 @@ LIBVIRT_RESULT_DBUS
+ LIBVIRT_RESULT_FUSE
+ LIBVIRT_RESULT_HAL
+ LIBVIRT_RESULT_NETCF
+LIBVIRT_RESULT_NETCONTROL
+ LIBVIRT_RESULT_NUMACTL
+ LIBVIRT_RESULT_OPENWSMAN
+ LIBVIRT_RESULT_PCIACCESS
+Index: libvirt-1.0.2/src/Makefile.am
 ===================================================================
--- libvirt-1.0.1.orig/src/Makefile.am
-+++ libvirt-1.0.1/src/Makefile.am
-@@ -617,6 +617,10 @@ if WITH_NETCF
+--- libvirt-1.0.2.orig/src/Makefile.am
+++ libvirt-1.0.2/src/Makefile.am
+@@ -633,6 +633,10 @@ if WITH_NETCF
 INTERFACE_DRIVER_SOURCES +=					\
 		interface/interface_backend_netcf.c
 endif
@ -89,10 +46,10 @@ Index: libvirt-1.0.1/src/Makefile.am
 +INTERFACE_DRIVER_SOURCES +=					\
 +		interface/interface_backend_netcf.c
 +endif
- if HAVE_UDEV
+ if WITH_UDEV
 INTERFACE_DRIVER_SOURCES +=					\
 		interface/interface_backend_udev.c
-@@ -1105,11 +1109,16 @@ if WITH_NETCF
+@@ -1121,11 +1125,16 @@ if WITH_NETCF
 libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
 libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
 else
@ -100,7 +57,7 @@ Index: libvirt-1.0.1/src/Makefile.am
 +libvirt_driver_interface_la_CFLAGS += $(NETCONTROL_CFLAGS)
 +libvirt_driver_interface_la_LIBADD += $(NETCONTROL_LIBS)
 +else
- if HAVE_UDEV
+ if WITH_UDEV
 libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
 libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
 endif
@ -109,23 +66,23 @@ Index: libvirt-1.0.1/src/Makefile.am
 if WITH_DRIVER_MODULES
 libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
 libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
-Index: libvirt-1.0.1/tools/virsh.c
+Index: libvirt-1.0.2/tools/virsh.c
 ===================================================================
--- libvirt-1.0.1.orig/tools/virsh.c
-+++ libvirt-1.0.1/tools/virsh.c
-@@ -2730,6 +2730,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-1.0.2.orig/tools/virsh.c
+++ libvirt-1.0.2/tools/virsh.c
+@@ -2741,6 +2741,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+     vshPrint(ctl, " Interface");
+ # if defined(WITH_NETCF)
     vshPrint(ctl, " netcf");
- # elif defined(HAVE_UDEV)
-     vshPrint(ctl, " udev");
 +# elif defined(WITH_NETCONTROL)
 +    vshPrint(ctl, " netcontrol");
+ # elif defined(WITH_UDEV)
+     vshPrint(ctl, " udev");
 # endif
- #endif
- #ifdef WITH_NWFILTER
-Index: libvirt-1.0.1/src/interface/interface_backend_netcf.c
+Index: libvirt-1.0.2/src/interface/interface_backend_netcf.c
 ===================================================================
--- libvirt-1.0.1.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.0.1/src/interface/interface_backend_netcf.c
+--- libvirt-1.0.2.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.0.2/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
 
 #include <config.h>
@ -138,7 +95,7 @@ Index: libvirt-1.0.1/src/interface/interface_backend_netcf.c
 +# include <netcf.h>
 +#endif
 
- #include "virterror_internal.h"
+ #include "virerror.h"
 #include "datatypes.h"
@@ -52,6 +57,37 @@ static void interfaceDriverUnlock(struct
     virMutexUnlock(&driver->lock);
@ -189,11 +146,11 @@ Index: libvirt-1.0.1/src/interface/interface_backend_netcf.c
     /* open netcf */
     if (ncf_init(&driverState->netcf, NULL) != 0)
     {
-Index: libvirt-1.0.1/src/interface/interface_driver.c
+Index: libvirt-1.0.2/src/interface/interface_driver.c
 ===================================================================
--- libvirt-1.0.1.orig/src/interface/interface_driver.c
-+++ libvirt-1.0.1/src/interface/interface_driver.c
-@@ -28,8 +28,14 @@ interfaceRegister(void) {
+--- libvirt-1.0.2.orig/src/interface/interface_driver.c
+++ libvirt-1.0.2/src/interface/interface_driver.c
+@@ -28,8 +28,15 @@ interfaceRegister(void) {
     if (netcfIfaceRegister() == 0)
         return 0;
 #endif /* WITH_NETCF */
@ -203,9 +160,50 @@ Index: libvirt-1.0.1/src/interface/interface_driver.c
 +    if (netcfIfaceRegister() == 0)
 +        return 0;
 +#endif /* WITH_NETCONTROL */
- #if HAVE_UDEV
+ #if WITH_UDEV
 -    /* If there's no netcf or it failed to load, register the udev backend */
-+    /* If there's no netcf or netcontrol, or it failed to load, register the udev backend */
+    /* If there's no netcf or netcontrol, or it failed to load, register the
+       udev backend */
     if (udevIfaceRegister() == 0)
         return 0;
- #endif /* HAVE_UDEV */
+ #endif /* WITH_UDEV */
+Index: libvirt-1.0.2/m4/virt-netcontrol.m4
+===================================================================
+--- /dev/null
+++ libvirt-1.0.2/m4/virt-netcontrol.m4
+@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
+dnl Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_CHECK_NETCONTROL],[
+  LIBVIRT_CHECK_PKG([NETCONTROL], [netcontrol], [0.2.0])
+
+  if test "$with_netcontrol" = "yes" ; then
+    old_CFLAGS="$CFLAGS"
+    old_LIBS="$CFLAGS"
+    CFLAGS="$CFLAGS $NETCONTROL_CFLAGS"
+    LIBS="$LIBS $NETCONTROL_LIBS"
+    CFLAGS="$old_CFLAGS"
+    LIBS="$old_LIBS"
+  fi
+])
+
+AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
+  LIBVIRT_RESULT_LIB([NETCONTROL])
+])
--- a/libvirt.changes
+++ b/libvirt.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jan 30 11:28:32 MST 2013 - jfehlig@suse.com
+
+- Update to libvirt 1.0.2
+  - LXC improvements
+  - S390 architecture improvements
+  - Power architecture improvements
+  - large Coverity report cleanups and associated bug fixes
+  - virTypedParams* APIs to help with those data structures
+  - libxenlight driver improvements
+  - Drop upstream patches: 68e7bc45-libxl-link-fix.patch,
+    462a6962-script-fixes1.patch, cb854b8f-script-fixes2.patch,
+    5ec4b22b-script-fixes3.patch, a1fd56cb-script-fixes4.patch,
+    66ff2ddc-virtlockd-systemd-file-perms.patch
+
 -------------------------------------------------------------------
 Mon Jan 21 20:59:16 MST 2013 - jfehlig@suse.com

--- a/libvirt.spec
+++ b/libvirt.spec
@ -337,7 +337,7 @@ BuildRequires:  systemd

 Name:           libvirt
 Url:            http://libvirt.org/
-Version:        1.0.1
+Version:        1.0.2
 Release:        0
 Summary:        A C toolkit to interact with the virtualization capabilities of Linux
 License:        LGPL-2.1+
@ -417,12 +417,6 @@ Source1:        libvirtd.init
 Source2:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 # Upstream patches
-Patch0:         66ff2ddc-virtlockd-systemd-file-perms.patch
-Patch1:         462a6962-script-fixes1.patch
-Patch2:         cb854b8f-script-fixes2.patch
-Patch3:         5ec4b22b-script-fixes3.patch
-Patch4:         a1fd56cb-script-fixes4.patch
-Patch5:         68e7bc45-libxl-link-fix.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       clone.patch
@ -562,12 +556,6 @@ Authors:

 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 %patch100 -p1
 %patch101
 %patch102 -p1
@ -1088,6 +1076,7 @@ fi
 %dir %{_datadir}/libvirt/api/
 %{_datadir}/libvirt/api/libvirt-api.xml
 %{_datadir}/libvirt/api/libvirt-qemu-api.xml
+%{_datadir}/libvirt/api/libvirt-lxc-api.xml

 %files doc
 %defattr(-, root, root)
@ -1125,7 +1114,8 @@ fi
 %defattr(-, root, root)
 %doc %{_docdir}/%{name}-python
 %{py_sitedir}/libvirt.py*
-%{_libdir}/python*/site-packages/libvirt_qemu.py*
+%{py_sitedir}/libvirt_qemu.py*
+%{py_sitedir}/libvirt_lxc.py*
 %{py_sitedir}/libvirtmod*
 %endif

--- a/libvirtd-defaults.patch
+++ b/libvirtd-defaults.patch
@ -1,7 +1,7 @@
-Index: libvirt-1.0.1/daemon/libvirtd.conf
+Index: libvirt-1.0.2/daemon/libvirtd.conf
 ===================================================================
--- libvirt-1.0.1.orig/daemon/libvirtd.conf
-+++ libvirt-1.0.1/daemon/libvirtd.conf
+--- libvirt-1.0.2.orig/daemon/libvirtd.conf
+++ libvirt-1.0.2/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
 # It is necessary to setup a CA and issue server certificates before
 # using this capability.
@ -13,10 +13,10 @@ Index: libvirt-1.0.1/daemon/libvirtd.conf
 
 # Listen for unencrypted TCP connections on the public TCP/IP port.
 # NB, must pass the --listen flag to the libvirtd process for this to
-Index: libvirt-1.0.1/daemon/libvirtd-config.c
+Index: libvirt-1.0.2/daemon/libvirtd-config.c
 ===================================================================
--- libvirt-1.0.1.orig/daemon/libvirtd-config.c
-+++ libvirt-1.0.1/daemon/libvirtd-config.c
+--- libvirt-1.0.2.orig/daemon/libvirtd-config.c
+++ libvirt-1.0.2/daemon/libvirtd-config.c
@@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT
         return NULL;
     }
--- a/libvirtd-init-script.patch
+++ b/libvirtd-init-script.patch
@ -1,9 +1,9 @@
 Adjust libvirtd sysconfig file to conform to SUSE standards

-Index: libvirt-1.0.1/daemon/libvirtd.sysconf
+Index: libvirt-1.0.2/daemon/libvirtd.sysconf
 ===================================================================
--- libvirt-1.0.1.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.0.1/daemon/libvirtd.sysconf
+--- libvirt-1.0.2.orig/daemon/libvirtd.sysconf
+++ libvirt-1.0.2/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
 +## Path: System/Virtualization/libvirt
 +
--- a/relax-qemu-usergroup-check.patch
+++ b/relax-qemu-usergroup-check.patch
@ -7,11 +7,11 @@ drivers as loadable modules instead of built-in to the
 daemon.  Then the qemu driver would only be loaded when needed,
 which would never be the case on a xen-only configuration.

-Index: libvirt-1.0.1/src/qemu/qemu_conf.c
+Index: libvirt-1.0.2/src/qemu/qemu_conf.c
 ===================================================================
--- libvirt-1.0.1.orig/src/qemu/qemu_conf.c
-+++ libvirt-1.0.1/src/qemu/qemu_conf.c
-@@ -252,7 +252,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt
+--- libvirt-1.0.2.orig/src/qemu/qemu_conf.c
+++ libvirt-1.0.2/src/qemu/qemu_conf.c
+@@ -247,7 +247,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt
         goto no_memory;
 
     if (virGetUserID(user, &driver->user) < 0)
@ -20,7 +20,7 @@ Index: libvirt-1.0.1/src/qemu/qemu_conf.c
 
     p = virConfGetValue(conf, "group");
     CHECK_TYPE("group", VIR_CONF_STRING);
-@@ -260,7 +260,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt
+@@ -255,7 +255,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt
         goto no_memory;
 
     if (virGetGroupID(group, &driver->group) < 0)
--- a/suse-qemu-conf.patch
+++ b/suse-qemu-conf.patch
@ -1,7 +1,7 @@
-Index: libvirt-1.0.1/src/qemu/qemu.conf
+Index: libvirt-1.0.2/src/qemu/qemu.conf
 ===================================================================
--- libvirt-1.0.1.orig/src/qemu/qemu.conf
-+++ libvirt-1.0.1/src/qemu/qemu.conf
+--- libvirt-1.0.2.orig/src/qemu/qemu.conf
+++ libvirt-1.0.2/src/qemu/qemu.conf
@@ -169,7 +169,16 @@
 # a special value; security_driver can be set to that value in
 # isolation, but it cannot appear in a list of drivers.
--- a/virtlockd-init-script.patch
+++ b/virtlockd-init-script.patch
@ -1,9 +1,9 @@
 Adjust virtlockd init files to conform to SUSE standards

-Index: libvirt-1.0.1/src/locking/virtlockd.sysconf
+Index: libvirt-1.0.2/src/locking/virtlockd.sysconf
 ===================================================================
--- libvirt-1.0.1.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.0.1/src/locking/virtlockd.sysconf
+--- libvirt-1.0.2.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.0.2/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
 +## Path: System/Virtualization/virtlockd
 +
@ -12,10 +12,10 @@ Index: libvirt-1.0.1/src/locking/virtlockd.sysconf
 #
 # Pass extra arguments to virtlockd
 #VIRTLOCKD_ARGS=
-Index: libvirt-1.0.1/src/locking/virtlockd.init.in
+Index: libvirt-1.0.2/src/locking/virtlockd.init.in
 ===================================================================
--- libvirt-1.0.1.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.0.1/src/locking/virtlockd.init.in
+--- libvirt-1.0.2.orig/src/locking/virtlockd.init.in
+++ libvirt-1.0.2/src/locking/virtlockd.init.in
@@ -4,11 +4,13 @@
 # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
 #
--- a/xen-name-for-devid.patch
+++ b/xen-name-for-devid.patch
@ -13,10 +13,10 @@ Date:   Wed Jan 27 16:11:41 2010 -0700
    This approach allows removing a disk when domain is inactive.  We
    obviously can't search xenstore when the domain is inactive.

-Index: libvirt-1.0.1/src/xen/xend_internal.c
+Index: libvirt-1.0.2/src/xen/xend_internal.c
 ===================================================================
--- libvirt-1.0.1.orig/src/xen/xend_internal.c
-+++ libvirt-1.0.1/src/xen/xend_internal.c
+--- libvirt-1.0.2.orig/src/xen/xend_internal.c
+++ libvirt-1.0.2/src/xen/xend_internal.c
@@ -61,6 +61,7 @@
 
 static int
@ -25,7 +25,7 @@ Index: libvirt-1.0.1/src/xen/xend_internal.c
                   virDomainDeviceDefPtr dev,
                   char *class,
                   char *ref,
-@@ -2764,7 +2765,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
+@@ -2760,7 +2761,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
 
     sexpr = virBufferContentAndReset(&buf);
 
@ -34,7 +34,7 @@ Index: libvirt-1.0.1/src/xen/xend_internal.c
         /* device doesn't exist, define it */
         ret = xend_op(domain->conn, domain->name, "op", "device_create",
                       "config", sexpr, NULL);
-@@ -2885,7 +2886,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
+@@ -2881,7 +2882,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
 
     sexpr = virBufferContentAndReset(&buf);
 
@ -43,7 +43,7 @@ Index: libvirt-1.0.1/src/xen/xend_internal.c
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("requested device does not exist"));
         goto cleanup;
-@@ -2980,7 +2981,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
+@@ -2976,7 +2977,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
                                         def, xml, VIR_DOMAIN_XML_INACTIVE)))
         goto cleanup;
 
@ -52,7 +52,7 @@ Index: libvirt-1.0.1/src/xen/xend_internal.c
         goto cleanup;
 
     if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
-@@ -3926,6 +3927,7 @@ struct xenUnifiedDriver xenDaemonDriver
+@@ -3924,6 +3925,7 @@ struct xenUnifiedDriver xenDaemonDriver
  */
 static int
 virDomainXMLDevID(virDomainPtr domain,
@ -60,7 +60,7 @@ Index: libvirt-1.0.1/src/xen/xend_internal.c
                   virDomainDeviceDefPtr dev,
                   char *class,
                   char *ref,
-@@ -3934,8 +3936,12 @@ virDomainXMLDevID(virDomainPtr domain,
+@@ -3932,8 +3934,12 @@ virDomainXMLDevID(virDomainPtr domain,
     xenUnifiedPrivatePtr priv = domain->conn->privateData;
     char *xref;
     char *tmp;
@ -73,7 +73,7 @@ Index: libvirt-1.0.1/src/xen/xend_internal.c
         if (dev->data.disk->driverName &&
             STREQ(dev->data.disk->driverName, "tap"))
             strcpy(class, "tap");
-@@ -3945,19 +3951,21 @@ virDomainXMLDevID(virDomainPtr domain,
+@@ -3943,19 +3949,21 @@ virDomainXMLDevID(virDomainPtr domain,
         else
             strcpy(class, "vbd");
 
--- a/xen-pv-cdrom.patch
+++ b/xen-pv-cdrom.patch
@ -1,7 +1,7 @@
-Index: libvirt-1.0.1/src/xenxs/xen_sxpr.c
+Index: libvirt-1.0.2/src/xenxs/xen_sxpr.c
 ===================================================================
--- libvirt-1.0.1.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.0.1/src/xenxs/xen_sxpr.c
+--- libvirt-1.0.2.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.2/src/xenxs/xen_sxpr.c
@@ -341,7 +341,7 @@ error:
 static int
 xenParseSxprDisks(virDomainDefPtr def,