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 CFDFB1382C5 for ; Thu, 10 Jun 2021 14:42:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F152CE0849; Thu, 10 Jun 2021 14:42:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C8E91E0849 for ; Thu, 10 Jun 2021 14:42:02 +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 7E10E335D77 for ; Thu, 10 Jun 2021 14:42:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8F7A79A for ; Thu, 10 Jun 2021 14:41:59 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1623336073.5f402fb9ae52e5f66a4aa845b878f15d3be2100d.tamiko@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/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch app-emulation/libvirt/libvirt-7.0.0-r2.ebuild app-emulation/libvirt/libvirt-7.0.0-r3.ebuild X-VCS-Directories: app-emulation/libvirt/ app-emulation/libvirt/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 5f402fb9ae52e5f66a4aa845b878f15d3be2100d X-VCS-Branch: master Date: Thu, 10 Jun 2021 14:41:59 +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: df455085-ad9b-4fbf-88ad-86ab744c6814 X-Archives-Hash: 35d5aaff378d7ddd6acc32d5f56901a4 commit: 5f402fb9ae52e5f66a4aa845b878f15d3be2100d Author: Matthias Maier gentoo org> AuthorDate: Thu Jun 10 14:41:13 2021 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Jun 10 14:41:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f402fb9 app-emulation/libvirt: fix systemd unit file for libvirt 7.0.0 Closes: https://bugs.gentoo.org/792228 Package-Manager: Portage-3.0.19, Repoman-3.0.3 RepoMan-Options: --force Signed-off-by: Matthias Maier gentoo.org> .../files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch | 18 ++++++++++++++++++ ...libvirt-7.0.0-r2.ebuild => libvirt-7.0.0-r3.ebuild} | 1 + 2 files changed, 19 insertions(+) diff --git a/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch b/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch new file mode 100644 index 00000000000..a8ee5dcee3f --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-7.0.0-fix_virtproxyd_unit_file.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/792228 +https://gitlab.com/libvirt/libvirt/-/commit/e3d60f7 + +-- +diff --git a/src/remote/meson.build b/src/remote/meson.build +index 9ad2f6ab1c268012a263ab4ede6410fb80e14a12..0a188268b58b7af41645799aac3ef3f156fd48ad 100644 +--- a/src/remote/meson.build ++++ b/src/remote/meson.build +@@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE') + 'name': 'Libvirt proxy', + 'sockprefix': 'libvirt', + 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], +- 'deps': libvirtd_socket_conflicts, ++ 'deps': 'Conflicts=' + libvirtd_socket_conflicts, + } + + openrc_init_files += { + diff --git a/app-emulation/libvirt/libvirt-7.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-7.0.0-r2.ebuild rename to app-emulation/libvirt/libvirt-7.0.0-r3.ebuild index 745429541ce..c5547bdafed 100644 --- a/app-emulation/libvirt/libvirt-7.0.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-7.0.0-r3.ebuild @@ -134,6 +134,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.7.0-doc-path.patch "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch "${FILESDIR}"/${PN}-7.3.0-vircgroup-Fix-virCgroupKillRecursive-wrt-nested-cont.patch + "${FILESDIR}"/${PN}-7.0.0-fix_virtproxyd_unit_file.patch ) pkg_setup() {