commit: 499c1b526e852bb00d899c0684d60242c7926417
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 21:01:04 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 21:01:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499c1b52
app-emulation/libvirt: drop old 1.2.21-r3
Package-Manager: portage-2.2.28
app-emulation/libvirt/Manifest | 2 -
.../libvirt-1.2.17-fix_paths_for_apparmor.patch | 148 --------
.../files/libvirt-1.2.9-do_not_use_sysconf.patch | 112 ------
app-emulation/libvirt/libvirt-1.2.21-r3.ebuild | 386 ---------------------
4 files changed, 648 deletions(-)
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 9bd7c4c..eb92106 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,5 +1,3 @@
-DIST libvirt-1.2.21-20160709.tar.xz 3048 SHA256
c2bef1c300099c3ff6ce81488a2678e588d18ca46a27916df160c8304239ca80 SHA512
fdf0cd5e1cc3e0144fa99577c1a8c2d5e69ab610c923071b645465fb58076b2ce7a8e4e7747f3a6c59716917c6d41f369d77565c0f9fe10907a76d9b39edede6
WHIRLPOOL
2816d54588e4a49efd6773982b2b8a281572607c86c5a57c45b1736ce22836ea4cb91cee8d59b8fddcaafd2e552d0422ef5ed4b33d19a1705d4a38f270b9d39d
-DIST libvirt-1.2.21.tar.gz 29848954 SHA256
8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512
5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e
WHIRLPOOL
d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650
DIST libvirt-1.3.5-20160709.tar.xz 1336 SHA256
d14b14661e9bd89a8805dd84d8ee5f8b39f428a4dcbf70693eea593328e28033 SHA512
08ad8c691f145a3a8c27b594b486b9265777f756099c127e58fd76bac7249a0e84181a3f15da4cf64ffdcf35ff7e3a2f1f1ee50f3882df5d980ad7250a30e44e
WHIRLPOOL
8d8106314c2bed984db3947b51b90dadd45680a07d568cc980c6534ba2229bfff8d041ecf40898131030f3db8d6e223fe30ba3dc72b3fe7fedc02a77b5c37331
DIST libvirt-1.3.5.tar.gz 35109092 SHA256
93a23c44eb431da46c9458f95a66e29c9b98e37515d44b6be09e75b35ec94ac8 SHA512
6c6a09623d3d4d426311bfa7039f5e39584d5f891b8e761bbdb3022601ea066b8e1c3f8d609326e8ba4081ae40b7b03086fbc8ba5759d218b8616ec98200a89d
WHIRLPOOL
88ac308cc461efff842c27e40263a3b25ce0bc0ca310fb6e9def9126ab893fe43aed01bda9fc3615439ee797c36e2800f741b346e0b3d96aac64e7909c269879
DIST libvirt-2.0.0.tar.xz 13161096 SHA256
10e90af55e613953c0ddc60b4ac3a10c73c0f3493d7014259e3f012b2ffc9acb SHA512
1182346e9268ec50cfd191a18172ad8ca80615a111547cc72fbe227cbbe9579263a1236f80cb36542272bdbf092e2184c9060b65c56dc2098076bbd1a89dd66c
WHIRLPOOL
3d6d9e307228f54993c6082f7787d678b2afe84d96b47889d1565e38da489fb99691aeb598831dff04cd9fe47448ea35dc1f5a44b3c6638816cf61533155688c
diff --git
a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
b/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
deleted file mode 100644
index c608295..0000000
--- a/app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am
-index 7a20e16..c3c67b6 100644
---- a/examples/apparmor/Makefile.am
-+++ b/examples/apparmor/Makefile.am
-@@ -19,13 +19,13 @@ EXTRA_DIST= \
- TEMPLATE.lxc \
- libvirt-qemu \
- libvirt-lxc \
-- usr.lib.libvirt.virt-aa-helper \
-+ usr.libexec.virt-aa-helper \
- usr.sbin.libvirtd
-
- if WITH_APPARMOR_PROFILES
- apparmordir = $(sysconfdir)/apparmor.d/
- apparmor_DATA = \
-- usr.lib.libvirt.virt-aa-helper \
-+ usr.libexec.virt-aa-helper \
- usr.sbin.libvirtd \
- $(NULL)
-
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-deleted file mode 100644
-index b34fb35..0000000
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ /dev/null
-@@ -1,48 +0,0 @@
--# Last Modified: Mon Apr 5 15:10:27 2010
--#include <tunables/global>
--
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-- #include <abstractions/base>
--
-- # needed for searching directories
-- capability dac_override,
-- capability dac_read_search,
--
-- # needed for when disk is on a network filesystem
-- network inet,
--
-- deny @{PROC}/[0-9]*/mounts r,
-- @{PROC}/[0-9]*/net/psched r,
-- owner @{PROC}/[0-9]*/status r,
-- @{PROC}/filesystems r,
--
-- # for hostdev
-- /sys/devices/ r,
-- /sys/devices/** r,
--
-- /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
-- /sbin/apparmor_parser Ux,
--
-- /etc/apparmor.d/libvirt/* r,
--
/etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*
rw,
--
-- # for backingstore -- allow access to non-hidden files in @{HOME} as well
-- # as storage pools
-- audit deny @{HOME}/.* mrwkl,
-- audit deny @{HOME}/.*/ rw,
-- audit deny @{HOME}/.*/** mrwkl,
-- audit deny @{HOME}/bin/ rw,
-- audit deny @{HOME}/bin/** mrwkl,
-- @{HOME}/ r,
-- @{HOME}/** r,
-- /var/lib/libvirt/images/ r,
-- /var/lib/libvirt/images/** r,
-- /{media,mnt,opt,srv}/** r,
--
-- /**.img r,
-- /**.qcow{,2} r,
-- /**.qed r,
-- /**.vmdk r,
-- /**.[iI][sS][oO] r,
-- /**/disk{,.*} r,
--}
-diff --git a/examples/apparmor/usr.libexec.virt-aa-helper
b/examples/apparmor/usr.libexec.virt-aa-helper
-new file mode 100644
-index 0000000..b34fb35
---- /dev/null
-+++ b/examples/apparmor/usr.libexec.virt-aa-helper
-@@ -0,0 +1,48 @@
-+# Last Modified: Mon Apr 5 15:10:27 2010
-+#include <tunables/global>
-+
-+profile virt-aa-helper /usr/libexec/virt-aa-helper {
-+ #include <abstractions/base>
-+
-+ # needed for searching directories
-+ capability dac_override,
-+ capability dac_read_search,
-+
-+ # needed for when disk is on a network filesystem
-+ network inet,
-+
-+ deny @{PROC}/[0-9]*/mounts r,
-+ @{PROC}/[0-9]*/net/psched r,
-+ owner @{PROC}/[0-9]*/status r,
-+ @{PROC}/filesystems r,
-+
-+ # for hostdev
-+ /sys/devices/ r,
-+ /sys/devices/** r,
-+
-+ /usr/libexec/virt-aa-helper mr,
-+ /sbin/apparmor_parser Ux,
-+
-+ /etc/apparmor.d/libvirt/* r,
-+
/etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*
rw,
-+
-+ # for backingstore -- allow access to non-hidden files in @{HOME} as well
-+ # as storage pools
-+ audit deny @{HOME}/.* mrwkl,
-+ audit deny @{HOME}/.*/ rw,
-+ audit deny @{HOME}/.*/** mrwkl,
-+ audit deny @{HOME}/bin/ rw,
-+ audit deny @{HOME}/bin/** mrwkl,
-+ @{HOME}/ r,
-+ @{HOME}/** r,
-+ /var/lib/libvirt/images/ r,
-+ /var/lib/libvirt/images/** r,
-+ /{media,mnt,opt,srv}/** r,
-+
-+ /**.img r,
-+ /**.qcow{,2} r,
-+ /**.qed r,
-+ /**.vmdk r,
-+ /**.[iI][sS][oO] r,
-+ /**/disk{,.*} r,
-+}
-diff --git a/examples/apparmor/usr.sbin.libvirtd
b/examples/apparmor/usr.sbin.libvirtd
-index 5d606e6..ab2f1a9 100644
---- a/examples/apparmor/usr.sbin.libvirtd
-+++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -58,8 +58,10 @@
- audit deny /sys/kernel/security/apparmor/.* rwxl,
- /sys/kernel/security/apparmor/profiles r,
- /usr/{lib,lib64}/libvirt/* PUxr,
-- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
-- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
-+ /usr/libexec/virt-aa-helper PUxr,
-+ /usr/libexec/libvirt_lxc PUxr,
-+ /usr/libexec/libvirt_parthelper ix,
-+ /usr/libexec/libvirt_iohelper ix,
- /etc/libvirt/hooks/** rmix,
- /etc/xen/scripts/** rmix,
-
---
-2.3.6
-
diff --git a/app-emulation/libvirt/files/libvirt-1.2.9-do_not_use_sysconf.patch
b/app-emulation/libvirt/files/libvirt-1.2.9-do_not_use_sysconf.patch
deleted file mode 100644
index e766f49..0000000
--- a/app-emulation/libvirt/files/libvirt-1.2.9-do_not_use_sysconf.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 69372a32025ac16578ad277c6356e89713a3f9f4 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tam...@kyomu.43-1.org>
-Date: Mon, 3 Nov 2014 00:51:35 +0100
-Subject: [PATCH] Do not use /etc/sysconf
-
----
- daemon/Makefile.am | 4 +---
- daemon/libvirtd.service.in | 3 +--
- src/Makefile.am | 3 ---
- src/locking/virtlockd.service.in | 3 +--
- tools/Makefile.am | 2 +-
- tools/libvirt-guests.service.in | 2 +-
- 6 files changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index b95a79d..1e98422 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -328,9 +328,7 @@ uninstall-logrotate:
- rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
-
- install-sysconfig:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-- $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-+
- uninstall-sysconfig:
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
-diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index 1759ac8..cd337a1 100644
---- a/daemon/libvirtd.service.in
-+++ b/daemon/libvirtd.service.in
-@@ -10,8 +10,7 @@ Documentation=http://libvirt.org
-
- [Service]
- Type=notify
--EnvironmentFile=-/etc/sysconfig/libvirtd
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
-+ExecStart=@sbindir@/libvirtd
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
- Restart=on-failure
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e65177f..18bbbb4 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2269,9 +2269,6 @@ EXTRA_DIST += locking/virtlockd.sysconf \
- locking/test_libvirt_lockd.aug.in
-
- install-sysconfig:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-- $(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \
-- $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
-
- uninstall-sysconfig:
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
-diff --git a/src/locking/virtlockd.service.in
b/src/locking/virtlockd.service.in
-index 57089b0..ace0c83 100644
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8)
- Documentation=http://libvirt.org
-
- [Service]
--EnvironmentFile=-/etc/sysconfig/virtlockd
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
-+ExecStart=@sbindir@/virtlockd
- 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/tools/Makefile.am b/tools/Makefile.am
-index 93d642d..2da0e97 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -259,7 +259,7 @@ uninstall-local: uninstall-init uninstall-systemd
- install-sysconfig:
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
-- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-+ $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf
-
- uninstall-sysconfig:
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
-diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index cc04b6d..9be514b 100644
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
- Documentation=http://libvirt.org
-
- [Service]
--EnvironmentFile=-/etc/sysconfig/libvirt-guests
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
- # Hack just call traditional service until we factor
- # out the code
- ExecStart=@libexecdir@/libvirt-guests.sh start
---- a/tools/libvirt-guests.sysconf
-+++ b/tools/libvirt-guests.sysconf
-@@ -1,3 +1,10 @@
-+#
-+# Warning: This configuration file is only sourced by the systemd
-+# libvirt-guests.service unit. The coresponding openrc facility is in
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
-+#
-+
-+
- # URIs to check for running guests
- # example: URIS='default xen:/// vbox+tcp://host/system lxc:///'
- #URIS=default
---
-2.0.4
diff --git a/app-emulation/libvirt/libvirt-1.2.21-r3.ebuild
b/app-emulation/libvirt/libvirt-1.2.21-r3.ebuild
deleted file mode 100644
index 029a9e4..0000000
--- a/app-emulation/libvirt/libvirt-1.2.21-r3.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user autotools-utils linux-info systemd readme.gentoo
-
-BACKPORTS="20160709" # CVE-2015-5313 CVE-2016-5008
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt.git"
- SRC_URI=""
- KEYWORDS=""
- SLOT="0"
-else
- # Versions with 4 numbers are stable updates:
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz";
- else
- SRC_URI="http://libvirt.org/sources/${P}.tar.gz";
- fi
- SRC_URI+=" ${BACKPORTS:+
-
https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
-
https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}";
- KEYWORDS="amd64 x86"
- SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/";
-LICENSE="LGPL-2.1"
-IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
- lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd
sasl \
- selinux systemd +udev uml +vepa virtualbox virt-network
wireshark-plugins \
- xen"
-
-REQUIRED_USE="
- firewalld? ( virt-network )
- libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- qemu? ( libvirtd )
- uml? ( libvirtd )
- vepa? ( macvtap )
- virt-network? ( libvirtd )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
- app-misc/scrub
- dev-libs/libgcrypt:0
- dev-libs/libnl:3
- >=dev-libs/libxml2-2.7.6
- >=net-analyzer/netcat6-1.0-r2
- >=net-libs/gnutls-1.0.25:0=
- net-libs/libssh2
- >=net-misc/curl-7.18.0
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- sys-libs/ncurses:0=
- sys-libs/readline:=
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- caps? ( sys-libs/libcap-ng )
- firewalld? ( net-firewall/firewalld )
- fuse? ( >=sys-fs/fuse-2.8.6 )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
- lxc? ( !systemd? ( sys-power/pm-utils ) )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- openvz? ( sys-kernel/openvz-sources:* )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? ( >=sys-auth/polkit-0.9 )
- qemu? (
- >=app-emulation/qemu-0.13.0
- dev-libs/yajl
- !systemd? ( sys-power/pm-utils )
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- systemd? ( sys-apps/systemd )
- virt-network? (
- net-dns/dnsmasq[script]
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- )
- virtualbox? ( || ( app-emulation/virtualbox
>=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? (
- app-emulation/xen
- app-emulation/xen-tools:=
- )
- udev? (
- virtual/udev
- >=x11-libs/libpciaccess-0.10.9
- )"
-
-DEPEND="${RDEPEND}
- app-text/xhtml1
- dev-lang/perl
- dev-libs/libxslt
- dev-perl/XML-XPath
- virtual/pkgconfig"
-
-pkg_setup() {
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 qemu kvm
-
- # Some people used the masked ebuild which was not adding the qemu
- # user to the kvm group originally. This results in VMs failing to
- # start for some users. bug #430808
- egetent group kvm | grep -q qemu
- if [[ $? -ne 0 ]]; then
- gpasswd -a qemu kvm
- fi
-
- # Check kernel configuration:
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+="
- ~FUSE_FS"
-
- use lvm && CONFIG_CHECK+="
- ~BLK_DEV_DM
- ~DM_MULTIPATH
- ~DM_SNAPSHOT"
-
- use lxc && CONFIG_CHECK+="
- ~BLK_CGROUP
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~CGROUP_NET_PRIO
- ~CGROUP_PERF
- ~CGROUPS
- ~CGROUP_SCHED
- ~CPUSETS
- ~DEVPTS_MULTIPLE_INSTANCES
- ~IPC_NS
- ~MACVLAN
- ~NAMESPACES
- ~NET_CLS_CGROUP
- ~NET_NS
- ~PID_NS
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~USER_NS
- ~UTS_NS
- ~VETH
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS"
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- if $(kernel_is ge 3 6); then
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
- if $(kernel_is lt 4 5); then
- CONFIG_CHECK+=" ~MEMCG_KMEM "
- fi
- fi
-
- use macvtap && CONFIG_CHECK+="
- ~MACVTAP"
-
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_MARK_T
- ~BRIDGE_NF_EBTABLES
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
- ~NETFILTER_XT_TARGET_CHECKSUM"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_T_NAT
- ~NET_ACT_POLICE
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_SCH_HTB
- ~NET_SCH_INGRESS
- ~NET_SCH_SFQ"
-
- ERROR_USER_NS="Optional depending on LXC configuration."
-
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- touch "${S}/.mailmap"
-
- if [[ ${PV} = *9999* ]]; then
- # git checkouts require bootstrapping to create the configure
script.
- # Additionally the submodules must be cloned to the right
locations
- # bug #377279
- ./bootstrap || die "bootstrap failed"
- (
- git submodule status | sed 's/^[ +-]//;s/ .*//'
- git hash-object bootstrap.conf
- ) >.git-module-status
- fi
-
- epatch \
- "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
\
- "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch \
- "${FILESDIR}"/${P}-avoid_deprecated_pc_file.patch
-
- [[ -n ${BACKPORTS} ]] &&
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
- EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
- epatch_user
-
- # Tweak the init script:
- cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
- -e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
- -e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
- -e "s/USE_FLAG_RBD/$(usex rbd ceph '')/" \
- -i "${S}/libvirtd.init" || die "sed failed"
-
- AUTOTOOLS_AUTORECONF=true
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with apparmor)
- $(use_with apparmor apparmor-profiles)
- $(use_with audit)
- $(use_with avahi)
- $(use_with caps capng)
- $(use_with firewalld)
- $(use_with fuse)
- $(use_with glusterfs)
- $(use_with glusterfs storage-gluster)
- $(use_with iscsi storage-iscsi)
- $(use_with libvirtd)
- $(use_with lvm storage-lvm)
- $(use_with lvm storage-mpath)
- $(use_with lxc)
- $(use_with macvtap)
- $(use_enable nls)
- $(use_with numa numactl)
- $(use_with numa numad)
- $(use_with openvz)
- $(use_with parted storage-disk)
- $(use_with pcap libpcap)
- $(use_with phyp)
- $(use_with policykit polkit)
- $(use_with qemu)
- $(use_with qemu yajl)
- $(use_with rbd storage-rbd)
- $(use_with sasl)
- $(use_with selinux)
- $(use_with systemd systemd-daemon)
- $(usex systemd --with-init-script=systemd '')
- $(use_with udev)
- $(use_with uml)
- $(use_with vepa virtualport)
- $(use_with virt-network network)
- $(use_with wireshark-plugins wireshark-dissector)
- $(use_with xen)
- $(use_with xen xen-inotify)
- $(usex xen --with-libxl '')
-
- --without-hal
- --without-netcf
- --without-sanlock
- --without-xenapi
- --with-esx
- --with-qemu-group=$(usex caps qemu root)
- --with-qemu-user=$(usex caps qemu root)
- --with-remote
- --with-storage-fs
- --with-vmware
-
- --disable-static
- --disable-werror
-
- --with-html-subdir=${PF}/html
- --localstatedir=/var
- )
-
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
- else
- myeconfargs+=( $(use_with virtualbox vbox) )
- fi
-
- autotools-utils_src_configure
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
- fi
-}
-
-src_test() {
- # Explicitly allow parallel build of tests
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
- autotools-utils_src_compile install \
- DESTDIR="${D}" \
- SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
-
- find "${D}" -name '*.la' -delete || die
-
- # Remove bogus, empty directories. They are either not used, or
- # libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var/cache
- rm -rf "${D}"/var/run
- rm -rf "${D}"/var/log
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- use systemd && systemd_install_serviced \
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # we only ever want to generate this once
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
- fi
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2
${REPLACING_VERSIONS} ]]; then
- FORCE_PRINT_ELOG=true
- fi
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_print_elog
-}
