emulators/qemu-devel: Update version 2.4.0=>2.5.0

- Remove nox@ from MASTER_SITES (R.I.P. nox)
- Take MAINTAINERSHIP
- Add LICENSE (GPLv2)
- Convert to OPTIONSNG
- Fix patch files to be 'make makepatch' compatible
- Fix Multiple Security Vulnerabilities [1]

PR:		203112 [1]
Submitted by:	venture37@geeklan.co.uk [1]
Security:	CVE-2015-5165 [1]
		CVE-2015-5745 [1]
		CVE-2015-5154 [1]
		CVE-2015-5225 [1]
Differential Revision:	https://reviews.freebsd.org/D3691

1 files changed, 101 insertions, 46 deletions

diff --git a/emulators/qemu-devel/files/pcap-patch b/emulators/qemu-devel/files/pcap-patch
index d31c1c9eda17..0c798e5b1ca5 100644
--- a/emulators/qemu-devel/files/pcap-patch
+++ b/emulators/qemu-devel/files/pcap-patch
@@ -1,16 +1,27 @@
---- configure.orig	2015-08-11 19:11:05 UTC
-+++ configure
-@@ -338,6 +338,9 @@ libssh2=""
+configure
+--- configure	2015-12-17 04:04:48.000000000 +0600
++++ configure	2015-12-25 01:32:09.000000000 +0600
+@@ -342,6 +342,10 @@
+ tpm="yes"
+ libssh2=""
  vhdx=""
- numa=""
- tcmalloc="no"
++quorum="no"
 +pcap="no"
 +pcap_create="no"
 +bpf="no"
- 
- # parse CC options first
- for opt do
-@@ -896,6 +899,10 @@ for opt do
+ numa=""
+ tcmalloc="no"
+ jemalloc="no"
+@@ -602,7 +606,7 @@
+   audio_drv_list="oss"
+   audio_possible_drivers="oss sdl pa"
+   # needed for kinfo_getvmmap(3) in libutil.h
+-  LIBS="-lutil $LIBS"
++  LIBS="-lprocstat -lkvm -lelf -lutil $LIBS"
+   netmap=""  # enable netmap autodetect
+   HOST_VARIANT_DIR="freebsd"
+ ;;
+@@ -905,6 +909,10 @@
    ;;
    --enable-vnc-png) vnc_png="yes"
    ;;
@@ -21,10 +32,26 @@
    --disable-slirp) slirp="no"
    ;;
    --disable-uuid) uuid="no"
-@@ -2354,6 +2361,51 @@ EOF
- fi
+@@ -2427,6 +2435,14 @@
+ 
  
  ##########################################
++# getifaddrs (for tests/test-io-channel-socket )
++
++have_ifaddrs_h=yes
++if ! check_include "ifaddrs.h" ; then
++  have_ifaddrs_h=no
++fi
++
++##########################################
+ # VTE probe
+ 
+ if test "$vte" != "no"; then
+@@ -2569,6 +2585,50 @@
+   fi
+ fi
+ 
++##########################################
 +# pcap probe
 +
 +if test "$pcap" = "yes" -a "$pcap" != "no"; then
@@ -68,20 +95,31 @@
 +  fi
 +  libs_softmmu="$libpcap $libs_softmmu"
 +fi # test "$pcap"
-+
-+##########################################
- # VNC TLS/WS detection
- if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then
-   cat > $TMPC <<EOF
-@@ -4515,6 +4567,7 @@ echo "Audio drivers     $audio_drv_list"
+ 
+ ##########################################
+ # VNC SASL detection
+@@ -4758,7 +4833,11 @@
+ echo "GNUTLS support    $gnutls"
+ echo "GNUTLS hash       $gnutls_hash"
+ echo "libgcrypt         $gcrypt"
+-echo "nettle            $nettle ${nettle+($nettle_version)}"
++if test "$nettle" = "yes"; then
++    echo "nettle            $nettle ($nettle_version)"
++else
++    echo "nettle            $nettle"
++fi
+ echo "libtasn1          $tasn1"
+ echo "VTE support       $vte"
+ echo "curses support    $curses"
+@@ -4769,6 +4848,7 @@
  echo "Block whitelist (rw) $block_drv_rw_whitelist"
  echo "Block whitelist (ro) $block_drv_ro_whitelist"
  echo "VirtFS support    $virtfs"
 +echo "pcap support      $pcap"
  echo "VNC support       $vnc"
  if test "$vnc" = "yes" ; then
-     echo "VNC TLS support   $vnc_tls"
-@@ -4692,6 +4745,15 @@ fi
+     echo "VNC SASL support  $vnc_sasl"
+@@ -4947,6 +5027,15 @@
  if test "$profiler" = "yes" ; then
    echo "CONFIG_PROFILER=y" >> $config_host_mak
  fi
@@ -97,24 +135,35 @@
  if test "$slirp" = "yes" ; then
    echo "CONFIG_SLIRP=y" >> $config_host_mak
    echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
