From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1BCB1138359 for ; Tue, 21 Jul 2020 18:11:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54F02E08E8; Tue, 21 Jul 2020 18:11:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C2A6E08E8 for ; Tue, 21 Jul 2020 18:11:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B51BC34F29B for ; Tue, 21 Jul 2020 18:11:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F24452D3 for ; Tue, 21 Jul 2020 18:11:14 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1595355044.c6543a38b2ab1f2372a3bc520eabb23c331cd347.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/Manifest app-emulation/libvirt/files/libvirt-6.2.0-do-not-use-sysconfig.patch app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch app-emulation/libvirt/libvirt-6.5.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ app-emulation/libvirt/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c6543a38b2ab1f2372a3bc520eabb23c331cd347 X-VCS-Branch: master Date: Tue, 21 Jul 2020 18:11:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22111e48-ecd5-431e-b509-57a44100a6fd X-Archives-Hash: 4a1622079b658be5ac28761d24044071 commit: c6543a38b2ab1f2372a3bc520eabb23c331cd347 Author: Marek Szuba gentoo org> AuthorDate: Tue Jul 21 17:54:54 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Jul 21 18:10:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6543a38 app-emulation/libvirt: bump to 6.5.0 Approved by tamiko on IRC. Closes: https://bugs.gentoo.org/721620 Signed-off-by: Marek Szuba gentoo.org> app-emulation/libvirt/Manifest | 1 + ...ch => libvirt-6.5.0-do-not-use-sysconfig.patch} | 118 ++++----------------- .../{libvirt-9999.ebuild => libvirt-6.5.0.ebuild} | 9 +- app-emulation/libvirt/libvirt-9999.ebuild | 4 +- 4 files changed, 26 insertions(+), 106 deletions(-) diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 2a98b7178af..efead371cab 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1 +1,2 @@ DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4 +DIST libvirt-6.5.0.tar.xz 9407160 BLAKE2B 592aace555a3b72311cb430784587180fa7dbf74f75509cd8373a046339b9c4c0707bf530dd2d06146d78a85f8af3dba5d0b146ecec180d3cc4d3bf78c19da61 SHA512 30a032270304b97945ff2c5087c72c2f5510634186f2eaf7c3d834a72cddcaec97bbe5ccc86802728a59f4c80b5bb54757400683df5f20175757cfe07ce67453 diff --git a/app-emulation/libvirt/files/libvirt-6.2.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch similarity index 58% rename from app-emulation/libvirt/files/libvirt-6.2.0-do-not-use-sysconfig.patch rename to app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch index 3dc2588b7bf..74b5954a0cf 100644 --- a/app-emulation/libvirt/files/libvirt-6.2.0-do-not-use-sysconfig.patch +++ b/app-emulation/libvirt/files/libvirt-6.5.0-do-not-use-sysconfig.patch @@ -1,37 +1,6 @@ -From c378ab3e7fe84ac69ad787c099f24fd32dbbf6e4 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Michal Privoznik -Date: Sun, 5 Apr 2020 14:41:45 +0200 -Subject: [PATCH] Do not use sysconfig - -Signed-off-by: Michal Privoznik ---- - src/Makefile.am | 21 ++------------------- - src/interface/virtinterfaced.service.in | 1 - - src/libxl/virtxend.service.in | 1 - - src/locking/virtlockd.service.in | 3 +-- - src/logging/virtlogd.service.in | 3 +-- - src/lxc/virtlxcd.service.in | 1 - - src/network/virtnetworkd.service.in | 1 - - src/node_device/virtnodedevd.service.in | 1 - - src/nwfilter/virtnwfilterd.service.in | 1 - - src/qemu/virtqemud.service.in | 1 - - src/remote/libvirtd.service.in | 3 +-- - src/remote/virtproxyd.service.in | 1 - - src/secret/virtsecretd.service.in | 1 - - src/storage/virtstoraged.service.in | 1 - - src/vbox/virtvboxd.service.in | 1 - - src/vz/virtvzd.service.in | 1 - - tools/Makefile.am | 13 ++----------- - tools/libvirt-guests.service.in | 2 +- - tools/libvirt-guests.sysconf | 6 ++++++ - 19 files changed, 14 insertions(+), 49 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 12dd6b80e1..10f1bb769d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -522,23 +522,6 @@ EXTRA_DIST += \ +@@ -522,23 +522,6 @@ $(SYSCONF_FILES) \ $(OPENRC_CONF_FILES) @@ -55,7 +24,7 @@ index 12dd6b80e1..10f1bb769d 100644 OPENRC_CONF_DIR = $(sysconfdir)/conf.d install-openrc-conf: -@@ -604,14 +587,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system +@@ -604,14 +587,14 @@ BUILT_SOURCES += $(SYSTEMD_UNIT_FILES) DISTCLEANFILES += $(SYSTEMD_UNIT_FILES) @@ -72,11 +41,9 @@ index 12dd6b80e1..10f1bb769d 100644 rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in -index 73d409b81b..2d2c0138f5 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -84,11 +51,9 @@ index 73d409b81b..2d2c0138f5 100644 ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in -index a863917467..5b2d16f627 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in -@@ -17,7 +17,6 @@ ConditionPathExists=/proc/xen/capabilities +@@ -17,7 +17,6 @@ [Service] Type=notify @@ -96,11 +61,9 @@ index a863917467..5b2d16f627 100644 ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index e7f8057c06..2449b201d9 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8) +@@ -7,8 +7,7 @@ Documentation=https://libvirt.org [Service] @@ -110,11 +73,9 @@ index e7f8057c06..2449b201d9 100644 ExecReload=/bin/kill -USR1 $MAINPID # Loosing the locks is a really bad thing that will # cause the machine to be fenced (rebooted), so make -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index daff48e67d..43736191d5 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) +@@ -7,8 +7,7 @@ Documentation=https://libvirt.org [Service] @@ -124,11 +85,9 @@ index daff48e67d..43736191d5 100644 ExecReload=/bin/kill -USR1 $MAINPID # Loosing the logs is a really bad thing that will # cause the machine to be fenced (rebooted), so make -diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in -index 3af7c1a52d..cff421d988 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in -@@ -18,7 +18,6 @@ Documentation=https://libvirt.org +@@ -18,7 +18,6 @@ [Service] Type=notify @@ -136,11 +95,9 @@ index 3af7c1a52d..cff421d988 100644 ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process -diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in -index e7f1326945..49fb7b99ff 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -16,7 +16,6 @@ [Service] Type=notify @@ -148,11 +105,9 @@ index e7f1326945..49fb7b99ff 100644 ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in -index d2453dd620..847263e8b9 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -160,11 +115,9 @@ index d2453dd620..847263e8b9 100644 ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in -index dda7c01a3d..bb0bf0afa4 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -172,11 +125,9 @@ index dda7c01a3d..bb0bf0afa4 100644 ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in -index 8abc9d3a7f..3539be3c0b 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in -@@ -18,7 +18,6 @@ Documentation=https://libvirt.org +@@ -18,7 +18,6 @@ [Service] Type=notify @@ -184,11 +135,9 @@ index 8abc9d3a7f..3539be3c0b 100644 ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 90b2cad5b0..d16b11ec8d 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in -@@ -25,8 +25,7 @@ Documentation=https://libvirt.org +@@ -28,8 +28,7 @@ [Service] Type=notify @@ -198,11 +147,9 @@ index 90b2cad5b0..d16b11ec8d 100644 ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=on-failure -diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in -index f43ce9ee6e..9076e638a7 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -210,11 +157,9 @@ index f43ce9ee6e..9076e638a7 100644 ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in -index 8444142a3a..57e74c2d38 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in -@@ -13,7 +13,6 @@ Documentation=https://libvirt.org +@@ -13,7 +13,6 @@ [Service] Type=notify @@ -222,11 +167,9 @@ index 8444142a3a..57e74c2d38 100644 ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in -index fc3e9a1b69..a82319b214 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in -@@ -15,7 +15,6 @@ Documentation=https://libvirt.org +@@ -15,7 +15,6 @@ [Service] Type=notify @@ -234,11 +177,9 @@ index fc3e9a1b69..a82319b214 100644 ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in -index ebb31dde07..21eec57bab 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org +@@ -14,7 +14,6 @@ [Service] Type=notify @@ -246,23 +187,9 @@ index ebb31dde07..21eec57bab 100644 ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure -diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in -index f551cb8fbf..99b9b4f1bf 100644 ---- a/src/vz/virtvzd.service.in -+++ b/src/vz/virtvzd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - - [Service] - Type=notify --EnvironmentFile=-@sysconfdir@/sysconfig/virtvzd - ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 53df930e0a..598a62ddef 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am -@@ -294,15 +294,6 @@ install-data-local: install-systemd install-nss \ +@@ -294,15 +294,6 @@ uninstall-local: uninstall-systemd uninstall-nss \ uninstall-bash-completion @@ -278,7 +205,7 @@ index 53df930e0a..598a62ddef 100644 EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status -@@ -322,12 +313,12 @@ EXTRA_DIST += libvirt-guests.service.in +@@ -322,12 +313,12 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD @@ -293,11 +220,9 @@ index 53df930e0a..598a62ddef 100644 rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 10c664016a..f0f417bffb 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in -@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8) +@@ -10,7 +10,7 @@ Documentation=https://libvirt.org [Service] @@ -306,8 +231,6 @@ index 10c664016a..f0f417bffb 100644 # Hack just call traditional service until we factor # out the code ExecStart=@libexecdir@/libvirt-guests.sh start -diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 0765efec21..a1a53d8a8d 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -1,3 +1,9 @@ @@ -320,6 +243,3 @@ index 0765efec21..a1a53d8a8d 100644 # Customizations for the libvirt-guests.service systemd unit # URIs to check for running guests --- -2.24.1 - diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-6.5.0.ebuild similarity index 97% copy from app-emulation/libvirt/libvirt-9999.ebuild copy to app-emulation/libvirt/libvirt-6.5.0.ebuild index 7325bbb6791..f236af9bf3a 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-6.5.0.ebuild @@ -9,9 +9,7 @@ inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any- if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - SRC_URI="" - KEYWORDS="" + EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" @@ -20,7 +18,7 @@ else fi DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" +HOMEPAGE="https://www.libvirt.org/" LICENSE="LGPL-2.1" IUSE=" apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi @@ -124,8 +122,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-6.2.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch ) pkg_setup() { diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 7325bbb6791..f0ec21a60c1 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -20,7 +20,7 @@ else fi DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" +HOMEPAGE="https://www.libvirt.org/" LICENSE="LGPL-2.1" IUSE=" apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi @@ -124,8 +124,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-6.2.0-do-not-use-sysconfig.patch "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch ) pkg_setup() {