Date: Friday, January 28, 2022 @ 01:15:14 Author: svenstaro Revision: 1118020
upgpkg: libvirt 1:8.0.0-2: Various fixes from FS#73522 Modified: libvirt/trunk/PKGBUILD Deleted: libvirt/trunk/Changelog libvirt/trunk/find_programs.ini libvirt/trunk/libvirt.install -------------------+ Changelog | 1 - PKGBUILD | 18 ++++++++++-------- find_programs.ini | 5 ----- libvirt.install | 7 ------- 4 files changed, 10 insertions(+), 21 deletions(-) Deleted: Changelog =================================================================== --- Changelog 2022-01-27 22:55:36 UTC (rev 1118019) +++ Changelog 2022-01-28 01:15:14 UTC (rev 1118020) @@ -1 +0,0 @@ -https://libvirt.org/news.html Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-27 22:55:36 UTC (rev 1118019) +++ PKGBUILD 2022-01-28 01:15:14 UTC (rev 1118020) @@ -7,12 +7,11 @@ pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct libvirt-storage-rbd) epoch=1 pkgver=8.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('x86_64') url="https://libvirt.org/"; license=('LGPL' 'GPL3') #libvirt_parthelper links to libparted which is GPL3 only -install=libvirt.install depends=('libpciaccess' 'yajl' 'fuse2' 'gnutls' 'parted' 'libssh' 'libxml2' 'numactl' 'polkit') makedepends=('meson' 'libxslt' 'python-docutils' 'lvm2' 'open-iscsi' 'libiscsi' 'ceph-libs' 'glusterfs' 'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2' 'qemu-headless') @@ -95,9 +94,13 @@ 'etc/logrotate.d/libvirtd.qemu' 'etc/sasl2/libvirt.conf' ) -source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc}) +source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc} + "$pkgname"-fix-snapshot-revert.patch::https://gitlab.com/libvirt/libvirt/-/commit/76deb65.patch + "$pkgname"-fix-virProcessGetStatInfo.patch::https://gitlab.com/libvirt/libvirt/-/commit/105dace.patch) sha256sums=('51e6e8ff04bafe96d7e314b213dcd41fb1163d9b4f0f75cdab01e663728f4cf6' - 'SKIP') + 'SKIP' + '06164af980ab2ece221de494f4da5a0d38c22c0f1ac527dd53aed2e2dbf1ed48' + 'a7b0f7b2941c0fed41205c8db3d3d37ed9ccee910e44196d2d2bf5aa0eb986d8') validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <[email protected]> prepare() { @@ -112,7 +115,9 @@ src/qemu/qemu.conf \ src/qemu/test_libvirtd_qemu.aug.in - sed -i 's/notify/simple/' src/remote/libvirtd.service.in + # bugs fixed post-release + patch -Np1 < ../libvirt-fix-snapshot-revert.patch + patch -Np1 < ../libvirt-fix-virProcessGetStatInfo.patch } build() { @@ -166,9 +171,6 @@ chmod 600 "$pkgdir"/etc/libvirt/nwfilter/*.xml \ "$pkgdir/etc/libvirt/qemu/networks/default.xml" - # Strip auto-generated UUID, so it will be generated per-install. (reproducible builds) - sed -i 's|<uuid>.*</uuid>|<uuid></uuid>|' "$pkgdir"/etc/libvirt/qemu/networks/default.xml - rm -rf \ "$pkgdir/run" \ "$pkgdir/var/lib/libvirt/qemu" \ Deleted: find_programs.ini =================================================================== --- find_programs.ini 2022-01-27 22:55:36 UTC (rev 1118019) +++ find_programs.ini 2022-01-28 01:15:14 UTC (rev 1118020) @@ -1,5 +0,0 @@ -[binaries] -# these don't exist in the official repos, but if users get them some other -# way then this is the expected path for them -zfs = '/usr/bin/zfs' -zpool = '/usr/bin/zpool' Deleted: libvirt.install =================================================================== --- libvirt.install 2022-01-27 22:55:36 UTC (rev 1118019) +++ libvirt.install 2022-01-28 01:15:14 UTC (rev 1118020) @@ -1,7 +0,0 @@ -post_install() { - if [[ -f /etc/libvirt/qemu/networks/default.xml ]] - then - UUID=$(/usr/bin/uuidgen) - sed -i "s|<uuid></uuid>|<uuid>$UUID</uuid>|" /etc/libvirt/qemu/networks/default.xml - fi -}
