From fee80067dca04cacb1a09290044fcbbadfdbd3cb Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 22 Dec 2015 10:07:19 -0600 Subject: [PATCH] app-emulation/libvirt: remove vulnerable 1.2.18 (CVE-2015-5313, bug #568870) This is a cleanup for CVE-2015-5313 bug 568870. Gentoo-Bugs: 568870 Package-Manager: portage-2.2.26 --- app-emulation/libvirt/Manifest | 1 - app-emulation/libvirt/files/libvirtd.confd-r4 | 43 -- app-emulation/libvirt/files/libvirtd.init-r14 | 139 ----- .../libvirt/libvirt-1.2.18-r1.ebuild | 480 ------------------ 4 files changed, 663 deletions(-) delete mode 100644 app-emulation/libvirt/files/libvirtd.confd-r4 delete mode 100644 app-emulation/libvirt/files/libvirtd.init-r14 delete mode 100644 app-emulation/libvirt/libvirt-1.2.18-r1.ebuild diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 691457263f96..fad874c2b429 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,3 +1,2 @@ -DIST libvirt-1.2.18.tar.gz 29412554 SHA256 d5a5ff18af4cced21fed986d28fa0a21b782d256920326bf0ff1c7731eeb6ade SHA512 e89d494066ebec4de4c9a53089f015635b7b5ccf4a10ab9749883cc81f6f9607b18ca91a1bd01a9cdacb3a46de86223f0432fae3954106cb92dd275e5b4138c5 WHIRLPOOL dbbbd627ccb9be154bc680407898cd32dfdbc218a67f54560e6b0f0200cbc157a9aa05834de5d9d23e3b6da0625fd5943b4c8e38f8bb9a6ff920bc5820287bfc DIST libvirt-1.2.21-20151222.tar.xz 1684 SHA256 6c97f288470ec58bcbe98507563c6a191892c6f8813a7b9688c09b823934cbe5 SHA512 4fd43f0e12434b78ac3e671ad8eb0e402d384cff6278f6d0db322a068c2c8807c7c7f7e5774aa9d19e2a85e49f6d9888908b32fca5fc04980134edaccba0afe2 WHIRLPOOL 2bfbc3cbf1ca44a2bb06ddf2e8eabeb116165560b9c73d649d7b8cc9baba851f5e9246414bfc2c4740f27d0d0d42b6176eaec43b05e8c1e54de2804150c2cde1 DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650 diff --git a/app-emulation/libvirt/files/libvirtd.confd-r4 b/app-emulation/libvirt/files/libvirtd.confd-r4 deleted file mode 100644 index 48ab1252e3bf..000000000000 --- a/app-emulation/libvirt/files/libvirtd.confd-r4 +++ /dev/null @@ -1,43 +0,0 @@ -# /etc/conf.d/libvirtd - -# Startup dependency -# libvirtd typically requires all networks to be up and settled which -# is what rc_need="net" provides. However if you only use specific networks -# for libvirtd, you may override this. Or if you only use libvirtd locally. -rc_need="net" - -# LIBVIRTD_OPTS -# You may want to add '--listen' to have libvirtd listen for tcp/ip connections -# if you want to use libvirt for remote control -# Please consult 'libvirtd --help' for more options -#LIBVIRTD_OPTS="--listen" - -# LIBVIRTD_KVM_SHUTDOWN -# Valid options: -# * shutdown - Sends an ACPI shutdown (think when you tap the power button -# on your machine and it begins a graceful shutdown). If your -# VM ignores this, it will have the power yanked out from under -# it in LIBVIRTD_KVM_SHUTDOWN_MAXWAIT seconds. -# * managedsave - Performs a state save external to the VM. qemu-kvm will stop -# stop the CPU and save off all state to a separate file. When -# the machine is started again, it will resume like nothing ever -# happened. This is guarenteed to always successfully stop your -# machine and restart it. However it may take some time to finish. -# * none - No attempts will be made to stop any VMs. If you are restarting your -# machine the qemu-kvm process will be simply killed, which may result -# in your VMs having disk corruption. -LIBVIRTD_KVM_SHUTDOWN="managedsave" - -# LIBVIRTD_KVM_SHUTDOWN_MAXWAIT -# Timeout in seconds until stopping libvirtd and "pulling the plug" on the -# remaining VM's still in a running state -#LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="500" - -# LIBVIRTD_KVM_NET_SHUTDOWN -# If libvirtd created networks for you (e.g. NATed networks) then this init -# script will shut them down for you if this is set to 'yes'. Otherwise, -# the networks will be left running once libvirt is shutdown. For this -# option to be useful you must have enabled the 'virt-network' USE flag and -# have had libvirt create a NATed network for you. -# Valid values: 'yes' or 'no' -#LIBVIRTD_KVM_NET_SHUTDOWN="yes" diff --git a/app-emulation/libvirt/files/libvirtd.init-r14 b/app-emulation/libvirt/files/libvirtd.init-r14 deleted file mode 100644 index 7bab68249eda..000000000000 --- a/app-emulation/libvirt/files/libvirtd.init-r14 +++ /dev/null @@ -1,139 +0,0 @@ -#!/sbin/runscript - -description="Virtual Machine Management daemon (libvirt)" -extra_started_commands="reload halt" -description_halt="Stops the libvirt daemon without stopping your VMs" -description_reload="Restarts the libvirt daemon without stopping your VMs" - -depend() { - USE_FLAG_FIREWALLD - use USE_FLAG_AVAHI USE_FLAG_ISCSI USE_FLAG_RBD dbus virtlockd - after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled -} - -libvirtd_virsh() { - local mode=$1 - shift - - # Silence errors because virsh always throws an error about - # not finding the hypervisor version when connecting to libvirtd - LC_ALL=C virsh -c ${mode}:///system "$@" 2>/dev/null -} - -libvirtd_dom_list() { - # Make sure that it wouldn't be confused if the domain name - # contains the word running. - libvirtd_virsh $1 list | awk '$3 == "running" { print $1 }' -} - -libvirtd_dom_count() { - # Make sure that it wouldn't be confused if the domain name - # contains the word running. - libvirtd_virsh $1 list | awk 'BEGIN { count = 0 } \ - $3 == "running" { count++ } \ - END { print count }' -} - -libvirtd_net_list() { - # The purpose of the awk is to avoid networks with 'active' in the name - libvirtd_virsh $1 net-list | awk '$2 == "active" { print $1 }' -} - -libvirtd_net_count() { - # The purpose of the awk is to avoid networks with 'active' in the name - libvirtd_virsh $1 net-list | awk 'BEGIN { count = 0 } \ - $2 == "active" { count++ } \ - END { print count }' -} - - -start() { - # Test configuration directories in /etc/libvirt/ to be either not - # present or a directory, i.e. not a regular file, bug #532892 - for dir in lxc nwfilter qemu storage; do - if [ -f /etc/libvirt/$dir ]; then - eerror "/etc/libvirt/$dir was created as a regular file. It must be either" - eerror "a directory or not present for libvirtd to start up successfully." - return 1 - fi - done - - ebegin "Starting libvirtd" - start-stop-daemon --start \ - --env KRB5_KTNAME=/etc/libvirt/krb5.tab \ - --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS} - eend $? -} - -stop() { - local counter= - local vm_name= - local net_name= - local dom_id= - - ebegin "Stopping libvirtd" - # try to shutdown all (KVM/Qemu) domains - if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \ - && [ "$(libvirtd_dom_count qemu)" != "0" ] ; then - - einfo " Shutting down domain(s):" - for dom_id in $(libvirtd_dom_list qemu) ; do - vm_name="$(libvirtd_virsh qemu domname ${dom_id} | head -n 1)" - einfo " ${vm_name}" - libvirtd_virsh qemu ${LIBVIRTD_KVM_SHUTDOWN} ${dom_id} > /dev/null - done - - if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then - counter="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" - else - counter=500 - fi - - if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then - einfo " Waiting ${counter} seconds while domains shutdown ..." - DOM_COUNT="$(libvirtd_dom_count qemu)" - while [ ${DOM_COUNT} -gt 0 ] && [ ${counter} -gt 0 ] ; do - DOM_COUNT="$(libvirtd_dom_count qemu)" - sleep 1 - counter=$((${counter} - 1)) - echo -n "." - done - fi - - if [ "$(libvirtd_dom_count qemu)" != "0" ] ; then - eerror " !!! Some guests are still running, stopping anyway" - fi - - fi - - if [ "${LIBVIRTD_KVM_NET_SHUTDOWN}" != "no" ] \ - && [ "$(libvirtd_net_count qemu)" != "0" ]; then - - einfo " Shutting down network(s):" - for net_name in $(libvirtd_net_list qemu); do - einfo " ${net_name}" - libvirtd_virsh qemu net-destroy ${net_name} > /dev/null - done - - if [ "$(libvirtd_net_count qemu)" != "0" ]; then - eerror " !!! Some networks are still active, stopping anyway" - fi - fi - - # Now actually stop the daemon - start-stop-daemon --stop --quiet --exec \ - /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid - eend $? -} - -halt() { - ebegin "Stopping libvirtd without shutting down your VMs" - start-stop-daemon --stop --quiet --exec \ - /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid - eend $? -} - -reload() { - halt - start -} diff --git a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild deleted file mode 100644 index ed48d834628b..000000000000 --- a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild +++ /dev/null @@ -1,480 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLIZE=yes - -MY_P="${P/_rc/-rc}" - -inherit eutils user autotools linux-info systemd readme.gentoo - -BACKPORTS="" - -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/${MY_P}.tar.gz" - else - SRC_URI="http://libvirt.org/sources/${MY_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 -S="${WORKDIR}/${P%_rc*}" - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -LICENSE="LGPL-2.1" -# TODO: Reenable IUSE wireshark-plugins -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 +udev uml +vepa virtualbox virt-network wireshark-plugins xen \ - elibc_glibc systemd" -REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - uml? ( libvirtd ) - vepa? ( macvtap ) - virtualbox? ( libvirtd ) - xen? ( libvirtd ) - virt-network? ( libvirtd ) - firewalld? ( virt-network )" - -# 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="sys-libs/readline:= - sys-libs/ncurses:0= - >=net-misc/curl-7.18.0 - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - dev-libs/libgcrypt:0 - >=dev-libs/libxml2-2.7.6 - dev-libs/libnl:3 - >=net-libs/gnutls-1.0.25 - net-libs/libssh2 - sys-apps/dmidecode - >=sys-apps/util-linux-2.17 - sys-devel/gettext - >=net-analyzer/netcat6-1.0-r2 - app-misc/scrub - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - avahi? ( >=net-dns/avahi-0.6[dbus] ) - caps? ( sys-libs/libcap-ng ) - fuse? ( >=sys-fs/fuse-2.8.6 ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - lxc? ( !systemd? ( sys-power/pm-utils ) ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) - 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 ) - virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( app-emulation/xen-tools:= app-emulation/xen ) - udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) - virt-network? ( net-dns/dnsmasq[script] - net-misc/radvd - sys-apps/iproute2[-minimal] - firewalld? ( net-firewall/firewalld ) - ) - elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 .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 - - [[ -n ${BACKPORTS} ]] && \ - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \ - EPATCH_SOURCE="${WORKDIR}/patches" epatch - - epatch_user - - [[ -n ${AUTOTOOLIZE} ]] && eautoreconf - - # Tweak the init script - local avahi_init= - local iscsi_init= - local rbd_init= - local firewalld_init= - cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init" - use avahi && avahi_init='avahi-daemon' - use iscsi && iscsi_init='iscsid' - use rbd && rbd_init='ceph' - use firewalld && firewalld_init='need firewalld' - - sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init" - sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init" - sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init" - sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init" -} - -src_configure() { - local myconf="" - - ## enable/disable daemon, otherwise client only utils - myconf+=" $(use_with libvirtd)" - - ## enable/disable the daemon using avahi to find VMs - myconf+=" $(use_with avahi)" - - ## hypervisors on the local host - myconf+=" $(use_with xen) $(use_with xen xen-inotify)" - myconf+=" --without-xenapi" - if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then - myconf+=" --with-libxl" - else - myconf+=" --without-libxl" - fi - myconf+=" $(use_with openvz)" - myconf+=" $(use_with lxc)" - if use virtualbox && has_version app-emulation/virtualbox-ose; then - myconf+=" --with-vbox=/usr/lib/virtualbox-ose/" - else - myconf+=" $(use_with virtualbox vbox)" - fi - myconf+=" $(use_with uml)" - myconf+=" $(use_with qemu)" - myconf+=" $(use_with qemu yajl)" # Use QMP over HMP - myconf+=" $(use_with phyp)" - myconf+=" --with-esx" - myconf+=" --with-vmware" - - ## additional host drivers - myconf+=" $(use_with apparmor)" - myconf+=" $(use_with apparmor apparmor-profiles)" - myconf+=" $(use_with virt-network network)" - myconf+=" --with-storage-fs" - myconf+=" $(use_with lvm storage-lvm)" - myconf+=" $(use_with iscsi storage-iscsi)" - myconf+=" $(use_with parted storage-disk)" - myconf+=" $(use_with glusterfs)" - myconf+=" $(use_with glusterfs storage-gluster)" - myconf+=" $(use_with lvm storage-mpath)" - myconf+=" $(use_with rbd storage-rbd)" - myconf+=" $(use_with numa numactl)" - myconf+=" $(use_with numa numad)" - myconf+=" $(use_with selinux)" - myconf+=" $(use_with fuse)" - - # udev for device support details - myconf+=" $(use_with udev)" - myconf+=" --without-hal" - - # linux capability support so we don't need privileged accounts - myconf+=" $(use_with caps capng)" - - ## auth stuff - myconf+=" $(use_with policykit polkit)" - myconf+=" $(use_with sasl)" - - # network bits - myconf+=" $(use_with macvtap)" - myconf+=" $(use_with pcap libpcap)" - myconf+=" $(use_with vepa virtualport)" - myconf+=" $(use_with firewalld)" - - ## other - myconf+=" $(use_enable nls)" - - # user privilege bits fir qemu/kvm - if use caps; then - myconf+=" --with-qemu-user=qemu" - myconf+=" --with-qemu-group=qemu" - else - myconf+=" --with-qemu-user=root" - myconf+=" --with-qemu-group=root" - fi - - # audit support - myconf+=" $(use_with audit)" - - # wireshark dissector - myconf+=" $(use_with wireshark-plugins wireshark-dissector)" - - ## stuff we don't yet support - myconf+=" --without-netcf" - - # locking support - myconf+=" --without-sanlock" - - # systemd unit files - myconf+=" $(use_with systemd systemd-daemon)" - use systemd && myconf+=" --with-init-script=systemd" - - # this is a nasty trick to work around the problem in bug - # #275073. The reason why we don't solve this properly is that - # it'll require us to rebuild autotools (and we don't really want - # to do that right now). The proper solution has been sent - # upstream and should hopefully land in 0.7.7, in the mean time, - # mime the same functionality with this. - case ${CHOST} in - *cygwin* | *mingw* ) - ;; - *) - ac_cv_prog_WINDRES=no - ;; - esac - - econf \ - ${myconf} \ - --disable-static \ - --disable-werror \ - --with-remote \ - --docdir=/usr/share/doc/${PF} \ - --localstatedir=/var - - 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() { - emake install \ - DESTDIR="${D}" \ - HTML_DIR=/usr/share/doc/${PF}/html \ - DOCS_DIR=/usr/share/doc/${PF} \ - EXAMPLE_DIR=/usr/share/doc/${PF}/examples \ - SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \ - || die "emake install failed" - - 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 - newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - - 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 - - # We really don't want to use or support old PolicyKit cause it - # screws with the new polkit integration - if has_version sys-auth/policykit; then - rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy - fi - - # Only sysctl files ending in .conf work - dodir /etc/sysctl.d - mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf -} - -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.17-r2 ${REPLACING_VERSIONS} ]]; then - FORCE_PRINT_ELOG=true - fi - - readme.gentoo_print_elog -} -- 2.26.2