Update to 0.15.1 - Changelog:

	http://wiki.qemu.org/ChangeLog/0.15

5 files changed, 42 insertions, 94 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 41aabe13e02e..5e1fd643e7bb 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.15.0
-PORTREVISION=	1
+PORTVERSION=	0.15.1
 CATEGORIES=	emulators
 MASTER_SITES=	SAVANNAH:release \
 		http://wiki.qemu.org/download/:release \
@@ -85,7 +84,8 @@ CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC} --enable-docs \
 	--disable-linux-user --disable-linux-aio \
 	--disable-darwin-user --disable-kvm --disable-xen \
-	--extra-cflags=-DSMBD_COMMAND=\\\"${LOCALBASE}/sbin/smbd\\\"\ -I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"${PREFIX}\\\"
+	--smbd=${LOCALBASE}/sbin/smbd \
+	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"${PREFIX}\\\"
 
 .if defined(WITHOUT_SDL)
 CONFIGURE_ARGS+=	--disable-sdl
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 186cdb445749..0cd084d1e6df 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,12 +1,12 @@
-SHA256 (qemu/0.15.0/qemu-0.15.0.tar.gz) = 0197e52dba07aeb6dfe0343b0c2ae08ed374d2cb0af3bb9ec73fed5baa0cb74d
-SIZE (qemu/0.15.0/qemu-0.15.0.tar.gz) = 9577243
-SHA256 (qemu/0.15.0/sgabios-read-only-r8.tar.gz) = b5a511f237f9e3fbceb8d406b818253c1661773fc12c3ec14f0580ab15151384
-SIZE (qemu/0.15.0/sgabios-read-only-r8.tar.gz) = 31201
-SHA256 (qemu/0.15.0/hw_e1000_c.patch) = a9c8f29b8493ac62526b2ed4078b3e69c8e9c709a049f4fa11765ce37067e5a5
-SIZE (qemu/0.15.0/hw_e1000_c.patch) = 407
-SHA256 (qemu/0.15.0/net_udp_c.patch) = 6cbe5b229381db94fb6865bb53741217f914749723eea734917143f6db457a51
-SIZE (qemu/0.15.0/net_udp_c.patch) = 4115
-SHA256 (qemu/0.15.0/net_udp_h.patch) = e43853ba86689cb9ace6a177f891ab8536f6fbce21c7e9fa3ee0d5b25c47b463
-SIZE (qemu/0.15.0/net_udp_h.patch) = 1518
-SHA256 (qemu/0.15.0/Makefile_objs.patch) = 7bfed73dfa87b78fd9b3231c1664ff9c871e8b38009b82bf9311573cbb679d58
-SIZE (qemu/0.15.0/Makefile_objs.patch) = 371
+SHA256 (qemu/0.15.1/qemu-0.15.1.tar.gz) = 7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba
+SIZE (qemu/0.15.1/qemu-0.15.1.tar.gz) = 9576745
+SHA256 (qemu/0.15.1/sgabios-read-only-r8.tar.gz) = b5a511f237f9e3fbceb8d406b818253c1661773fc12c3ec14f0580ab15151384
+SIZE (qemu/0.15.1/sgabios-read-only-r8.tar.gz) = 31201
+SHA256 (qemu/0.15.1/hw_e1000_c.patch) = a9c8f29b8493ac62526b2ed4078b3e69c8e9c709a049f4fa11765ce37067e5a5
+SIZE (qemu/0.15.1/hw_e1000_c.patch) = 407
+SHA256 (qemu/0.15.1/net_udp_c.patch) = 6cbe5b229381db94fb6865bb53741217f914749723eea734917143f6db457a51
+SIZE (qemu/0.15.1/net_udp_c.patch) = 4115
+SHA256 (qemu/0.15.1/net_udp_h.patch) = e43853ba86689cb9ace6a177f891ab8536f6fbce21c7e9fa3ee0d5b25c47b463
+SIZE (qemu/0.15.1/net_udp_h.patch) = 1518
+SHA256 (qemu/0.15.1/Makefile_objs.patch) = 7bfed73dfa87b78fd9b3231c1664ff9c871e8b38009b82bf9311573cbb679d58
+SIZE (qemu/0.15.1/Makefile_objs.patch) = 371
diff --git a/emulators/qemu-devel/files/patch-bg b/emulators/qemu-devel/files/patch-bg
index ad7c1125beb1..d557dd5544a6 100644
--- a/emulators/qemu-devel/files/patch-bg
+++ b/emulators/qemu-devel/files/patch-bg
@@ -1,21 +1,15 @@
 Index: qemu/net.h
