From 7ec4b4746d9d76062a868ea77818a150ddd53c54 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sun, 17 Jul 2022 14:34:38 -0400
Subject: podman; fix patch fuzz/failure

patch a33188f [podman: Fix host contamination] appears to have
introduced fuzz/failures. Which strangely wasn't picked up on
merge testing.

We refresh the patch to fix the issues.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch   | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'recipes-containers/podman')

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 13a736e4..e27e1fa8 100644
--- a/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
+++ b/recipes-containers/podman/podman/0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch
@@ -14,11 +14,11 @@ Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
  Makefile | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index cb230d8e9..538b28d41 100644
---- a/Makefile
-+++ b/Makefile
-@@ -69,7 +69,7 @@ PRE_COMMIT = $(shell command -v bin/venv/bin/pre-commit ~/.local/bin/pre-commit
+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)
  
@@ -27,7 +27,7 @@ index cb230d8e9..538b28d41 100644
  
  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 @@ gofmt: ## Verify the source code gofmt
+@@ -264,11 +264,11 @@
  
  .PHONY: test/checkseccomp/checkseccomp
  test/checkseccomp/checkseccomp: .gopathok $(wildcard test/checkseccomp/*.go)
@@ -41,7 +41,7 @@ index cb230d8e9..538b28d41 100644
  
  .PHONY: volume-plugin-test-image
  volume-plugin-test-img:
-@@ -276,7 +276,7 @@ volume-plugin-test-img:
+@@ -276,7 +276,7 @@
  
  .PHONY: test/goecho/goecho
  test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go)
@@ -50,7 +50,7 @@ index cb230d8e9..538b28d41 100644
  
  test/version/version: .gopathok version/version.go
  	$(GO) build -o $@ ./test/version/
-@@ -318,7 +318,7 @@ ifeq (,$(findstring systemd,$(BUILDTAGS)))
+@@ -318,7 +318,7 @@
  		distro for journald support."
  endif
  	$(GOCMD) build \
@@ -59,7 +59,7 @@ index cb230d8e9..538b28d41 100644
  		$(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
  		-tags "$(BUILDTAGS)" \
  		-o $@ ./cmd/podman
-@@ -329,14 +329,14 @@ $(SRCBINDIR):
+@@ -329,7 +329,7 @@
  
  $(SRCBINDIR)/podman$(BINSFX): $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum
  	$(GOCMD) build \
@@ -68,15 +68,16 @@ index cb230d8e9..538b28d41 100644
  		$(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
  		-tags "${REMOTETAGS}" \
  		-o $@ ./cmd/podman
- 
- $(SRCBINDIR)/podman-remote-static: $(SRCBINDIR) .gopathok $(SOURCES) go.mod go.sum
- 	$(GOCMD) build \
+@@ -339,7 +339,7 @@
+ 	GOOS=$(GOOS) \
+ 	GOARCH=$(GOARCH) \
+ 	$(GO) build \
 -		$(BUILDFLAGS) \
 +		$(GOBUILDFLAGS) \
  		$(GO_LDFLAGS) '$(LDFLAGS_PODMAN_STATIC)' \
  		-tags "${REMOTETAGS}" \
  		-o $@ ./cmd/podman
-@@ -371,7 +371,7 @@ podman-winpath: .gopathok $(SOURCES) go.mod go.sum
+@@ -374,7 +374,7 @@
  	CGO_ENABLED=0 \
  		GOOS=windows \
  		$(GO) build \
@@ -85,7 +86,7 @@ index cb230d8e9..538b28d41 100644
  		-ldflags -H=windowsgui \
  		-o bin/windows/winpath.exe \
  		./cmd/winpath
-@@ -390,14 +390,14 @@ podman-mac-helper: ## Build podman-mac-helper for macOS
+@@ -393,14 +393,14 @@
  		GOOS=darwin \
  		GOARCH=$(GOARCH) \
  		$(GO) build \
@@ -102,7 +103,7 @@ index cb230d8e9..538b28d41 100644
  		-o $@ ./cmd/rootlessport
  
  .PHONY: rootlessport
-@@ -420,7 +420,7 @@ bin/podman.cross.%: .gopathok
+@@ -423,7 +423,7 @@
  	GOARCH="$${TARGET##*.}"; \
  	CGO_ENABLED=0 \
  		$(GO) build \
@@ -111,7 +112,7 @@ index cb230d8e9..538b28d41 100644
  		$(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' \
  		-tags '$(BUILDTAGS_CROSS)' \
  		-o "$@" ./cmd/podman
-@@ -864,7 +864,7 @@ install.tools: .install.goimports .install.gitvalidation .install.md2man .instal
+@@ -871,7 +871,7 @@
  .PHONY: .install.ginkgo
  .install.ginkgo: .gopathok
  	if [ ! -x "$(GOBIN)/ginkgo" ]; then \
@@ -120,6 +121,3 @@ index cb230d8e9..538b28d41 100644
  	fi
  
  .PHONY: .install.gitvalidation
--- 
-2.25.1
-
-- 
cgit v1.2.3-54-g00ecf