From: Matthias Maier Date: Sat, 13 Dec 2014 11:56:30 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17223b453ca9a7b2b7eff2aebeee81803660e391;p=gentoo.git version bump Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xBD3A97A3 --- diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index f08407294b4c..49d6ec23dba5 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.400 2014/12/12 10:28:02 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.401 2014/12/13 11:56:27 tamiko Exp $ + +*libvirt-1.2.11 (13 Dec 2014) + + 13 Dec 2014; Matthias Maier +libvirt-1.2.11.ebuild: + version bump 12 Dec 2014; Matthias Maier -libvirt-1.2.10-r1.ebuild: drop vulnerable version, CVE-2014-8131, bug #532204 diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 35236efff510..2f2f4e4c7371 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX libvirt-1.2.10-cve-2014-7823.patch 3066 SHA256 f5574d5b7f02700bd81596b451896163c8dcb1081d568338ed9810dbe0d759ef SHA512 1a13c0fd39671e417b7c338a4d4cada52c83527e726f23a59fb31b3f0777eec3b901761e7a62f07abec0968482a0410c0b28a145290755d68ea02f0b497d981c WHIRLPOOL 8ff93c91d1ab972cf46d90feb9b196e9b0516c3646809448660d200d7fbd205e9507323e63e9afd299ac7393d43f90ff7b1be2fc74ba8f5f64ce6c9ab37a3827 AUX libvirt-1.2.10-cve-2014-8131-part2.patch 1413 SHA256 c2217f14db504f0366f06db091c5c2d7a433198606a25b0dd791d3b145b4dfdc SHA512 b745c7f62e300433d77785b5a5a66a5584a86a9387d6c2f09493e902f71a62fdc04809fee00ededa948576faff38f529410b53a8228f3a25008e69ece4ea57c2 WHIRLPOOL 07413bbbb743be2965270c08388a405fe6869530169721028de64d588d3d78ca2950ede8dd6438761755ac4d89069b6b87c7c9f8049ec418fba7ee81a8e9d6f7 AUX libvirt-1.2.10-cve-2014-8131.patch 2761 SHA256 1ecbb82ee50dfb91361cb2f55d1dc8e014e08223258dad2a1183d5d844cd7d62 SHA512 36913fbab2ad6499e0386765c106e3592348a77fb8cf10c74353be6299de4a1740a336a2b98efbceed982725cb688f6110e435a4033d9d7141031262a12e0da9 WHIRLPOOL a750d5025385f956a66a177e90332c0f19f7be6097d75bb7b5a2b050a893b0e4638dd1edc04f92219727fa3e069c4e6349ce52cd007472186c72f8c400b107ab @@ -12,24 +9,9 @@ AUX libvirtd.init-r13 3678 SHA256 5744e7392b0777d14142552237f517ff1fbf6c4734aff9 AUX libvirtd.service.conf 401 SHA256 1cfb6f7dec5746364d9a4cccddb4b63f8ccd0ebf8bfaa000b13a09962ca24fac SHA512 27adbd104ea87e51d423b057392a0c6726692ad8ee9723f73dc4bfe8eb54069725d64883434424ba810d36992d404d1ba4afe6bcefb866d3d3d92dfd161c2b32 WHIRLPOOL d6b960b7d18bdbaf0ff6dc5ecf29e7d10e22fa7d16933a149d6287c007d864a0e0dd67048c25a038dd5f73c9ea911d2cd49bf21c072b0c7eab1e92be35d8b545 AUX virtlockd.init 437 SHA256 0894a839f85dff6f97bde514437935f4c1589ba4f2cbd3e0efe28753698694a1 SHA512 3d7b366736fb98acd26577e29a3c00592e7be038634fc3b51891f557426cd9945bf08a4486f1d62aa91ce7dc7d6bf96d7e57ef06a3a0b4aceb55b9e9c9e9b2da WHIRLPOOL d633a1a7358dbf7bd94d70f44753c9c346adfc78537643e5f379cea017d20e1097998ecfaf87e47e4e0f9216d43a3053af24e3129ecfb8f110f5283a769f368f DIST libvirt-1.2.10.tar.gz 30029503 SHA256 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e SHA512 9cd5d2a604769cf70e388c367abcde27ee8d6d7043227f17dd2cac92a467ea06547374e1d83c7b1ee4c5322d8b3d9e4cbb6db373efae5eaaceed1b1376cbd09d WHIRLPOOL 986c1fd0128101f936897c97a36d646b8893d9ee0a223d05b004d73408a2720aeb9bb5fe3e4a7c476947021b89d955fb4a1b3a64dfe8dfe0d30dbfe75487b8fe +DIST libvirt-1.2.11.tar.gz 30571605 SHA256 1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc SHA512 4aaeb2eeb563f0a9105a1586054d69c24dada12ddf9b71edd3742ad602eb8c892d9f615ee1a2159051bec52699897c6707d9d0204b8f0fe61bae15885ee986f2 WHIRLPOOL b64ee58d633e4b3fec52125bd9b582f7d07045baa66c492fd2b6bc521d994cec95fa460c3a8b32a0f73043ad812e36d81832c31046bbacc280fb2f2764e9bd75 EBUILD libvirt-1.2.10-r2.ebuild 12737 SHA256 91df435d21611b5e8a0a316a148b0d5449360cad43d61f50c271b87ef8e8b91d SHA512 893277721e06f434efa5f54e102620ff4df71d70a910999caed4dd60075e18eb38aa409b743681a367db6043ae360008da9cfd62932967276a52b2dc6e5750ee WHIRLPOOL 81e528bd5fcc722e916cad403d4bab5fc9f256a1c632163140a6bce90310b9195779255468c52d0f61f2f13fca3a10573c50b5b09571defcea1557aa460d2d00 +EBUILD libvirt-1.2.11.ebuild 12536 SHA256 10857372387f2519ffec3f72d7a4746002e2daabe7e5627f5aad6ce86f5e72bb SHA512 467f4e804e4fe8acc3f383ac2a140c2efffdfe4de96a4bf7f4e6b8fea93a595e0448e7c0e2cb85c53f5d592a8abcd947111f792e402358be79e7c9b2059da7b6 WHIRLPOOL 79cbb4bf3e5b6f1031bee99a0f0034f0e3ec6926097d50cd7410e9b32c54af390d7ebfe4e9379d4382875422867b9cc6fdc0ec4835dee02abc38b6935b781144 EBUILD libvirt-9999.ebuild 12535 SHA256 0676fabd6df874db39ee2dd2b5fa68371b60b0d35ff7c8a795e946126a8239db SHA512 2de0cb161f528248e61efb192e58e002731a8fc7fef2e2a7133eff9468bdb30362124b1ccc361b38c8db815b17189fdb772ccc623af253acd3686b3b151f33a4 WHIRLPOOL 98f5d988f4e37cef561d6c58385c1002082cee045ae3d39be7cd0ecbcb2e3a3f203772c8e49aefeb373478260efdcd4fb590b4802a512767e7885bdc635fa635 -MISC ChangeLog 24011 SHA256 4d4c2bf88dec74d52be1fb8c0d59f01b8bc387c440274973400a23270a778ca9 SHA512 e5845c48e562b4ab01d52920ae877a6f4508622386edb73bbef059b697c599259b1c3abb4f0e7995a883e28b329d2a8b5745db7be9abd68a22aaf3d25879dd51 WHIRLPOOL cbf32435228077f8f22900a53fe65ee7f346eb33eaae31793fe58aa10b58c5c151c45bea552281deda04c93747623bf66b33a82838bbcb8388c22ef85fa0b911 +MISC ChangeLog 24132 SHA256 4527f1f6d5883841dbbf46e92a8cb8e02753d68f42bc36e7fb0547fa0e0cbd14 SHA512 c88a0d516bf880d1f95c957c270793a50f492e8deb80f181b81c4307f873422b3dd0867985c22721837283dcd27abdb254b9962ef00ac7ddf4140eb383d00213 WHIRLPOOL 92ed4abd28fe2069554a666a6ff344190141396b5e950c3ddfd0e4cac63878210fc51054891de705adfa05eafb1932dd2297e8482a444c154e6e73f1a248b479 MISC metadata.xml 3736 SHA256 376b65feea8c2f85dccad2e564cc6111f2dc2de2a3b785a4c10af8c95c4920ee SHA512 93933d1ddfce67739e0647adce2f9253ae596429c794b73562737b508400a0fa7af93eae06808b088888b1d44f421ce4765cc6b56b9b5356140af80ca36bebfc WHIRLPOOL 7ef396db2e624c2798ba30ad4b8099237fb699c5e94cd1470ec6161a068f1e815930a87104545b4b98183784465a9a5f9dc051beb99ef1c5731e61f42f5c7381 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.1 - -iQIcBAEBCAAGBQJUisMyAAoJELhOzYlK7nn/Kv4QAM8m8bbu2TGNclcR5qF6l2t0 -lkkwJVU1ZOzU5fdvZngEVALZwYp3qC6G5TKkm0jsNPWHFimTB67aHoRb9AeyrC2S -2C5E1eD72li2PcAjtN9Pq5uan2o3MqoV4OZWhar/lLmFly09/HcMxABUsRCCuzMf -WXQUq3wS04g7k76KYMznY8GNWRS4V2XydE/OZSc1yiRSe3oOW6Tu1i6WqvXWbfFw -Dfk54CbrWNq0UHDQxfyH2d5C6ujKUFPZZlmOr6pq+PWp2xJB9PLhR+zljQ5dR51L -plkk/z//ZxwXmSyLSYqEvavVEL4PSVsqaCrW1VUHviv8wUTTBqd2O3F8ig/JpugP -Ffk8ElLmIS2sb6dgCBSrRi8r7jVs0795Bv7XR6ETWYBvCtXBX2pTDzH5/6dcgAaJ -u6Go5n04PCFysAOczJF0NjB3HCbF9Ri4vMHAiwIwZaKwfAuwnYbBpDYR05zszCM9 -VGaxEGJgwO/MNi3KUrY60js+FCh3YlEeZKNqKKWrhWp7OFJV6Q703zKJjaz4AeXG -hxG08Dp0qUyKMDF8YqngP+rdCeXPj0IxvCB1D65woh5NLk4ZtGe5AeuwTxK6HOk/ -vEXjl199mAidxSi0w7zSSpgqy4141hQCaIg0J5jrSMR8zQ8y+AhId/5wJ/jCtOcV -jB/chZufzt0Zp87jC9NV -=+Yj9 ------END PGP SIGNATURE----- diff --git a/app-emulation/libvirt/libvirt-1.2.11.ebuild b/app-emulation/libvirt/libvirt-1.2.11.ebuild new file mode 100644 index 000000000000..22efd1a3cc40 --- /dev/null +++ b/app-emulation/libvirt/libvirt-1.2.11.ebuild @@ -0,0 +1,449 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.11.ebuild,v 1.1 2014/12/13 11:56:27 tamiko Exp $ + +EAPI=5 + +AUTOTOOLIZE=yes + +MY_P="${P/_rc/-rc}" + +inherit eutils user autotools linux-info systemd readme.gentoo + +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 + 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" +IUSE="audit avahi +caps firewalld fuse 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 + >=net-misc/curl-7.18.0 + 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 + audit? ( sys-process/audit ) + avahi? ( >=net-dns/avahi-0.6[dbus] ) + caps? ( sys-libs/libcap-ng ) + fuse? ( >=sys-fs/fuse-2.8.6 ) + 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-firewall/iptables-1.4.10 + net-misc/radvd + net-firewall/ebtables + 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 + + 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-r13" "${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 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 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/sysconf + 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 + + newinitd "${S}/libvirtd.init" libvirtd || die + newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die + newinitd "${FILESDIR}/virtlockd.init" 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 + + if ! use policykit; then + elog "To allow normal users to connect to libvirtd you must change the" + elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf" + fi + + use libvirtd || return 0 + # From here, only libvirtd-related instructions, be warned! + + readme.gentoo_print_elog + + if use caps && use qemu; then + elog "libvirt will now start qemu/kvm VMs with non-root privileges." + elog "Ensure any resources your VMs use are accessible by qemu:qemu" + fi + + if [[ -n "${REPLACING_VERSIONS}" ]]; then + elog "" + elog "The systemd service-file configuration under /etc/sysconfig has" + elog "been removed. Please use" + elog " /etc/systemd/system/libvirt.d/00gentoo.conf" + elog "to control the '--listen' parameter for libvirtd. The configuration" + elog "for the libvirt-guests.service is now found under" + elog " /etc/libvirt/libvirt-guests.conf" + elog "The openrc configuration has not been changed. Thus no action is" + elog "required for the openrc service manager." + elog "" + fi +}