---- net/clients.h.orig	2015-08-11 19:11:09 UTC
-+++ net/clients.h
-@@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio
- 
- int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
+@@ -5137,6 +5226,9 @@
+ if test "$tasn1" = "yes" ; then
+   echo "CONFIG_TASN1=y" >> $config_host_mak
+ fi
++if test "$have_ifaddrs_h" = "yes" ; then
++    echo "HAVE_IFADDRS_H=y" >> $config_host_mak
++fi
+ if test "$vte" = "yes" ; then
+   echo "CONFIG_VTE=y" >> $config_host_mak
+   echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
+diff -ruN net/clients.h net/clients.h
+--- net/clients.h	2015-12-17 04:04:50.000000000 +0600
++++ net/clients.h	2015-12-25 01:32:09.000000000 +0600
+@@ -47,6 +47,11 @@
+ int net_init_bridge(const NetClientOptions *opts, const char *name,
                      NetClientState *peer, Error **errp);
-+
+ 
 +#ifdef CONFIG_PCAP
 +int net_init_pcap(const NetClientOptions *opts, const char *name,
-+                  NetClientState *peer);
++                  NetClientState *peer, Error **errp);
 +#endif
 +
+ int net_init_l2tpv3(const NetClientOptions *opts, const char *name,
+                     NetClientState *peer, Error **errp);
  #ifdef CONFIG_VDE
- int net_init_vde(const NetClientOptions *opts, const char *name,
-                  NetClientState *peer, Error **errp);
---- net/hub.c.orig	2015-08-11 19:11:09 UTC
-+++ net/hub.c
-@@ -322,6 +322,7 @@ void net_hub_check_clients(void)
+diff -ruN net/hub.c net/hub.c
+--- net/hub.c	2015-12-17 04:04:50.000000000 +0600
++++ net/hub.c	2015-12-25 01:32:09.000000000 +0600
+@@ -322,6 +322,7 @@
              case NET_CLIENT_OPTIONS_KIND_SOCKET:
              case NET_CLIENT_OPTIONS_KIND_VDE:
              case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
@@ -122,11 +171,12 @@
                  has_host_dev = 1;
                  break;
              default:
---- net/net.c.orig	2015-08-11 19:11:09 UTC
-+++ net/net.c
-@@ -45,6 +45,11 @@
- #include "qapi/dealloc-visitor.h"
+diff -ruN net/net.c net/net.c
+--- net/net.c	2015-12-17 04:04:50.000000000 +0600
++++ net/net.c	2015-12-25 01:32:09.000000000 +0600
+@@ -46,6 +46,11 @@
  #include "sysemu/sysemu.h"
+ #include "net/filter.h"
  
 +#include <sys/ioctl.h>
 +#ifdef __FreeBSD__
@@ -136,7 +186,7 @@
  /* Net bridge is currently not supported for W32. */
  #if !defined(_WIN32)
  # define CONFIG_NET_BRIDGE
-@@ -880,6 +885,221 @@ static int net_init_nic(const NetClientO
+@@ -942,8 +947,224 @@
      return idx;
  }
  
@@ -211,9 +261,10 @@
 + * ... -net pcap,ifname="..."
 + */
 +
-+int net_init_pcap(const NetClientOptions *opts, const char *name, NetClientState *peer)
++int net_init_pcap(const NetClientOptions *opts,
++    const char *name, NetClientState *peer, Error **errp)
 +{
-+    const NetdevPcapOptions *pcap_opts = opts->pcap;
++    const NetdevPcapOptions *pcap_opts = opts->u.pcap;
 +    NetClientState *nc;
 +    struct PCAPState *s;
 +    const char *ifname;
@@ -356,9 +407,12 @@
 +
 +#endif
  
- static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
+-static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
++static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
      const NetClientOptions *opts,
-@@ -901,6 +1121,9 @@ static int (* const net_client_init_fun[
+     const char *name,
+     NetClientState *peer, Error **errp) = {
+@@ -963,6 +1184,9 @@
  #ifdef CONFIG_NET_BRIDGE
          [NET_CLIENT_OPTIONS_KIND_BRIDGE]    = net_init_bridge,
  #endif
@@ -368,9 +422,10 @@
          [NET_CLIENT_OPTIONS_KIND_HUBPORT]   = net_init_hubport,
  #ifdef CONFIG_VHOST_NET_USED
          [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user,
---- qapi-schema.json.orig	2015-08-11 19:11:09 UTC
-+++ qapi-schema.json
-@@ -2423,6 +2423,10 @@
+diff -ruN qapi-schema.json qapi-schema.json
+--- qapi-schema.json	2015-12-17 04:04:50.000000000 +0600
++++ qapi-schema.json	2015-12-25 01:32:09.000000000 +0600
+@@ -2538,6 +2538,10 @@
      '*br':     'str',
      '*helper': 'str' } }
  
@@ -381,11 +436,11 @@
  ##
  # @NetdevHubPortOptions
  #
-@@ -2490,6 +2494,7 @@
+@@ -2608,6 +2612,7 @@
+     'nic':      'NetLegacyNicOptions',
      'user':     'NetdevUserOptions',
      'tap':      'NetdevTapOptions',
-     'l2tpv3':   'NetdevL2TPv3Options',
 +    'pcap':     'NetdevPcapOptions',
+     'l2tpv3':   'NetdevL2TPv3Options',
      'socket':   'NetdevSocketOptions',
      'vde':      'NetdevVdeOptions',
-     'dump':     'NetdevDumpOptions',