<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c6bc7449ecc0fc326598c14ca3d5fdbe5ee1ce0c">https://github.com/macports/macports-ports/commit/c6bc7449ecc0fc326598c14ca3d5fdbe5ee1ce0c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new c6bc7449ecc qemu: update to 6.2.0
</span>c6bc7449ecc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c6bc7449ecc0fc326598c14ca3d5fdbe5ee1ce0c
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Thu Dec 16 09:03:01 2021 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qemu: update to 6.2.0
</span>---
 emulators/qemu/Portfile                                   | 8 ++++----
 emulators/qemu/files/patch-qemu-configure.diff            | 2 +-
 emulators/qemu/files/patch-qemu-net-colo.diff             | 4 +---
 emulators/qemu/files/patch-qemu-punchhole.diff            | 4 ++--
 emulators/qemu/files/patch-qemu-scripts-entitlements.diff | 2 +-
 emulators/qemu/files/patch-qemu-tcg-region.diff           | 2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/Portfile b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07bed6ad284..02bf2c19780 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup legacysupport 1.1
</span> legacysupport.newest_darwin_requires_legacy 15
 
 name                    qemu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version                 6.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version                 6.2.0
</span> revision                0
 categories              emulators
 license                 GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ homepage                https://www.qemu.org
</span> master_sites            https://download.qemu.org/
 use_xz                  yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  00f21e102c9ca70c154b770d0094fd48568bbdd5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    111258808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  1860d0ab3729a6e247ef69543249d60278d8496e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    115667324
</span> 
 depends_build           port:texinfo \
                         port:libtool \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-configure.diff b/emulators/qemu/files/patch-qemu-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e833f3d9a97..f9d1301a5ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-qemu-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ Use the same Python interpreter that the passed-in Meson does.
</span> 
 --- configure.orig
 +++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1977,6 +1977,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1479,6 +1479,13 @@
</span>  # Remove old dependency files to make sure that they get properly regenerated
  rm -f */config-devices.mak.d
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-net-colo.diff b/emulators/qemu/files/patch-qemu-net-colo.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a917e96054..4414350eaf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-net-colo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-qemu-net-colo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- net/colo.c.orig
 +++ net/colo.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,16 +102,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,14 +109,18 @@
</span>      case IPPROTO_TCP:
      case IPPROTO_UDP:
      case IPPROTO_DCCP:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,12 +10,10 @@
</span>      case IPPROTO_SCTP:
      case IPPROTO_UDPLITE:
          tmp_ports = *(uint32_t *)(pkt->transport_header);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         extract_ip_and_port(tmp_ports, key, pkt);
</span>          break;
 +#ifdef IPPROTO_AH
      case IPPROTO_AH:
          tmp_ports = *(uint32_t *)(pkt->transport_header + 4);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         extract_ip_and_port(tmp_ports, key, pkt);
</span>          break;
 +#endif
      default:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-punchhole.diff b/emulators/qemu/files/patch-qemu-punchhole.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 15c7891ca53..0301f772969 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-punchhole.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-qemu-punchhole.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> --- block/file-posix.c.orig
 +++ block/file-posix.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1830,7 +1830,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1851,7 +1851,9 @@
</span>          ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
                             aiocb->aio_offset, aiocb->aio_nbytes);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-         ret = translate_err(-errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ret = translate_err(ret);
</span> -#elif defined(__APPLE__) && (__MACH__)
 +#elif defined(__APPLE__) && (__MACH__) && \
 +      defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-scripts-entitlements.diff b/emulators/qemu/files/patch-qemu-scripts-entitlements.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 38af47d7166..dfb9eb64f51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-scripts-entitlements.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-qemu-scripts-entitlements.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span>  if $in_place; then
    trap 'rm "$DST.tmp"' exit
 -  cp -af "$SRC" "$DST.tmp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+  cp -pPRf "$SRC" "$DST.tmp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  cp -pPf "$SRC" "$DST.tmp"
</span>    SRC="$DST.tmp"
  else
    cd "$MESON_INSTALL_DESTDIR_PREFIX"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/files/patch-qemu-tcg-region.diff b/emulators/qemu/files/patch-qemu-tcg-region.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 406d9affae0..431e1e0e63e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/files/patch-qemu-tcg-region.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/files/patch-qemu-tcg-region.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- tcg/region.c.orig
 +++ tcg/region.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -775,7 +775,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -684,7 +684,7 @@
</span>       */
      prot = PROT_NONE;
      flags = MAP_PRIVATE | MAP_ANONYMOUS;
</pre><pre style='margin:0'>

</pre>