commit:     017994497fab0a159e8adc4a73a10c3268f46601
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 22:44:00 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 22:48:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01799449

app-emulation/libvirt: drop vulnerable versions (3.8*, 3.10*)

Bug: https://bugs.gentoo.org/647338
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-emulation/libvirt/Manifest                     |   2 -
 .../libvirt-3.0.0-fix_paths_for_apparmor.patch     |  79 -----
 .../files/libvirt-3.8.0-CVE-2017-1000256.patch     |  74 ----
 app-emulation/libvirt/libvirt-3.10.0-r2.ebuild     | 382 ---------------------
 app-emulation/libvirt/libvirt-3.8.0-r1.ebuild      | 381 --------------------
 app-emulation/libvirt/libvirt-9999.ebuild          |   2 +-
 6 files changed, 1 insertion(+), 919 deletions(-)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 9ab7b8c8c46..db152df7418 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,3 +1 @@
-DIST libvirt-3.10.0.tar.xz 14952220 BLAKE2B 
6af2f4c07dc71d8aa283460640d3fdeccd78616d1678da1decf6b1702984ca0c685d8074963e55a2776ac834e18dbb61d86c20c6032320bf9aa6e02b480526dd
 SHA512 
c2dfe0629bd90e8d7ae85f2a31dc027475c9614d497063fec6905aa2da4db68ce96e8f20d3290b0c0542b6ea31c85700b2727008bac65997ff0901b45f1b7260
-DIST libvirt-3.8.0.tar.xz 14868712 BLAKE2B 
4d97a03c3fe4eadb6d6eb3548231527c7d1a95e2134e63af63e72dcff8fd8d1cc8b5332f03d60edc2b200037ec0276b69a38c3379ce830a595bb5e83c3507e6f
 SHA512 
fc48f29b493a5ec2b3586f6c5df0b8cb81f3f26be847bc42acfb6481d45970edc760dda0232ad57b95b8cf13382d0269dd3edf4a744040cda15b835d32d8c672
 DIST libvirt-4.0.0.tar.xz 15002248 BLAKE2B 
066794909d02be04a7d70ebd5e6d423736fdaf95b7521edd47ef19f9bec4f16d6d3e64117356394ce5916761ad77d5afab84ace2f4828c1f97373d0053b6924b
 SHA512 
c99ea305f427859eb070b5f0c43de48645a5c53a2aa8efc60f54f278ec3fa0b504307861309e1852f8d7bff4436afe00c859aac27691366a0c36c91341cea7a1

