Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=55dcfd1e74d40e2a41fff3c2f3615b0b5057ae63
commit 55dcfd1e74d40e2a41fff3c2f3615b0b5057ae63
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Tue May 20 13:12:30 2008 +0200
kvm-69-1-i686
- version bump
diff --git a/source/xapps-extra/kvm/CVE-2008-2004.diff
b/source/xapps-extra/kvm/CVE-2008-2004.diff
deleted file mode 100644
index 5703224..0000000
--- a/source/xapps-extra/kvm/CVE-2008-2004.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Chris Wright <[EMAIL PROTECTED]>
-Subject: [PATCH] add format= to drive options
-
-A guest with a raw format disk can write any format header to that device.
-A subsequent restart of the guest will cause qemu to interpret the format
-header and could allow the guest read access to any host file. Add a
-format= drive option to allow host to specify, e.g. format=raw, to give
-qemu a hint to choose a specific block format driver. Originially noted
-by Avi Kivity <[EMAIL PROTECTED]>.
-
-Signed-off-by: Chris Wright <[EMAIL PROTECTED]>
----
- qemu/qemu-doc.texi | 4 ++++
- qemu/vl.c | 13 +++++++++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/qemu/qemu-doc.texi b/qemu/qemu-doc.texi
-index b9ab492..783d977 100644
---- a/qemu/qemu-doc.texi
-+++ b/qemu/qemu-doc.texi
-@@ -260,6 +260,10 @@ These options have the same definition as they have in
@option{-hdachs}.
- @var{snapshot} is "on" or "off" and allows to enable snapshot for given drive
(see @option{-snapshot}).
- @item [EMAIL PROTECTED]
- @var{cache} is "on" or "off" and allows to disable host cache to access data.
[EMAIL PROTECTED] [EMAIL PROTECTED]
-+Specify which disk @var{format} will be used rather than detecting
-+the format. Can be used to specifiy format=raw to avoid interpreting
-+an untrusted format header.
- @end table
-
- Instead of @option{-cdrom} you can use:
-diff --git a/qemu/vl.c b/qemu/vl.c
-index b425ab5..10181e8 100644
---- a/qemu/vl.c
-+++ b/qemu/vl.c
-@@ -5079,6 +5079,7 @@ int drive_init(struct drive_opt *arg, int snapshot,
- int bus_id, unit_id;
- int cyls, heads, secs, translation;
- BlockDriverState *bdrv;
-+ BlockDriver *drv = NULL;
- int max_devs;
- int index;
- int cache;
-@@ -5087,7 +5088,7 @@ int drive_init(struct drive_opt *arg, int snapshot,
- char *str = arg->opt;
- char *params[] = { "bus", "unit", "if", "index", "cyls", "heads",
- "secs", "trans", "media", "snapshot", "file",
-- "cache", "boot", NULL };
-+ "cache", "boot", "format", NULL };
-
- if (check_params(buf, sizeof(buf), params, str) < 0) {
- fprintf(stderr, "qemu: unknown parameter '%s' in '%s'\n",
-@@ -5271,6 +5272,14 @@ int drive_init(struct drive_opt *arg, int snapshot,
- }
- }
-
-+ if (get_param_value(buf, sizeof(buf), "format", str)) {
-+ drv = bdrv_find_format(buf);
-+ if (!drv) {
-+ fprintf(stderr, "qemu: '%s' invalid format\n", buf);
-+ return -1;
-+ }
-+ }
-+
- if (arg->file == NULL)
- get_param_value(file, sizeof(file), "file", str);
- else
-@@ -5376,7 +5385,7 @@ int drive_init(struct drive_opt *arg, int snapshot,
- bdrv_flags |= BDRV_O_SNAPSHOT;
- if (!cache)
- bdrv_flags |= BDRV_O_DIRECT;
-- if (bdrv_open(bdrv, file, bdrv_flags) < 0 || qemu_key_check(bdrv, file)) {
-+ if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0 || qemu_key_check(bdrv,
file)) {
- fprintf(stderr, "qemu: could not open disk image %s\n",
- file);
- return -1;
diff --git a/source/xapps-extra/kvm/FrugalBuild
b/source/xapps-extra/kvm/FrugalBuild
index 057e989..46b4b3e 100644
--- a/source/xapps-extra/kvm/FrugalBuild
+++ b/source/xapps-extra/kvm/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: AlexExtreme <[EMAIL PROTECTED]>
pkgname=kvm
-pkgver=68
+pkgver=69
pkgrel=1
pkgdesc="KVM is a kernel based virtual machine"
url="http://kvm.sourceforge.net";
@@ -12,9 +12,7 @@ archs=('i686' 'x86_64')
Finclude sourceforge
depends=('sdl' 'zlib')
makedepends=('gcc-3.3')
-source=($source CVE-2008-2004.diff)
-sha1sums=('d7e3f8523df9973f55c6932140573d12f416c201' \
- '9e8ae7c0c57784b8dd85794808286d631963bde0')
+sha1sums=('f90033e6a8336c8bb242e50b58d11a0293c9851d')
Fconfopts="--prefix=$Fprefix"
# no changelog in the tarball, you can reach it here:
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
