Index: head/emulators/qemu-devel/files/patch-configure
===================================================================
--- head/emulators/qemu-devel/files/patch-configure	(revision 528889)
+++ head/emulators/qemu-devel/files/patch-configure	(revision 528890)
@@ -1,163 +1,213 @@
---- configure.orig	2019-04-23 18:14:45 UTC
+--- configure.orig	2019-12-12 18:20:47 UTC
 +++ configure
-@@ -396,7 +396,7 @@ DSOSUF=".so"
+@@ -405,7 +405,7 @@ DSOSUF=".so"
  LDFLAGS_SHARED="-shared"
  modules="no"
  prefix="/usr/local"
 -mandir="\${prefix}/share/man"
 +mandir="\${prefix}/man"
  datadir="\${prefix}/share"
  firmwarepath="\${prefix}/share/qemu-firmware"
  qemu_docdir="\${prefix}/share/doc/qemu"
-@@ -476,6 +476,9 @@ numa=""
+@@ -489,6 +489,9 @@ numa=""
  tcmalloc="no"
  jemalloc="no"
  replication="yes"
 +pcap="no"
 +pcap_create="no"
 +bpf="no"
  vxhs=""
  bochs="yes"
  cloop="yes"
-@@ -1118,6 +1121,10 @@ for opt do
+@@ -1125,6 +1128,10 @@ for opt do
    ;;
    --enable-vnc-png) vnc_png="yes"
    ;;
 +  --enable-pcap) pcap="yes"
 +  ;;
 +  --disable-pcap) pcap="no"
 +  ;;
    --disable-slirp) slirp="no"
    ;;
-   --enable-slirp=system) slirp="system"
-@@ -2972,6 +2979,14 @@ if ! check_include "ifaddrs.h" ; then
+   --enable-slirp=git) slirp="git"
+@@ -3023,6 +3030,14 @@ if ! check_include "ifaddrs.h" ; then
  fi
  
  ##########################################
 +# 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
-@@ -3629,7 +3644,7 @@ for i in $glib_modules; do
+@@ -3710,7 +3725,7 @@ for i in $glib_modules; do
          glib_libs=$($pkg_config --libs $i)
          QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
          LIBS="$glib_libs $LIBS"
 -        libs_qga="$glib_libs $libs_qga"
 +        libs_qga="$glib_libs -lintl $libs_qga"
      else
          error_exit "glib-$glib_req_ver $i is required to compile QEMU"
      fi
-@@ -4723,11 +4738,6 @@ has_sphinx_build() {
+@@ -4802,11 +4817,6 @@ has_sphinx_build() {
  if test "$docs" != "no" ; then
    if has makeinfo && has pod2man && has_sphinx_build; then
      docs=yes
 -  else
 -    if test "$docs" = "yes" ; then
 -      feature_not_found "docs" "Install texinfo, Perl/perl-podlators and python-sphinx"
 -    fi
 -    docs=no
    fi
  fi
  
-@@ -4861,7 +4871,7 @@ fi
+@@ -4940,7 +4950,7 @@ fi
  
  # check for libusb
  if test "$libusb" != "no" ; then
 -    if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
 +    if $pkg_config libusb-1.0; then
          libusb="yes"
          libusb_cflags=$($pkg_config --cflags libusb-1.0)
          libusb_libs=$($pkg_config --libs libusb-1.0)
-@@ -5251,7 +5261,51 @@ if test "$debug_stack_usage" = "yes"; then
+@@ -5330,7 +5340,51 @@ if test "$debug_stack_usage" = "yes"; then
    fi
  fi
  
 +##########################################
 +# pcap probe
  
 +if test "$pcap" = "yes" -a "$pcap" != "no"; then
 +  cat > $TMPC << EOF
 +#include <pcap.h>
 +int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); }
 +EOF
 +  if test "$mingw32" = "no" ; then
 +    libpcap=-lpcap
 +  else
 +    libpcap=-lwpcap
 +  fi
 +  if compile_prog "" "$libpcap" ; then
 +    :
 +  else
 +    echo
 +    echo "Error: Could not find pcap"
 +    echo "Make sure to have the pcap libs and headers installed."
 +    echo
 +    exit 1
 +  fi
 +  cat > $TMPC << EOF
 +#include <pcap.h>
 +int main(void)
 +{
 +  char errbuf[PCAP_ERRBUF_SIZE];
 +  return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0);
 +}
 +EOF
 +  if compile_prog "" "$libpcap" ; then
 +    pcap_create="yes"
 +  fi
 +  cat > $TMPC << EOF
 +#define PCAP_DONT_INCLUDE_PCAP_BPF_H
 +#include <pcap.h>
 +#include <net/bpf.h>
 +int main(void) { return (BPF_MAJOR_VERSION); }
 +EOF
 +  if compile_prog ; then
 +    bpf="yes"
 +  fi
 +  libs_softmmu="$libpcap $libs_softmmu"
 +fi # test "$pcap"
 +
  ##########################################
  # check if we have open_by_handle_at
  