-@@ -99,12 +99,14 @@
- int slirp_is_inited(void);
- void net_client_check(void);
+@@ -173,8 +173,8 @@ void net_host_device_remove(Monitor *mon
+ int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
+ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
 +#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup"
 +#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown"
-+#ifndef SMBD_COMMAND 
- #ifdef __sun__
- #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
- #else
- #define SMBD_COMMAND "/usr/sbin/smbd"
- #endif
-+#endif
  
- #endif
+ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
+ 
 Index: qemu/net/tap.h
 @@ -29,8 +29,8 @@
  #include "qemu-common.h"
diff --git a/emulators/qemu-devel/files/patch-bsd-user-ld b/emulators/qemu-devel/files/patch-bsd-user-ld
index 61df7d6bf8fc..33c9ad11e384 100644
--- a/emulators/qemu-devel/files/patch-bsd-user-ld
+++ b/emulators/qemu-devel/files/patch-bsd-user-ld
@@ -47,16 +47,16 @@
 -  .rel.plt      :
 -  {
 -    *(.rel.plt)
--    PROVIDE_HIDDEN (__rel_iplt_start = .);
+-    PROVIDE (__rel_iplt_start = .);
 -    *(.rel.iplt)
--    PROVIDE_HIDDEN (__rel_iplt_end = .);
+-    PROVIDE (__rel_iplt_end = .);
 -  }
 -  .rela.plt       :
 -  {
 -    *(.rela.plt)
--    PROVIDE_HIDDEN (__rela_iplt_start = .);
+-    PROVIDE (__rela_iplt_start = .);
 -    *(.rela.iplt)
--    PROVIDE_HIDDEN (__rela_iplt_end = .);
+-    PROVIDE (__rela_iplt_end = .);
 -  }
 +  .rel.dyn        :
 +    {
@@ -106,11 +106,11 @@
      /* .gnu.warning sections are handled specially by elf32.em.  */
      *(.gnu.warning)
    } =0x90909090
-@@ -71,35 +76,36 @@ SECTIONS
+@@ -70,34 +75,37 @@ SECTIONS
+   .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
    .rodata1        : { *(.rodata1) }
    .eh_frame_hdr : { *(.eh_frame_hdr) }
-   .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
--  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table) }
++  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
 +  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
    /* Adjust the address for the data segment.  We want to adjust up to
       the same address within the page on the next page up.  */
@@ -142,8 +142,8 @@
 +  /* Thread Local Storage sections  */
    .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
    .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
--  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
--  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table) }
+-  .eh_frame       : { KEEP (*(.eh_frame)) }
+-  .gcc_except_table   : { *(.gcc_except_table) }
 -  .dynamic        : { *(.dynamic) }
 +  .preinit_array     :
 +  {
@@ -168,7 +168,7 @@
    .ctors          :
    {
      /* gcc uses crtbegin.o to find the start of
-@@ -112,25 +118,37 @@ SECTIONS
+@@ -110,25 +118,37 @@ SECTIONS
         doesn't matter which directory crtbegin.o
         is in.  */
      KEEP (*crtbegin.o(.ctors))
@@ -212,7 +212,7 @@
    __bss_start = .;
    .bss            :
    {
-@@ -139,12 +157,29 @@ SECTIONS
+@@ -137,12 +157,29 @@ SECTIONS
     *(COMMON)
     /* Align here to ensure that the .bss section occupies space up to
        _end.  Align after .bss to ensure correct alignment even if the
@@ -246,7 +246,7 @@
    . = DATA_SEGMENT_END (.);
    /* Stabs debugging sections.  */
    .stab          0 : { *(.stab) }
-@@ -179,4 +214,9 @@ SECTIONS
+@@ -177,4 +214,9 @@ SECTIONS
    .debug_funcnames 0 : { *(.debug_funcnames) }
    .debug_typenames 0 : { *(.debug_typenames) }
    .debug_varnames  0 : { *(.debug_varnames) }
@@ -258,7 +258,7 @@
  }
 --- a/i386.ld
 +++ b/i386.ld
-@@ -1,69 +1,88 @@
+@@ -1,45 +1,47 @@
 -/* ld script to make i386 Linux kernel
 - * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
 - */
@@ -342,20 +342,10 @@
 +  .rel.plt        :
    {
      *(.rel.plt)
--    PROVIDE_HIDDEN (__rel_iplt_start = .);
-+    PROVIDE (__rel_iplt_start = .);
-     *(.rel.iplt)
--    PROVIDE_HIDDEN (__rel_iplt_end = .);
-+    PROVIDE (__rel_iplt_end = .);
-   }
-   .rela.plt       :
-   {
-     *(.rela.plt)
--    PROVIDE_HIDDEN (__rela_iplt_start = .);
-+    PROVIDE (__rela_iplt_start = .);
+     PROVIDE (__rel_iplt_start = .);
+@@ -53,17 +55,34 @@ SECTIONS
      *(.rela.iplt)
--    PROVIDE_HIDDEN (__rela_iplt_end = .);
-+    PROVIDE (__rela_iplt_end = .);
+     PROVIDE (__rela_iplt_end = .);
    }
 -  .init          : { *(.init)	} =0x47ff041f
 -  .text      :
diff --git a/emulators/qemu-devel/files/patch-ppc.ld b/emulators/qemu-devel/files/patch-ppc.ld
index ea911953ab06..87b5234bfba5 100644
--- a/emulators/qemu-devel/files/patch-ppc.ld
+++ b/emulators/qemu-devel/files/patch-ppc.ld
@@ -1,51 +1,15 @@
 --- a/ppc.ld
 +++ b/ppc.ld
-@@ -79,36 +79,34 @@
-   }
-   .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
-   .eh_frame_hdr : { *(.eh_frame_hdr) }
--  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
--  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }
-   /* Adjust the address for the data segment.  We want to adjust up to
-      the same address within the page on the next page up.  */
-   . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN (0x10000, 0x1000);
-   /* Exception handling  */
--  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
--  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
-+  .eh_frame       : { KEEP (*(.eh_frame)) }
-+  .gcc_except_table   : { *(.gcc_except_table .gcc_except_table.*) }
-   /* Thread Local Storage sections  */
-   .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
-   .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
-   .preinit_array     :
-   {
--    PROVIDE_HIDDEN (__preinit_array_start = .);
-+    PROVIDE (__preinit_array_start = .);
-     KEEP (*(.preinit_array))
--    PROVIDE_HIDDEN (__preinit_array_end = .);
-+    PROVIDE (__preinit_array_end = .);
-   }
-   .init_array     :
-   {
--     PROVIDE_HIDDEN (__init_array_start = .);
-+     PROVIDE (__init_array_start = .);
+@@ -99,7 +99,7 @@ SECTIONS
+      PROVIDE (__init_array_start = .);
       KEEP (*(SORT(.init_array.*)))
       KEEP (*(.init_array))
--     PROVIDE_HIDDEN (__init_array_end = .);
+-     PROVIDE (__init_array_end = .);
 +     PROVIDE(__init_array_end = .);
    }
    .fini_array     :
    {
--    PROVIDE_HIDDEN (__fini_array_start = .);
-+    PROVIDE (__fini_array_start = .);
-     KEEP (*(.fini_array))
-     KEEP (*(SORT(.fini_array.*)))
--    PROVIDE_HIDDEN (__fini_array_end = .);
-+    PROVIDE (__fini_array_end = .);
-   }
-   .ctors          :
-   {
-@@ -142,9 +140,8 @@
+@@ -140,9 +140,8 @@ SECTIONS
    .got1           : { *(.got1) }
    .got2           : { *(.got2) }
    .dynamic        : { *(.dynamic) }
@@ -57,7 +21,7 @@
    .data           :
    {
      *(.data .data.* .gnu.linkonce.d.*)
-@@ -152,7 +149,7 @@
+@@ -150,7 +149,7 @@ SECTIONS
      SORT(CONSTRUCTORS)
    }
    .data1          : { *(.data1) }
@@ -66,7 +30,7 @@
    /* We want the small data sections together, so single-instruction offsets
       can access them all, and initialized data all before uninitialized, so
       we can shorten the on-disk segment size.  */
-@@ -171,7 +168,7 @@
+@@ -169,7 +168,7 @@ SECTIONS
      *(.scommon)
      PROVIDE (__sbss_end = .); PROVIDE (___sbss_end = .);
    }