Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d6c38d224e605c2100eaed76a88a0cf9b17ba60
commit 8d6c38d224e605c2100eaed76a88a0cf9b17ba60
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sun Mar 8 12:36:48 2009 +0100
qemu-0.10.0-1-i686
- version bump, as 0.9.1 is unable to boot our ppc installer and this
one is able to do so
diff --git a/source/xapps-extra/qemu/CVE-2008-2004.diff
b/source/xapps-extra/qemu/CVE-2008-2004.diff
deleted file mode 100644
index 7c8582e..0000000
--- a/source/xapps-extra/qemu/CVE-2008-2004.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-add format= to drive options (CVE-2008-2004)
-
-It is possible for a guest with a raw formatted disk image to write a
-header to that disk image describing another format (such as qcow2).
-Stopping and subsequent restart of the guest will cause qemu to detect
-that format, and could allow the guest to read any host file if qemu is
-sufficiently privileged (typical in virt environments).
-
-The patch defaults to existing behaviour (probing based on file contents),
-so it still requires the mgmt app (e.g. libvirt xml) to pass a new
-"format=raw" parameter for raw disk images.
-
-Originally noted by Avi Kivity, patch from Chris Wright.
-
-Index: trunk/vl.c
-===================================================================
---- trunk/vl.c (revision 4276)
-+++ trunk/vl.c (revision 4277)
-@@ -4961,6 +4961,7 @@
- int bus_id, unit_id;
- int cyls, heads, secs, translation;
- BlockDriverState *bdrv;
-+ BlockDriver *drv = NULL;
- int max_devs;
- int index;
- int cache;
-@@ -4968,7 +4969,7 @@
- char *str = arg->opt;
- char *params[] = { "bus", "unit", "if", "index", "cyls", "heads",
- "secs", "trans", "media", "snapshot", "file",
-- "cache", NULL };
-+ "cache", "format", NULL };
-
- if (check_params(buf, sizeof(buf), params, str) < 0) {
- fprintf(stderr, "qemu: unknown parameter '%s' in '%s'\n",
-@@ -5051,6 +5051,14 @@
- }
- }
-
-+ 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;
-+ }
-+ }
-+
- get_param_value(file, sizeof(file), "file", str);
-
- /* compute bus and unit according index */
-@@ -5238,7 +5247,7 @@
- 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;
-Index: trunk/qemu-doc.texi
-===================================================================
---- trunk/qemu-doc.texi (revision 4276)
-+++ trunk/qemu-doc.texi (revision 4277)
-@@ -261,6 +261,10 @@
- @var{snapshot} is "on" or "off" and allows to enable snapshot for given drive
(see @option{-snapshot}).
- @item cac...@var{cache}
- @var{cache} is "on" or "off" and allows to disable host cache to access data.
-...@item form...@var{format}
-+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/source/xapps-extra/qemu/FrugalBuild
b/source/xapps-extra/qemu/FrugalBuild
index 504b1c0..f3ba53e 100644
--- a/source/xapps-extra/qemu/FrugalBuild
+++ b/source/xapps-extra/qemu/FrugalBuild
@@ -4,29 +4,26 @@
USE_DEVEL=${USE_DEVEL:-"n"}
pkgname=qemu
-pkgver=0.9.1
+pkgver=0.10.0
Fuse $USE_DEVEL && pkgver=svn6369
-pkgrel=6
+pkgrel=1
Fuse $USE_DEVEL && pkgrel=1
pkgdesc="QEMU is a FAST! processor emulator"
-url="http://bellard.org/qemu/";
-depends=('sdl' 'zlib' 'alsa-lib')
+url="http://www.nongnu.org/qemu/";
+depends=('libx11' 'sdl' 'zlib' 'alsa-lib')
makedepends=('texi2html')
-Fuse $USE_DEVEL || makedepends=(${makedepen...@]} 'gcc-3.3')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump $url/download.html|grep Source|sed 's/.*-\(.*\)\.t.*/\1/'"
-source=($url/$pkgname-$pkgver.tar.gz rc.qemu rc.qemu-hu.po \
- rc.qemu-system qemu-system README.Frugalware \
- CVE-2008-2004.diff qemu-0.9.1-dirent.patch)
-sha1sums=('630ea20b5989f0df00128de7f7be661c573ed041' \
+source=(http://download.savannah.gnu.org/releases/qemu/qemu-$pkgver.tar.gz \
+ rc.qemu rc.qemu-hu.po \
+ rc.qemu-system qemu-system README.Frugalware)
+sha1sums=('87b6aa3b201dcdfd91d83c27b2d3e4495770c351' \
'563c18fe297f1e79b0172e3b426310ac5fbf1a83' \
'ce31601e5712057938227923d4a9adf16eeb36e7' \
'd7098b739aa58a004dc61e8e4124751aefad47b3' \
'b1c2b53ef74d1461bbd4f83b8a4f1180187f6a30' \
- '17454e4d54872d32071d478774f96cbab8bb0902' \
- 'b7d868669c5324c3afd8d0e0d75f7406150e9839' \
- '8b873471f2473fdbc9cb58bfc069f6a306a544d3')
+ '17454e4d54872d32071d478774f96cbab8bb0902')
if Fuse $USE_DEVEL; then
source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]})
@@ -40,12 +37,10 @@ build()
{
if Fuse $USE_DEVEL; then
Funpack_scm
- else
- Fconfopts="$Fconfopts --enable-alsa"
fi
Fpatchall
Fsed 'sdl_static=yes' 'sdl_static=no' configure
- unset CFLAGS
+ #unset CFLAGS
Fmake
make prefix=$Fdestdir$Fprefix bindir=$Fdestdir$Fprefix/bin \
datadir=$Fdestdir$Fprefix/share/qemu \
diff --git a/source/xapps-extra/qemu/qemu-0.9.1-dirent.patch
b/source/xapps-extra/qemu/qemu-0.9.1-dirent.patch
deleted file mode 100644
index 3457176..0000000
--- a/source/xapps-extra/qemu/qemu-0.9.1-dirent.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu-0.9.1/linux-user/syscall.c.BAD 2008-12-31 20:20:00.000000000
-0600
-+++ qemu-0.9.1/linux-user/syscall.c 2008-12-31 20:20:27.000000000 -0600
-@@ -66,7 +66,7 @@
- #include <linux/cdrom.h>
- #include <linux/hdreg.h>
- #include <linux/soundcard.h>
--#include <linux/dirent.h>
-+#include <dirent.h>
- #include <linux/kd.h>
-
- #include "qemu.h"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