-@@ -6332,6 +6386,7 @@ echo "Audio drivers     $audio_drv_list"
+@@ -6352,27 +6406,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] 
+     cat > $TMPC <<EOF
+     int main(void) { return 0; }
+ EOF
+-    textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
++    textseg_ldflags="-Wl,--image-base=$textseg_addr"
+     if ! compile_prog "" "$textseg_ldflags"; then
+-      # In case ld does not support -Ttext-segment, edit the default linker
+-      # script via sed to set the .text start addr.  This is needed on FreeBSD
+-      # at least.
+-      if ! $ld --verbose >/dev/null 2>&1; then
+-        error_exit \
+-            "We need to link the QEMU user mode binaries at a" \
+-            "specific text address. Unfortunately your linker" \
+-            "doesn't support either the -Ttext-segment option or" \
+-            "printing the default linker script with --verbose." \
+-            "If you don't want the user mode binaries, pass the" \
+-            "--disable-user option to configure."
+-      fi
++      textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr"
++      if ! compile_prog "" "$textseg_ldflags"; then
++        # In case ld does not support -Ttext-segment, edit the default linker
++        # script via sed to set the .text start addr.  This is needed on FreeBSD
++        # at least.
++        if ! $ld --verbose >/dev/null 2>&1; then
++          error_exit \
++              "We need to link the QEMU user mode binaries at a" \
++              "specific text address. Unfortunately your linker" \
++              "doesn't support either the -Ttext-segment option or" \
++              "printing the default linker script with --verbose." \
++              "If you don't want the user mode binaries, pass the" \
++              "--disable-user option to configure."
++        fi
+ 
+-      $ld --verbose | sed \
+-        -e '1,/==================================================/d' \
+-        -e '/==================================================/,$d' \
+-        -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
+-        -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
+-      textseg_ldflags="-Wl,-T../config-host.ld"
++        $ld --verbose | sed \
++          -e '1,/==================================================/d' \
++          -e '/==================================================/,$d' \
++          -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \
++          -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld
++        textseg_ldflags="-Wl,-T../config-host.ld"
++      fi
+     fi
+   fi
+ fi
+@@ -6497,6 +6554,7 @@ echo "Audio drivers     $audio_drv_list"
  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 "Multipath support $mpath"
  echo "VNC support       $vnc"
  if test "$vnc" = "yes" ; then
-@@ -6565,6 +6620,15 @@ fi
- if test "$profiler" = "yes" ; then
-   echo "CONFIG_PROFILER=y" >> $config_host_mak
+@@ -6739,6 +6797,15 @@ fi
+ if test "$want_tools" = "yes" ; then
+   echo "CONFIG_TOOLS=y" >> $config_host_mak
  fi
 +if test "$pcap" = "yes" ; then
 +  echo "CONFIG_PCAP=y" >> $config_host_mak
 +  if test "$pcap_create" = "yes" ; then
 +    echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak
 +  fi
 +  if test "$bpf" = "yes" ; then
 +    echo "CONFIG_BPF=y" >> $config_host_mak
 +  fi
 +fi
  if test "$slirp" != "no"; then
    echo "CONFIG_SLIRP=y" >> $config_host_mak
    echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
-@@ -6812,6 +6876,9 @@ fi
+@@ -6986,6 +7053,9 @@ fi
  # if this macro is set.
  if test "$have_fsxattr" = "yes" ; then
      echo "HAVE_FSXATTR=y" >> $config_host_mak
 +fi
 +if test "$have_ifaddrs_h" = "yes" ; then
 +    echo "HAVE_IFADDRS_H=y" >> $config_host_mak
  fi
  if test "$have_copy_file_range" = "yes" ; then
      echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak