3 files changed, 26 insertions, 131 deletions

diff --git a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
index e27e1fa8..14b2714f 100644
--- a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
+++ b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
@@ -18,39 +18,25 @@ Index: import/Makefile
 ===================================================================
 --- import.orig/Makefile
 +++ import/Makefile
-@@ -69,7 +69,7 @@
- # triggered.
- SOURCES = $(shell find . -path './.*' -prune -o \( \( -name '*.go' -o -name '*.c' \) -a ! -name '*_test.go' \) -print)
- 
--BUILDFLAGS := -mod=vendor $(BUILDFLAGS)
-+GOBUILDFLAGS := -mod=vendor $(GOBUILDFLAGS)
- 
- BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay
- CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
-@@ -264,11 +264,11 @@
+@@ -242,7 +242,7 @@
  
  .PHONY: test/checkseccomp/checkseccomp
- test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go)
+ test/checkseccomp/checkseccomp: $(wildcard test/checkseccomp/*.go)
 -       $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
 +       $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o $@ ./test/checkseccomp
  
  .PHONY: test/testvol/testvol
- test/testvol/testvol: .gopathok $(wildcard test/testvol/*.go)
--       $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol
-+       $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol
- 
- .PHONY: volume-plugin-test-image
- volume-plugin-test-img:
-@@ -276,7 +276,7 @@
+ test/testvol/testvol: $(wildcard test/testvol/*.go)
+@@ -254,7 +254,7 @@
  
  .PHONY: test/goecho/goecho
- test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go)
+ test/goecho/goecho: $(wildcard test/goecho/*.go)
 -       $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
 +       $(GOCMD) build $(GOBUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
  
- test/version/version: .gopathok version/version.go
+ test/version/version: version/version.go
         $(GO) build -o $@ ./test/version/
-@@ -318,7 +318,7 @@
+@@ -296,7 +296,7 @@
                 distro for journald support."
  endif
         $(GOCMD) build \
@@ -59,17 +45,17 @@ Index: import/Makefile
                 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
                 -tags "$(BUILDTAGS)" \
                 -o $@ ./cmd/podman
-@@ -329,7 +329,7 @@
- 
- $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum
+@@ -308,7 +308,7 @@
+ # '|' is to ignore SRCBINDIR mtime; see: info make 'Types of Prerequisites'
+ $(SRCBINDIR)/podman$(BINSFX): $(SOURCES) go.mod go.sum | $(SRCBINDIR)
         $(GOCMD) build \
 -               $(BUILDFLAGS) \
 +               $(GOBUILDFLAGS) \
                 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
                 -tags "${REMOTETAGS}" \
                 -o $@ ./cmd/podman
-@@ -339,7 +339,7 @@
-        GOOS=$(GOOS) \
+@@ -318,7 +318,7 @@
+        GOOS=linux \
         GOARCH=$(GOARCH) \
         $(GO) build \
 -               $(BUILDFLAGS) \
@@ -77,7 +63,7 @@ Index: import/Makefile
                 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \
                 -tags "${REMOTETAGS}" \
                 -o $@ ./cmd/podman
-@@ -374,7 +374,7 @@
+@@ -338,7 +338,7 @@
         CGO_ENABLED=0 \
                 GOOS=windows \
                 $(GO) build \
@@ -86,7 +72,7 @@ Index: import/Makefile
                 -ldflags -H=windowsgui \
                 -o bin/windows/winpath.exe \
                 ./cmd/winpath
-@@ -393,14 +393,14 @@
+@@ -349,14 +349,14 @@
                 GOOS=darwin \
                 GOARCH=$(GOARCH) \
                 $(GO) build \
@@ -95,7 +81,7 @@ Index: import/Makefile
                 -o bin/darwin/podman-mac-helper \
                 ./cmd/podman-mac-helper
  
- bin/rootlessport: .gopathok $(SOURCES) go.mod go.sum
+ bin/rootlessport: $(SOURCES) go.mod go.sum
         CGO_ENABLED=$(CGO_ENABLED) \
                 $(GO) build \
 -               $(BUILDFLAGS) \
@@ -103,7 +89,7 @@ Index: import/Makefile
                 -o $@ ./cmd/rootlessport
  
  .PHONY: rootlessport
-@@ -423,7 +423,7 @@
+@@ -379,7 +379,7 @@
         GOARCH="$${TARGET##*.}"; \
         CGO_ENABLED=0 \
                 $(GO) build \
@@ -112,12 +98,12 @@ Index: import/Makefile
                 $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
                 -tags '$(BUILDTAGS_CROSS)' \
                 -o "$@" ./cmd/podman
-@@ -871,7 +871,7 @@
+@@ -830,7 +830,7 @@
+ 
  .PHONY: .install.ginkgo
- .install.ginkgo: .gopathok
-        if [ ! -x "$(GOBIN)/ginkgo" ]; then \
--               $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \
-+               $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo ; \
-        fi
+ .install.ginkgo:
+-       $(GO) install $(BUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
++       $(GO) install $(GOBUILDFLAGS) ./vendor/github.com/onsi/ginkgo/ginkgo
  
- .PHONY: .install.gitvalidation
+ .PHONY: .install.golangci-lint
+ .install.golangci-lint:
diff --git a/recipes-containers/podman/podman/0002-Define-ActKillThread-equal-to-ActKill.patch b/recipes-containers/podman/podman/0002-Define-ActKillThread-equal-to-ActKill.patch
deleted file mode 100644
index ba51d4ac..00000000
--- a/recipes-containers/podman/podman/0002-Define-ActKillThread-equal-to-ActKill.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From f2aa0359bcc776239bda8a4eb84957b97ef55c35 Mon Sep 17 00:00:00 2001
-From: Tonis Tiigi <tonistiigi@gmail.com>
-Date: Fri, 28 Jan 2022 14:44:56 -0800
-Subject: [PATCH] Define ActKillThread equal to ActKill
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These constants are equal in libseccomp but Go definitions
-were defined separately. This resulted in dead code that
-never executed due to identical case statements in switch.
-Go can usually detect these error cases and refuses to build
-but for some reason this detection doesn’t work with cgo+gcc.
-Clang detects the equal constants correctly and therefore
-libseccomp-golang builds with clang broke after ActKillThread
-was added.
-
-In order to fix the clang build only removal of the
-switch case is needed. But I assumed that the setter/getter
-logic is supposed to work for ActKillThread as well
-and only way to ensure that is to set them equal like they
-are in C.
-
-Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
-Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
-Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
-Upstream-status: Backport [https://github.com/seccomp/libseccomp-golang/commit/c35397d0ea8f285a0be78693bb2fd37b06952453]
----
- seccomp.go          | 8 ++++----
- seccomp_internal.go | 4 ----
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/seccomp.go b/seccomp.go
-index e9b92e2..32f6ab2 100644
---- a/seccomp.go
-+++ b/seccomp.go
-@@ -214,14 +214,14 @@ const (
-        // This action is only usable when libseccomp API level 3 or higher is
-        // supported.
-        ActLog ScmpAction = iota
--       // ActKillThread kills the thread that violated the rule. It is the same as ActKill.
--       // All other threads from the same thread group will continue to execute.
--       ActKillThread ScmpAction = iota
-        // ActKillProcess kills the process that violated the rule.
-        // All threads in the thread group are also terminated.
-        // This action is only usable when libseccomp API level 3 or higher is
-        // supported.
-        ActKillProcess ScmpAction = iota
-+       // ActKillThread kills the thread that violated the rule. It is the same as ActKill.
-+       // All other threads from the same thread group will continue to execute.
-+       ActKillThread = ActKill
- )
- 
- const (
-@@ -394,7 +394,7 @@ func (a ScmpCompareOp) String() string {
- // String returns a string representation of a seccomp match action
- func (a ScmpAction) String() string {
-        switch a & 0xFFFF {
--       case ActKill, ActKillThread:
-+       case ActKillThread:
-                return "Action: Kill thread"
-        case ActKillProcess:
-                return "Action: Kill process"
-diff --git a/seccomp_internal.go b/seccomp_internal.go
-index 8dc7b29..8fc9914 100644
---- a/seccomp_internal.go
-+++ b/seccomp_internal.go
-@@ -612,8 +612,6 @@ func (a ScmpCompareOp) toNative() C.int {
- func actionFromNative(a C.uint32_t) (ScmpAction, error) {
-        aTmp := a & 0xFFFF
-        switch a & 0xFFFF0000 {
--       case C.C_ACT_KILL:
--               return ActKill, nil
-        case C.C_ACT_KILL_PROCESS:
-                return ActKillProcess, nil
-        case C.C_ACT_KILL_THREAD:
-@@ -638,8 +636,6 @@ func actionFromNative(a C.uint32_t) (ScmpAction, error) {
- // Only use with sanitized actions, no error handling
- func (a ScmpAction) toNative() C.uint32_t {
-        switch a & 0xFFFF {
--       case ActKill:
--               return C.C_ACT_KILL
-        case ActKillProcess:
-                return C.C_ACT_KILL_PROCESS
-        case ActKillThread:
--- 
-2.25.1
-
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index e9991920..355e0e09 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -17,11 +17,10 @@ DEPENDS = " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
 
-SRCREV = "cedbbfa543651a13055a1fe093a4d0a2a28ccdfd"
+SRCREV = "754ec89a8a185d308ca5ed08afaf34d6cbda08da"
 SRC_URI = " \
-    git://github.com/containers/libpod.git;branch=v4.1;protocol=https \
+    git://github.com/containers/libpod.git;branch=v4.2;protocol=https \
     file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
-    file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \
     ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
 "
 
@@ -32,7 +31,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-PV = "4.1.0+git${SRCPV}"
+PV = "4.2.0+git${SRCPV}"
 
 PACKAGES =+ "${PN}-contrib"