<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eab983ebc55ca1f32d8d7757978378d19cd00995">https://github.com/macports/macports-ports/commit/eab983ebc55ca1f32d8d7757978378d19cd00995</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 eab983ebc55 xhyve: update to 20210930
</span>eab983ebc55 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eab983ebc55ca1f32d8d7757978378d19cd00995
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Thu Sep 30 01:05:31 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> xhyve: update to 20210930
</span>---
emulators/xhyve/Portfile | 17 +++-----
emulators/xhyve/files/cast-int.patch | 44 -------------------
emulators/xhyve/files/remove-walloca.patch | 21 ---------
emulators/xhyve/files/xcode-zlib.patch | 69 ------------------------------
4 files changed, 6 insertions(+), 145 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/xhyve/Portfile b/emulators/xhyve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f3c95dde68..6c43aef6806 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/xhyve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/xhyve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,9 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup xcode 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup machyve xhyve eab8ad838868205b872b93129e2ee91ca5328ea9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210922
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup machyve xhyve 0d6ab4201fa46cfc95c59d30f42b25fd7b26b38f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210930
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories emulators
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +20,12 @@ long_description \
</span> It can run FreeBSD and vanilla Linux distributions and \
may gain support for other guest operating systems in the future.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8371e4638d2caee3323338c735156f0a683c3277 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e16034a57ddf4409e7e3939f683820b03891232dffa522bff9e0bc0507c6cecb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11718776
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 10109fdf6743e5c26dee6c49b7cf26a8d4316ff6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 facc800928c05b7826733b03458092b634b888db6d9b58cf21d4ffbc51ea5553 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11719087
</span>
use_xcode yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles cast-int.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- remove-walloca.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xcode-zlib.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:zlib
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/xhyve/files/cast-int.patch b/emulators/xhyve/files/cast-int.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f9edff560b6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/xhyve/files/cast-int.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 55e2b427882624157cbce08a211c5af83043bb2f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed Sep 22 12:30:21 2021 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Explicitly cast to uint8_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Apple clang-1300.0.29.3 (ships with macOS 11.6) requires to use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `-Wno-shorten-64-to-32` and `-Wsnoign-conversion`, or explicitly cast to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- smaller type or signed type.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `immediate` is `int64_t` and `opsize` is 4 bits field which makes mask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clearly no more than 5 bits => cast to `uint8_t` is safe here and just
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- makes clang happy and code clean.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `buf[]` is also `uint8_t` and cast happened before but implicitly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/pci_ahci.c b/src/pci_ahci.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ebd89a5..60619f3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/pci_ahci.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/pci_ahci.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,8 +220,8 @@ static inline void lba_to_msf(uint8_t *buf, int lba)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lba += 150;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buf[0] = (uint8_t) ((lba / 75) / 60);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buf[1] = (lba / 75) % 60;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- buf[2] = lba % 75;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf[1] = (uint8_t) (lba / 75) % 60;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf[2] = (uint8_t) (lba % 75);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/vmm/vmm_instruction_emul.c b/src/vmm/vmm_instruction_emul.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 41fc465..e289977 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/vmm/vmm_instruction_emul.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/vmm/vmm_instruction_emul.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1467,7 +1467,7 @@ emulate_bittest(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * "Range of Bit Positions Specified by Bit Offset Operands"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bitmask = vie->opsize * 8 - 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bitoff = vie->immediate & bitmask;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bitoff = (uint8_t)(vie->immediate & bitmask);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Copy the bit into the Carry flag in %rflags */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (val & (1UL << bitoff))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/xhyve/files/remove-walloca.patch b/emulators/xhyve/files/remove-walloca.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ddfe92bd1a3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/xhyve/files/remove-walloca.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 9acef4a998541ac024c5b9f81a1a1ee0100afdb9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu Sep 23 10:37:14 2021 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Added `-Wunknown-pragmas` as ignored pragma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Old clang fails such us shipped with Yosemite because it has no idea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- about `-Walloca`.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/pci_e82545.c b/src/pci_e82545.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 74f199f..156484e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/pci_e82545.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/pci_e82545.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1413,6 +1413,7 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Allocate, fill and prepend writable header vector. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (hdrlen != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#pragma clang diagnostic ignored "-Wunknown-pragmas"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic ignored "-Walloca"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hdr = __builtin_alloca((size_t)(hdrlen + vlen));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma clang diagnostic push
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/xhyve/files/xcode-zlib.patch b/emulators/xhyve/files/xcode-zlib.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a3d94aa082a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/xhyve/files/xcode-zlib.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 2551316597d2794f10dd6353f21e8f3e5d66e873
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat Sep 25 01:27:10 2021 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Added `libz` dependency to xcode project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `src/rfb.c` uses `zlib`, so, let me add it as dependency to xcode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/xhyve.xcodeproj/project.pbxproj b/xhyve.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ea42127..412fd44 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/xhyve.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/xhyve.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archiveVersion = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- classes = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- objectVersion = 46;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ objectVersion = 52;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- objects = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Begin PBXBuildFile section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,6 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3F3FFA911BF7C6A7004C89A1 /* xhyve.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F3FFA5A1BF7C6A7004C89A1 /* xhyve.c */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3F3FFA921BF7C6A7004C89A1 /* xmsr.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F3FFA5B1BF7C6A7004C89A1 /* xmsr.c */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3F3FFA971BF7CC0E004C89A1 /* xhyve.1 in Install Man Pages */ = {isa = PBXBuildFile; fileRef = 3F3FF9E41BF7C5DC004C89A1 /* xhyve.1 */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BEDAABE626FE9642003ACEFC /* libz.1.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE076A1426FE962A00C43411 /* libz.1.tbd */; platformFilter = maccatalyst; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* End PBXBuildFile section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Begin PBXCopyFilesBuildPhase section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -240,6 +241,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3FB651A01BF7CD4500ED886F /* x86.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = x86.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3FB651A11BF7CD4500ED886F /* xhyve.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xhyve.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3FB651A21BF7CD4500ED886F /* xmsr.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xmsr.h; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BE076A1426FE962A00C43411 /* libz.1.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.tbd; path = usr/lib/libz.1.tbd; sourceTree = SDKROOT; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* End PBXFileReference section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Begin PBXFrameworksBuildPhase section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,6 +249,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isa = PBXFrameworksBuildPhase;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildActionMask = 2147483647;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BEDAABE626FE9642003ACEFC /* libz.1.tbd in Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3F3FF9E91BF7C63A004C89A1 /* Hypervisor.framework in Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runOnlyForDeploymentPostprocessing = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,6 +265,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3F3FF9E51BF7C5ED004C89A1 /* Documentation */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3F3FF9E71BF7C5FF004C89A1 /* Build Support */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3F1934931BF7C0D40099CC46 /* Products */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BE076A1326FE962A00C43411 /* Frameworks */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceTree = "<group>";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usesTabs = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -557,6 +561,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path = io;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sourceTree = "<group>";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BE076A1326FE962A00C43411 /* Frameworks */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ isa = PBXGroup;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ children = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BE076A1426FE962A00C43411 /* libz.1.tbd */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ name = Frameworks;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sourceTree = "<group>";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* End PBXGroup section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Begin PBXNativeTarget section */
</span></pre><pre style='margin:0'>
</pre>