[119188] trunk/dports/emulators/qemu

[raimue at macports.org]

Revision: 119188
          https://trac.macports.org/changeset/119188
Author:   raimue at macports.org
Date:     2014-04-19 08:23:06 -0700 (Sat, 19 Apr 2014)
Log Message:
-----------
emulators/qemu:
Update to version 2.0.0

Modified Paths:
--------------
    trunk/dports/emulators/qemu/Portfile
    trunk/dports/emulators/qemu/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff

Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile	2014-04-19 13:57:03 UTC (rev 119187)
+++ trunk/dports/emulators/qemu/Portfile	2014-04-19 15:23:06 UTC (rev 119188)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name                    qemu
-version                 1.7.1
-revision                2
+version                 2.0.0
 categories              emulators
 license                 GPL-2+
 platforms               darwin
@@ -20,11 +19,10 @@
 master_sites            ${homepage}/download
 use_bzip2 yes
 
-checksums               rmd160  911394542106b88ff44df410827aae4aad0cd096 \
-                        sha256  d68942a004222eebae5d156ceefb308fabd98edb282d1dde49ec810bbf01bef4
+checksums               rmd160  ecd05e036431c14930ae2455a032495dd7ebaf85 \
+                        sha256  60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b
 
-patchfiles              patch-configure.diff \
-                        patch-smart-selftest-counter.diff
+patchfiles              patch-configure.diff
 
 depends_build           port:texinfo \
                         port:libtool \

Modified: trunk/dports/emulators/qemu/files/patch-configure.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-configure.diff	2014-04-19 13:57:03 UTC (rev 119187)
+++ trunk/dports/emulators/qemu/files/patch-configure.diff	2014-04-19 15:23:06 UTC (rev 119188)
@@ -1,16 +1,13 @@
---- configure.orig	2012-09-07 17:13:15.000000000 +0200
-+++ configure	2012-09-07 17:14:01.000000000 +0200
-@@ -457,12 +457,7 @@
- Darwin)
+--- configure.orig	2014-04-17 15:44:44.000000000 +0200
++++ configure	2014-04-19 15:04:58.000000000 +0200
+@@ -577,10 +577,6 @@
    bsd="yes"
    darwin="yes"
+   LDFLAGS_SHARED="-bundle -undefined dynamic_lookup"
 -  if [ "$cpu" = "x86_64" ] ; then
 -    QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS"
 -    LDFLAGS="-arch x86_64 $LDFLAGS"
--  else
--    QEMU_CFLAGS="-mdynamic-no-pic $QEMU_CFLAGS"
 -  fi
-+  QEMU_CFLAGS="-mdynamic-no-pic $QEMU_CFLAGS"
    cocoa="yes"
    audio_drv_list="coreaudio"
    audio_possible_drivers="coreaudio sdl fmod"

Deleted: trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff
===================================================================
--- trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff	2014-04-19 13:57:03 UTC (rev 119187)
+++ trunk/dports/emulators/qemu/files/patch-smart-selftest-counter.diff	2014-04-19 15:23:06 UTC (rev 119188)
@@ -1,42 +0,0 @@
-Security-Report: http://seclists.org/oss-sec/2014/q2/116
-Security-CVE: CVE-2014-2894
-
-From 940973ae0b45c9b6817bab8e4cf4df99a9ef83d7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Beno=C3=AEt=20Canet?= <benoit.canet at irqsave.net>
-Date: Sat, 12 Apr 2014 22:59:50 +0200
-Subject: [PATCH] ide: Correct improper smart self test counter reset in ide
- core.
-
-The SMART self test counter was incorrectly being reset to zero,
-not 1. This had the effect that on every 21st SMART EXECUTE OFFLINE:
- * We would write off the beginning of a dynamically allocated buffer
- * We forgot the SMART history
-Fix this.
-
-Signed-off-by: Benoit Canet <benoit at irqsave.net>
-Message-id: 1397336390-24664-1-git-send-email-benoit.canet at irqsave.net
-Reviewed-by: Markus Armbruster <armbru at redhat.com>
-Cc: qemu-stable at nongnu.org
-Acked-by: Kevin Wolf <kwolf at redhat.com>
-[PMM: tweaked commit message as per suggestions from Markus]
-Signed-off-by: Peter Maydell <peter.maydell at linaro.org>
----
- hw/ide/core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git hw/ide/core.c hw/ide/core.c
-index e1dfe54..c943a4d 100644
---- hw/ide/core.c
-+++ hw/ide/core.c
-@@ -1602,7 +1602,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd)
-         case 2: /* extended self test */
-             s->smart_selftest_count++;
-             if (s->smart_selftest_count > 21) {
--                s->smart_selftest_count = 0;
-+                s->smart_selftest_count = 1;
-             }
-             n = 2 + (s->smart_selftest_count - 1) * 24;
-             s->smart_selftest_data[n] = s->sector;
--- 
-1.9.2
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140419/f913bfab/attachment.html>