diff --git 
a/app-emulation/libvirt/files/libvirt-3.0.0-fix_paths_for_apparmor.patch 
b/app-emulation/libvirt/files/libvirt-3.0.0-fix_paths_for_apparmor.patch
deleted file mode 100644
index c9c7eb6ad49..00000000000
--- a/app-emulation/libvirt/files/libvirt-3.0.0-fix_paths_for_apparmor.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From baad1483ed0a699509f66abac6708797f370f888 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tam...@kyomu.43-1.org>
-Date: Sun, 22 Jan 2017 09:07:57 -0600
-Subject: [PATCH] Update paths to Gentoo layout
-
----
- examples/Makefile.am                                                | 4 ++--
- .../{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper}  | 4 ++--
- examples/apparmor/usr.sbin.libvirtd                                 | 6 ++++--
- 3 files changed, 8 insertions(+), 6 deletions(-)
- rename examples/apparmor/{usr.lib.libvirt.virt-aa-helper => 
usr.libexec.virt-aa-helper} (90%)
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 2956e14..d81e34b 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -23,7 +23,7 @@ EXTRA_DIST = \
-       apparmor/TEMPLATE.lxc \
-       apparmor/libvirt-qemu \
-       apparmor/libvirt-lxc \
--      apparmor/usr.lib.libvirt.virt-aa-helper \
-+      apparmor/usr.libexec.virt-aa-helper \
-       apparmor/usr.sbin.libvirtd \
-       lxcconvert/virt-lxc-convert \
-       polkit/libvirt-acl.rules \
-@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c
- if WITH_APPARMOR_PROFILES
- apparmordir = $(sysconfdir)/apparmor.d/
- apparmor_DATA = \
--      apparmor/usr.lib.libvirt.virt-aa-helper \
-+      apparmor/usr.libexec.virt-aa-helper \
-       apparmor/usr.sbin.libvirtd \
-       $(NULL)
- 
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper 
b/examples/apparmor/usr.libexec.virt-aa-helper
-similarity index 90%
-rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper
-rename to examples/apparmor/usr.libexec.virt-aa-helper
-index 4a8f197..a6072f1 100644
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ b/examples/apparmor/usr.libexec.virt-aa-helper
-@@ -1,7 +1,7 @@
- # Last Modified: Mon Apr  5 15:10:27 2010
- #include <tunables/global>
- 
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-+profile virt-aa-helper /usr/libexec/virt-aa-helper {
-   #include <abstractions/base>
- 
-   # needed for searching directories
-@@ -20,7 +20,7 @@ profile virt-aa-helper 
/usr/{lib,lib64}/libvirt/virt-aa-helper {
-   /sys/devices/ r,
-   /sys/devices/** r,
- 
--  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
-+  /usr/libexec/virt-aa-helper mr,
-   /{usr/,}sbin/apparmor_parser Ux,
- 
-   /etc/apparmor.d/libvirt/* r,
-diff --git a/examples/apparmor/usr.sbin.libvirtd 
b/examples/apparmor/usr.sbin.libvirtd
-index 8893e75..f0b471c 100644
---- a/examples/apparmor/usr.sbin.libvirtd
-+++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -59,8 +59,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.10.2
-

diff --git a/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch 
b/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch
deleted file mode 100644
index 8c347cd799a..00000000000
--- a/app-emulation/libvirt/files/libvirt-3.8.0-CVE-2017-1000256.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 441d3eb6d1be940a67ce45a286602a967601b157 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berra...@redhat.com>
-Date: Thu, 5 Oct 2017 17:54:28 +0100
-Subject: [PATCH] qemu: ensure TLS clients always verify the server certificate
-
-The default_tls_x509_verify (and related) parameters in qemu.conf
-control whether the QEMU TLS servers request & verify certificates
-from clients. This works as a simple access control system for
-servers by requiring the CA to issue certs to permitted clients.
-This use of client certificates is disabled by default, since it
-requires extra work to issue client certificates.
-
-Unfortunately the code was using this configuration parameter when
-setting up both TLS clients and servers in QEMU. The result was that
-TLS clients for character devices and disk devices had verification
-turned off, meaning they would ignore errors while validating the
-server certificate.
-
-This allows for trivial MITM attacks between client and server,
-as any certificate returned by the attacker will be accepted by
-the client.
-
-This is assigned CVE-2017-1000256  / LSN-2017-0002
-
-Reviewed-by: Eric Blake <ebl...@redhat.com>
-Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
----
- src/qemu/qemu_command.c                                                 | 2 +-
- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args     | 2 +-
- .../qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args                 | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 46f0bdd18..f68b82d08 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -721,7 +721,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
-     if (virJSONValueObjectCreate(propsret,
-                                  "s:dir", path,
-                                  "s:endpoint", (isListen ? "server": 
"client"),
--                                 "b:verify-peer", verifypeer,
-+                                 "b:verify-peer", (isListen ? verifypeer : 
true),
-                                  NULL) < 0)
-         goto cleanup;
- 
-diff --git 
a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args 
b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-index 5aff7734e..ab5f7e27f 100644
---- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-@@ -26,7 +26,7 @@ server,nowait \
- localport=1111 \
- -device isa-serial,chardev=charserial0,id=serial0 \
- -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
--endpoint=client,verify-peer=no \
-+endpoint=client,verify-peer=yes \
- -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
- tls-creds=objcharserial1_tls0 \
- -device isa-serial,chardev=charserial1,id=serial1 \
-diff --git 
a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args 
b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-index 91f1fe0cd..2567abbfa 100644
---- 
a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-+++ 
b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-@@ -31,7 +31,7 @@ localport=1111 \
- data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
- keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
- -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
--endpoint=client,verify-peer=no,passwordid=charserial1-secret0 \
-+endpoint=client,verify-peer=yes,passwordid=charserial1-secret0 \
- -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
- tls-creds=objcharserial1_tls0 \
- -device isa-serial,chardev=charserial1,id=serial1 \
--- 
-2.13.6
-

diff --git a/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild
deleted file mode 100644
index e918ac7a33e..00000000000
--- a/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-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.xz";
-       else
-               SRC_URI="http://libvirt.org/sources/${P}.tar.xz";
-       fi
-       KEYWORDS="~amd64 ~arm64 ~x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/";
-LICENSE="LGPL-2.1"
-IUSE="
-       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-       libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-       +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-       wireshark-plugins xen zeroconf zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       policykit? ( dbus )
-       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-analyzer/openbsd-netcat-1.105-r1 )
-       >=net-libs/gnutls-1.0.25:0=
-       net-libs/libssh2
-       net-libs/libtirpc
-       net-libs/rpcsvc-proto
-       >=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 )
-       caps? ( sys-libs/libcap-ng )
-       dbus? ( sys-apps/dbus )
-       firewalld? ( net-firewall/firewalld )
-       fuse? ( >=sys-fs/fuse-2.8.6:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       libssh? ( net-libs/libssh )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-0.13.0
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       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
-       )
-       zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
-       "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
-       "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-       "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
-)
-
-pkg_setup() {
-       if use qemu; then
-               enewgroup qemu 77
-               enewuser qemu 77 -1 -1 "qemu,kvm"
-       fi
-
-       use policykit && enewgroup libvirt
-
-       # 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
-               ~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"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       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"
-
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       if kernel_is ge 3 6; then
-               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-               kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-       fi
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-}
-
-src_prepare() {
-       touch "${S}/.mailmap"
-
-       default
-
-       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
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-               -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-               -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with dbus)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with libvirtd)
-               $(use_with libssh)
-               $(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 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)
-               $(use_with xen libxl)
-               $(use_with zeroconf avahi)
-               $(use_with zfs storage-zfs)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-               --without-xenapi
-
-               --with-esx
-               --with-init-script=systemd
-               --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
-
-       econf "${myeconfargs[@]}"
-
-       if [[ ${PV} = *9999* ]]; then
-               # Restore gnulib's config.sub and config.guess
-               # bug #377279
-               (cd .gnulib && git reset --hard > /dev/null)
-       fi
-}
-
-src_test() {
-       cd "${BUILD_DIR}"
-
-       # remove problematic tests, bug #591416, bug #591418
-       sed -i -e 's#commandtest$(EXEEXT) # #' \
-               -e 's#virfirewalltest$(EXEEXT) # #' \
-               -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-               -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-               tests/Makefile
-
-       export VIR_TEST_DEBUG=1
-       HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-       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!
-
-       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-r2" libvirt-guests || die
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-       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!
-
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild
deleted file mode 100644
index e131f0e8723..00000000000
--- a/app-emulation/libvirt/libvirt-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = *9999* ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-       SRC_URI=""
-       KEYWORDS="amd64 x86"
-       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.xz";
-       else
-               SRC_URI="http://libvirt.org/sources/${P}.tar.xz";
-       fi
-       KEYWORDS="amd64 ~arm64 x86"
-       SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/";
-LICENSE="LGPL-2.1"
-IUSE="
-       apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-       libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-       +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
-       wireshark-plugins xen zeroconf zfs
-"
-
-REQUIRED_USE="
-       firewalld? ( virt-network )
-       libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-       lxc? ( caps libvirtd )
-       openvz? ( libvirtd )
-       policykit? ( dbus )
-       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-analyzer/openbsd-netcat-1.105-r1 )
-       >=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 )
-       caps? ( sys-libs/libcap-ng )
-       dbus? ( sys-apps/dbus )
-       firewalld? ( net-firewall/firewalld )
-       fuse? ( >=sys-fs/fuse-2.8.6:= )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-       iscsi? ( sys-block/open-iscsi )
-       libssh? ( net-libs/libssh )
-       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-       nfs? ( net-fs/nfs-utils )
-       numa? (
-               >sys-process/numactl-2.0.2
-               sys-process/numad
-       )
-       parted? (
-               >=sys-block/parted-1.8[device-mapper]
-               sys-fs/lvm2[-device-mapper-only(-)]
-       )
-       pcap? ( >=net-libs/libpcap-1.0.0 )
-       policykit? ( >=sys-auth/polkit-0.9 )
-       qemu? (
-               >=app-emulation/qemu-0.13.0
-               dev-libs/yajl
-       )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl )
-       selinux? ( >=sys-libs/libselinux-2.0.85 )
-       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
-       )
-       zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-       zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-       app-text/xhtml1
-       dev-lang/perl
-       dev-libs/libxslt
-       dev-perl/XML-XPath
-       virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
-       "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
-       "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-       "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch          # bug #609488
-       "${FILESDIR}"/${PN}-3.8.0-CVE-2017-1000256.patch           # bug #635174
-)
-
-pkg_setup() {
-       if use qemu; then
-               enewgroup qemu 77
-               enewuser qemu 77 -1 -1 "qemu,kvm"
-       fi
-
-       use policykit && enewgroup libvirt
-
-       # 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
-               ~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"
-
-       kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-               ~DEVPTS_MULTIPLE_INSTANCES"
-
-       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"
-
-       # Handle specific kernel versions for different features
-       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-       if kernel_is ge 3 6; then
-               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-               kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-       fi
-
-       ERROR_USER_NS="Optional depending on LXC configuration."
-
-       if [[ -n ${CONFIG_CHECK} ]]; then
-               linux-info_pkg_setup
-       fi
-}
-
-src_prepare() {
-       touch "${S}/.mailmap"
-
-       default
-
-       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
-
-       # Tweak the init script:
-       cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
-       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-               -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-               -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-               -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-               -i "${S}/libvirtd.init" || die "sed failed"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               $(use_with apparmor)
-               $(use_with apparmor apparmor-profiles)
-               $(use_with audit)
-               $(use_with caps capng)
-               $(use_with dbus)
-               $(use_with firewalld)
-               $(use_with fuse)
-               $(use_with glusterfs)
-               $(use_with glusterfs storage-gluster)
-               $(use_with iscsi storage-iscsi)
-               $(use_with libvirtd)
-               $(use_with libssh)
-               $(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 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)
-               $(use_with xen libxl)
-               $(use_with zeroconf avahi)
-               $(use_with zfs storage-zfs)
-
-               --without-hal
-               --without-netcf
-               --without-sanlock
-               --without-xenapi
-
-               --with-esx
-               --with-init-script=systemd
-               --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
-
-       econf "${myeconfargs[@]}"
-
-       if [[ ${PV} = *9999* ]]; then
-               # Restore gnulib's config.sub and config.guess
-               # bug #377279
-               (cd .gnulib && git reset --hard > /dev/null)
-       fi
-}
-
-src_test() {
-       cd "${BUILD_DIR}"
-
-       # remove problematic tests, bug #591416, bug #591418
-       sed -i -e 's#commandtest$(EXEEXT) # #' \
-               -e 's#virfirewalltest$(EXEEXT) # #' \
-               -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-               -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-               tests/Makefile
-
-       export VIR_TEST_DEBUG=1
-       HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" \
-               SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-       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!
-
-       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-r2" libvirt-guests || die
-       newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-       newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
-       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
-       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
-       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-       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!
-
-       readme.gentoo_print_elog
-}

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild 
b/app-emulation/libvirt/libvirt-9999.ebuild
index 84ae6b580a7..3e57dd9a00e 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -122,7 +122,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
        "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
        "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-       "${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
+       "${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
        "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
 )
 

Reply via email to