[arch-commits] Commit in libvirt/trunk (3 files)

[Sergej Pupykin]

    Date: Monday, September 29, 2014 @ 13:26:51
  Author: spupykin
Revision: 119771

upgpkg: libvirt 1.2.8-2

upd

Modified:
  libvirt/trunk/PKGBUILD
  libvirt/trunk/libvirtd-guests.conf.d
  libvirt/trunk/libvirtd.conf.d

------------------------+
 PKGBUILD               |   11 +++++++----
 libvirtd-guests.conf.d |   20 +++++++++-----------
 libvirtd.conf.d        |    4 +---
 3 files changed, 17 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-29 10:57:38 UTC (rev 119770)
+++ PKGBUILD	2014-09-29 11:26:51 UTC (rev 119771)
@@ -4,7 +4,7 @@
 
 pkgname=libvirt
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -59,12 +59,14 @@
 	'etc/sasl2/libvirt.conf')
 install="libvirt.install"
 source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
+	"3e745e8f775dfe6f64f18b5c2fe4791b35d3546b.patch::http://libvirt.org/git/?p=libvirt.git;a=patch;h=3e745e8f775dfe6f64f18b5c2fe4791b35d3546b"
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d)
 md5sums=('75114991290f7c8f01dd5223431b9c00'
-         '3ed0e24f5b5e25bf553f5427d64915e6'
-         '0a96ed876ffb1fcb9dff5a9b3a609c1e'
+         '695e138afb1edf31bb650d4ecf2bdfe8'
+         '5e31269067dbd12ca871234450bb66bb'
+         '384fff96c6248d4f020f6fa66c32b357'
          '020971887442ebbf1b6949e031c8dd3f')
 
 prepare() {
@@ -75,6 +77,8 @@
     sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
+  patch -p1 <$srcdir/3e745e8f775dfe6f64f18b5c2fe4791b35d3546b.patch
+
   sed -i 's|/sysconfig/|/conf.d/|g' \
     daemon/libvirtd.service.in \
     tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
@@ -118,4 +122,3 @@
 	"$pkgdir"/etc/sysconfig \
 	"$pkgdir"/etc/rc.d
 }
-

Modified: libvirtd-guests.conf.d
===================================================================
--- libvirtd-guests.conf.d	2014-09-29 10:57:38 UTC (rev 119770)
+++ libvirtd-guests.conf.d	2014-09-29 11:26:51 UTC (rev 119771)
@@ -1,11 +1,9 @@
-LIBVIRTD_STOP_ACTION=suspend
-
-#LIBVIRTD_URI="-c qemu+ssh://user@host/system"
-LIBVIRTD_URI=""
-
-#LIBVIRTD_BYPASS_CACHE="--bypass-cache"
-LIBVIRTD_BYPASS_CACHE=""
-
-LIBVIRTD_START_DELAY=0
-
-LIBVIRTD_SHUTDOWN_TIMEOUT=60
+BYPASS_CACHE=0
+CONNECT_RETRIES=10
+ON_BOOT=start
+ON_SHUTDOWN=suspend
+PARALLEL_SHUTDOWN=0
+RETRIES_SLEEP=1
+SHUTDOWN_TIMEOUT=300
+START_DELAY=0
+URIS=default

Modified: libvirtd.conf.d
===================================================================
--- libvirtd.conf.d	2014-09-29 10:57:38 UTC (rev 119770)
+++ libvirtd.conf.d	2014-09-29 11:26:51 UTC (rev 119771)
@@ -1,3 +1 @@
-LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf"
-LIBVIRTD_ARGS="-p /var/run/libvirtd.pid"
-KRB5_KTNAME="/etc/libvirt/krb5.tab"
+LIBVIRTD_ARGS=""