diff --git a/docs/release-notes.md b/docs/release-notes.md index 5468d6d38..e48c6fe6e 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -19,6 +19,13 @@ nav_order: 9 +## Ignition 2.16.1 (2023-07-10) + +### Bug fixes + +- Fix build on 32-bit systems + + ## Ignition 2.16.0 (2023-06-29) Starting with this release, ignition-validate binaries are signed with the diff --git a/go.mod b/go.mod index 4e221902e..3b7a53d5d 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( cloud.google.com/go/storage v1.31.0 github.com/aws/aws-sdk-go v1.44.298 github.com/beevik/etree v1.2.0 - github.com/containers/libhvee v0.2.0 + github.com/containers/libhvee v0.3.0 github.com/coreos/go-semver v0.3.1 github.com/coreos/go-systemd/v22 v22.5.0 github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 diff --git a/go.sum b/go.sum index 0e18768cb..294b352b1 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/containers/libhvee v0.2.0 h1:6h7LdSvBt176oIdMXKkgxdoT/IVP+o/gkwgyjWzvEAo= -github.com/containers/libhvee v0.2.0/go.mod h1:Zr2Qhnl5THW/HQjF1o8HmxXWjvHfJb8fvd0ThTzHMys= +github.com/containers/libhvee v0.3.0 h1:rNLryfM13vzYBVsnSPDIclNDTSKawgKmb84fn4FTE68= +github.com/containers/libhvee v0.3.0/go.mod h1:Zr2Qhnl5THW/HQjF1o8HmxXWjvHfJb8fvd0ThTzHMys= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= diff --git a/vendor/github.com/containers/libhvee/pkg/kvp/config.go b/vendor/github.com/containers/libhvee/pkg/kvp/config.go index 26c2d67f0..d83c713f3 100644 --- a/vendor/github.com/containers/libhvee/pkg/kvp/config.go +++ b/vendor/github.com/containers/libhvee/pkg/kvp/config.go @@ -66,7 +66,10 @@ type hvKvpMsg struct { } type hvKvpMsgRet struct { - error int + // on 64-bit Linux, C int is 32 bits but Go int is 64 bits. use + // unsigned because error values are hex constants outside signed + // integer range. + error uint32 kvpSet hvKvpMsgSet // unused is needed to get to the same struct size as the C version. unused [4856]byte diff --git a/vendor/github.com/containers/libhvee/pkg/kvp/kvp.go b/vendor/github.com/containers/libhvee/pkg/kvp/kvp.go index 394b50cce..737de9dbd 100644 --- a/vendor/github.com/containers/libhvee/pkg/kvp/kvp.go +++ b/vendor/github.com/containers/libhvee/pkg/kvp/kvp.go @@ -56,6 +56,7 @@ next: howMany, err := unix.Poll([]unix.PollFd{pfd}, Timeout) if err != nil { + // loop on retryable errors if err == unix.EINTR { continue } @@ -68,6 +69,7 @@ next: l, err := unix.Read(kvp, asByteSlice) if err != nil { + // loop on retryable errors if err == unix.EAGAIN || err == unix.EINTR || err == unix.EWOULDBLOCK { continue } diff --git a/vendor/modules.txt b/vendor/modules.txt index 863bfd986..f964d47a2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -78,7 +78,7 @@ github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/beevik/etree v1.2.0 ## explicit; go 1.13 github.com/beevik/etree -# github.com/containers/libhvee v0.2.0 +# github.com/containers/libhvee v0.3.0 ## explicit; go 1.18 github.com/containers/libhvee/pkg/kvp # github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb