summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-08-13 03:17:30 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-08-13 03:17:30 +0000
commitf7dd466019313b85702897b7b85e902ad4dd43af (patch)
tree9bb38f3b29e81d97470a7c18712c15d2576aa969 /app-emulation/libvirt
parentStable ppc64, bug #428964 (diff)
downloadgentoo-2-f7dd466019313b85702897b7b85e902ad4dd43af.tar.gz
gentoo-2-f7dd466019313b85702897b7b85e902ad4dd43af.tar.bz2
gentoo-2-f7dd466019313b85702897b7b85e902ad4dd43af.zip
Fix CVE-2012-3445. bug #429322. Start of fixes that have been upstreamed for other opened Gentoo bugs. bug #387715. bug #427122. bug #398621.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/libvirt')
-rw-r--r--app-emulation/libvirt/ChangeLog9
-rw-r--r--app-emulation/libvirt/libvirt-0.9.13-r1.ebuild (renamed from app-emulation/libvirt/libvirt-0.9.13.ebuild)10
2 files changed, 11 insertions, 8 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index bbe5ad1c4672..26fb24d54a96 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-emulation/libvirt
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.202 2012/08/13 01:13:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.203 2012/08/13 03:17:30 cardoe Exp $
+
+*libvirt-0.9.13-r1 (13 Aug 2012)
+
+ 13 Aug 2012; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.9.13.ebuild,
+ +libvirt-0.9.13-r1.ebuild:
+ Fix CVE-2012-3445. bug #429322. Start of fixes that have been upstreamed for
+ other opened Gentoo bugs. bug #387715. bug #427122. bug #398621.
13 Aug 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13.ebuild:
Work around for people that used the masked ebuild and didn't get the qemu
diff --git a/app-emulation/libvirt/libvirt-0.9.13.ebuild b/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild
index dd5ed2ca3113..ccb76176acfe 100644
--- a/app-emulation/libvirt/libvirt-0.9.13.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13.ebuild,v 1.6 2012/08/13 01:13:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13-r1.ebuild,v 1.1 2012/08/13 03:17:30 cardoe Exp $
EAPI=4
-#BACKPORTS=1
+BACKPORTS=1
AUTOTOOLIZE=yes
MY_P="${P/_rc/-rc}"
@@ -25,7 +25,7 @@ else
SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
ftp://libvirt.org/libvirt/${MY_P}.tar.gz
${BACKPORTS:+
- http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.bz2}"
+ http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~x86"
fi
S="${WORKDIR}/${P%_rc*}"
@@ -168,10 +168,6 @@ src_prepare() {
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
- epatch \
- "${FILESDIR}/${P}-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch" \
- "${FILESDIR}/${P}-libnl3.patch"
-
if [[ ${PV} = *9999* ]]; then
# git checkouts require bootstrapping to create the configure script.