Skip to content

vendor: opencontainers/selinux v1.3.3, and update golang.org/x/sys#2230

Merged
AkihiroSuda merged 3 commits intoopencontainers:masterfrom
thaJeztah:update_selinux_v1.3.1
Mar 4, 2020
Merged

vendor: opencontainers/selinux v1.3.3, and update golang.org/x/sys#2230
AkihiroSuda merged 3 commits intoopencontainers:masterfrom
thaJeztah:update_selinux_v1.3.1

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Feb 20, 2020 •
edited
Loading

thaJeztah
thaJeztah commented Feb 20, 2020
View reviewed changes
vendor.conf
github.com/docker/go-units 47565b4f722fb6ceae66b95f853feed578a4a51c # v0.3.3
github.com/urfave/cli cfb38830724cc34fedffe9a2a29fb54fa9169cd1 # v1.20.0
golang.org/x/sys 9eafafc0a87e0fd0aeeba439a4573537970c44c7 https://github.com/golang/sys
golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf https://github.com/golang/sys
Copy link
Member Author

@thaJeztah thaJeztah Feb 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This matches the updated version in opencontainers/selinux; https://github.com/opencontainers/selinux/blob/v1.3.1/go.mod#L7

@thaJeztah thaJeztah requested a review from cyphar February 20, 2020 13:24
@cyphar
Copy link
Member

cyphar commented Feb 21, 2020 •
edited by caniszczyk
Loading

LGTM.

Approved with PullApprove

odinuge
odinuge approved these changes Feb 24, 2020
View reviewed changes
Copy link
Member

@odinuge odinuge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, but v1.3.2 is also released now: opencontainers/selinux@v1.3.1...v1.3.2

@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 24, 2020

Thanks for the heads-up; are any local changes expected to be needed in the v1.3.2 update? I can either push another commit to this branch, or do a follow-up once this is merged

@cyphar
Copy link
Member

cyphar commented Feb 25, 2020

Just push another commit (or update the existing one).

@thaJeztah thaJeztah changed the title vendor: opencontainers/selinux v1.3.1, and update golang.org/x/sys vendor: opencontainers/selinux v1.3.2, and update golang.org/x/sys Feb 28, 2020
@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 28, 2020

@odinuge @cyphar @kolyshkin updated, ptal 👍

@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 28, 2020

I just see a comment that a change in v1.3.2 broke 32bit / arm; opencontainers/selinux#64 (comment)

@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 28, 2020 •
edited
Loading

^ the above is fixed on master through opencontainers/selinux#71, but not yet in a release

@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 28, 2020

Looks like CI caught that regression;

# github.com/opencontainers/runc/vendor/github.com/opencontainers/selinux/go-selinux
vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go:118:14: constant 718668 overflows int32
Makefile:126: recipe for target 'localcross' failed
make: *** [localcross] Error 2
Makefile:123: recipe for target 'cross' failed
make: *** [cross] Error 2

@odinuge
Copy link
Member

odinuge commented Feb 28, 2020

v1.3.3 is live now https://github.com/opencontainers/selinux/releases/tag/v1.3.3 🎉

@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 28, 2020

Ah, great! Let me update

@thaJeztah thaJeztah force-pushed the update_selinux_v1.3.1 branch from 3f4a777 to 2a14232 Compare February 28, 2020 18:17
@thaJeztah thaJeztah changed the title vendor: opencontainers/selinux v1.3.2, and update golang.org/x/sys vendor: opencontainers/selinux v1.3.3, and update golang.org/x/sys Feb 28, 2020
@thaJeztah
Copy link
Member Author

thaJeztah commented Feb 28, 2020

Updated to v1.3.3 👍

thaJeztah added 3 commits March 2, 2020 12:41
@thaJeztah
vendor: update opencontainers/selinux v1.3.1
c295a63 
full diff: opencontainers/selinux@5215b18...v1.3.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
22e00dd 
full diff: golang/sys@9eafafc...52ab431

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
vendor: update opencontainers/selinux v1.3.3
d895333 
full diff: opencontainers/selinux@v1.3.1...v1.3.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the update_selinux_v1.3.1 branch from 2a14232 to d895333 Compare March 2, 2020 11:41
@AkihiroSuda
Copy link
Member

AkihiroSuda commented Mar 4, 2020 •
edited
Loading

LGTM

Approved with PullApprove

kolyshkin
kolyshkin approved these changes Mar 4, 2020
View reviewed changes
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah can you update the description to include v1.3.3 please?

@mrunalp
Copy link
Contributor

mrunalp commented Mar 4, 2020 •
edited by AkihiroSuda
Loading

LGTM

Approved with PullApprove

@AkihiroSuda
Copy link
Member

AkihiroSuda commented Mar 4, 2020

pullapprove didn't pick my LGTM, but merging

@AkihiroSuda AkihiroSuda merged commit c4730fa into opencontainers:master Mar 4, 2020
@thaJeztah thaJeztah deleted the update_selinux_v1.3.1 branch March 4, 2020 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cyphar cyphar cyphar approved these changes

@kolyshkin kolyshkin kolyshkin approved these changes

+1 more reviewer

@odinuge odinuge odinuge approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@thaJeztah @cyphar @odinuge @AkihiroSuda @mrunalp @kolyshkin