Update to 1.6.1

Changelog:
* Improve tap networking support for *BSD.
* Bugfixes

7 files changed, 90 insertions, 31 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 8a18526d730..077d268affa 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.116 2013/09/12 15:44:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.117 2013/10/13 12:37:58 ryoon Exp $
 
-DISTNAME=	qemu-1.6.0
+DISTNAME=	qemu-1.6.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
-PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.qemu.org/
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 7f5f430c64e..548d5c8c181 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.87 2013/08/16 21:20:11 adam Exp $
+$NetBSD: distinfo,v 1.88 2013/10/13 12:37:58 ryoon Exp $
 
-SHA1 (qemu-1.6.0.tar.bz2) = 5f754fc128aaafd0c7aee2204d453f4be1ac859e
-RMD160 (qemu-1.6.0.tar.bz2) = e9cd36df6cba757a37dd34b7889f3190e7b6f222
-Size (qemu-1.6.0.tar.bz2) = 12040196 bytes
+SHA1 (qemu-1.6.1.tar.bz2) = ad3ef3709a8ce3a39bd343aa313cefd033afb561
+RMD160 (qemu-1.6.1.tar.bz2) = 96dcbb044812ab0349741bd62eb8e6b79552442f
+Size (qemu-1.6.1.tar.bz2) = 12041317 bytes
 SHA1 (patch-ef) = 871ccf29463dec1bd56d7f7808248c5b1af4d4d6
-SHA1 (patch-et) = 8c876c7ba134345c51f139fa93ea95bcd5146f5d
+SHA1 (patch-et) = fcb253cac9644075a5fcca3733b7260bbaf6f689
 SHA1 (patch-hw_display_omap__dss.c) = af89754a9a078a5b52240473d85351bd447623c0
 SHA1 (patch-hw_net_etraxfs__eth.c) = 444c6f8a8ad26d9762bfc8a0672afbc7b858fc9d
 SHA1 (patch-hw_net_xilinx__axienet.c) = 02461c2cd2985c352626e46ba93844606783460e
-SHA1 (patch-memory.c) = 4b0452da427c52c17ff4b9c38d2caace1c9ce939
-SHA1 (patch-net_tap-bsd.c) = b87c2af1e63fe7a345bff117ef58fc311763338c
+SHA1 (patch-hw_ppc_mac__newworld.c) = e4179ed931be622175d32e6f04a1ecbd7c462d80
+SHA1 (patch-hw_ppc_mac__oldworld.c) = 75e3f5ef4df52188dae2bbfc6c30e23a42c27ed3
+SHA1 (patch-memory.c) = 928e97532946723da8dd0728f08cdfbfee4fd749
 SHA1 (patch-slirp_tcp__subr.c) = 430157ea8a92fe1d6fc4f1f22ea5530641315fe1
 SHA1 (patch-user-exec.c) = ba20197b7c1209357568817cc56d31f8aa5b1905
 SHA1 (patch-util_hbitmap.c) = 372fcbad5272205cd354bc7760ead77e017b07d1
diff --git a/emulators/qemu/patches/patch-et b/emulators/qemu/patches/patch-et
index 25345e7e293..5e0e387ca82 100644
--- a/emulators/qemu/patches/patch-et
+++ b/emulators/qemu/patches/patch-et
@@ -1,6 +1,6 @@
-$NetBSD: patch-et,v 1.9 2013/08/16 21:20:11 adam Exp $
+$NetBSD: patch-et,v 1.10 2013/10/13 12:37:58 ryoon Exp $
 
---- Makefile.orig	2013-08-15 19:56:23.000000000 +0000
+--- Makefile.orig	2013-10-09 19:20:32.000000000 +0000
 +++ Makefile
 @@ -329,8 +329,9 @@ endif
  install-confdir:
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
new file mode 100644
index 00000000000..eabba0c2f00
--- /dev/null
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__newworld.c
@@ -0,0 +1,38 @@
+$NetBSD: patch-hw_ppc_mac__newworld.c,v 1.1 2013/10/13 12:37:58 ryoon Exp $
+
+Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
+
+--- hw/ppc/mac_newworld.c.orig	2013-10-09 19:20:32.000000000 +0000
++++ hw/ppc/mac_newworld.c
+@@ -125,7 +125,7 @@ static uint64_t translate_kernel_address
+     return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
+ }
+ 
+-static hwaddr round_page(hwaddr addr)
++static hwaddr round_pageq(hwaddr addr)
+ {
+     return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
+ }
+@@ -252,7 +252,7 @@ static void ppc_core99_init(QEMUMachineI
+         }
+         /* load initrd */
+         if (initrd_filename) {
+-            initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            initrd_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+             initrd_size = load_image_targphys(initrd_filename, initrd_base,
+                                               ram_size - initrd_base);
+             if (initrd_size < 0) {
+@@ -260,11 +260,11 @@ static void ppc_core99_init(QEMUMachineI
+                          initrd_filename);
+                 exit(1);
+             }
+-            cmdline_base = round_page(initrd_base + initrd_size);
++            cmdline_base = round_pageq(initrd_base + initrd_size);
+         } else {
+             initrd_base = 0;
+             initrd_size = 0;
+-            cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+         }
+         ppc_boot_device = 'm';
+     } else {
diff --git a/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
new file mode 100644
index 00000000000..1885396dcc7
--- /dev/null
+++ b/emulators/qemu/patches/patch-hw_ppc_mac__oldworld.c
@@ -0,0 +1,38 @@
+$NetBSD: patch-hw_ppc_mac__oldworld.c,v 1.1 2013/10/13 12:37:58 ryoon Exp $
+
+Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
+
+--- hw/ppc/mac_oldworld.c.orig	2013-10-09 19:20:32.000000000 +0000
++++ hw/ppc/mac_oldworld.c
+@@ -59,7 +59,7 @@ static uint64_t translate_kernel_address
+     return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
+ }
+ 
+-static hwaddr round_page(hwaddr addr)
++static hwaddr round_pageq(hwaddr addr)
+ {
+     return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
+ }
+@@ -181,7 +181,7 @@ static void ppc_heathrow_init(QEMUMachin
+         }
+         /* load initrd */
+         if (initrd_filename) {
+-            initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            initrd_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+             initrd_size = load_image_targphys(initrd_filename, initrd_base,
+                                               ram_size - initrd_base);
+             if (initrd_size < 0) {
+@@ -189,11 +189,11 @@ static void ppc_heathrow_init(QEMUMachin
+                          initrd_filename);
+                 exit(1);
+             }
+-            cmdline_base = round_page(initrd_base + initrd_size);
++            cmdline_base = round_pageq(initrd_base + initrd_size);
+         } else {
+             initrd_base = 0;
+             initrd_size = 0;
+-            cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+         }
+         ppc_boot_device = 'm';
+     } else {
diff --git a/emulators/qemu/patches/patch-memory.c b/emulators/qemu/patches/patch-memory.c
index c99ce8f9968..455a5776269 100644
--- a/emulators/qemu/patches/patch-memory.c
+++ b/emulators/qemu/patches/patch-memory.c
@@ -1,9 +1,6 @@
-$NetBSD: patch-memory.c,v 1.6 2013/08/16 21:20:11 adam Exp $
+$NetBSD: patch-memory.c,v 1.7 2013/10/13 12:37:58 ryoon Exp $
 
-Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
-(PR lib/43832: ssp causes common names to be defines)
-
---- memory.c.orig	2013-08-15 19:56:23.000000000 +0000
+--- memory.c.orig	2013-10-09 19:20:32.000000000 +0000
 +++ memory.c
 @@ -404,7 +404,7 @@ static void memory_region_read_accessor(
      if (mr->flush_coalesced_mmio) {
diff --git a/emulators/qemu/patches/patch-net_tap-bsd.c b/emulators/qemu/patches/patch-net_tap-bsd.c
deleted file mode 100644
index 87e158e6fb6..00000000000
--- a/emulators/qemu/patches/patch-net_tap-bsd.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-net_tap-bsd.c,v 1.5 2013/08/16 21:20:11 adam Exp $
-
-Make it understand "-net tap,ifname=tap3" on NetBSD.
-
---- net/tap-bsd.c.orig	2013-08-15 19:56:23.000000000 +0000
-+++ net/tap-bsd.c
-@@ -45,6 +45,7 @@ int tap_open(char *ifname, int ifname_si
- #endif
- 
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
-+    defined(__NetBSD__) || \
-     defined(__OpenBSD__) || defined(__APPLE__)
-     /* if no ifname is given, always start the search from tap0/tun0. */
-     int i;