diff options
Diffstat (limited to 'sysutils/buildah')
| -rw-r--r-- | sysutils/buildah/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/buildah/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/buildah/files/patch-Makefile | 20 |
3 files changed, 24 insertions, 5 deletions
diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile index e21f0c120db8..fc8217d3a861 100644 --- a/sysutils/buildah/Makefile +++ b/sysutils/buildah/Makefile @@ -1,7 +1,6 @@ PORTNAME= buildah DISTVERSIONPREFIX= v -DISTVERSION= 1.42.1 -PORTREVISION= 1 +DISTVERSION= 1.42.2 CATEGORIES= sysutils MAINTAINER= dfr@FreeBSD.org diff --git a/sysutils/buildah/distinfo b/sysutils/buildah/distinfo index d888df254668..5c76967e2ab1 100644 --- a/sysutils/buildah/distinfo +++ b/sysutils/buildah/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763130778 -SHA256 (containers-buildah-v1.42.1_GH0.tar.gz) = c162e769ab42437d8125e610b16633c68dee1e8196d5931f28379997b3ec2baf -SIZE (containers-buildah-v1.42.1_GH0.tar.gz) = 11812044 +TIMESTAMP = 1765209236 +SHA256 (containers-buildah-v1.42.2_GH0.tar.gz) = 784dfcf050d55c011aaf4e7247b1465259c41c861ff455dc754d6159121cab1e +SIZE (containers-buildah-v1.42.2_GH0.tar.gz) = 11814551 diff --git a/sysutils/buildah/files/patch-Makefile b/sysutils/buildah/files/patch-Makefile new file mode 100644 index 000000000000..6898281433f5 --- /dev/null +++ b/sysutils/buildah/files/patch-Makefile @@ -0,0 +1,20 @@ +--- Makefile.orig 2025-12-08 16:03:39 UTC ++++ Makefile +@@ -28,7 +28,7 @@ COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null | + RACEFLAGS ?= $(shell $(GO_TEST) -race ./pkg/dummy > /dev/null 2>&1 && echo -race) + + COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true) +-GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO}) ++#GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO}) + SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed")) + + # we get GNU make 3.x in MacOS build envs, which wants # to be escaped in +@@ -39,7 +39,7 @@ EXTRA_LDFLAGS ?= + + SEQUOIA_SONAME_DIR = + EXTRA_LDFLAGS ?= +-BUILDAH_LDFLAGS := $(GO_LDFLAGS) '-X main.GitCommit=$(GIT_COMMIT) -X main.buildInfo=$(SOURCE_DATE_EPOCH) -X main.cniVersion=$(CNI_COMMIT) -X go.podman.io/image/v5/signature/internal/sequoia.sequoiaLibraryDir="$(SEQUOIA_SONAME_DIR)" $(EXTRA_LDFLAGS)' ++BUILDAH_LDFLAGS := $(GO_LDFLAGS) '-X main.GitCommit="unknown" -X main.buildInfo=$(SOURCE_DATE_EPOCH) -X main.cniVersion=$(CNI_COMMIT) -X go.podman.io/image/v5/signature/internal/sequoia.sequoiaLibraryDir="$(SEQUOIA_SONAME_DIR)" $(EXTRA_LDFLAGS)' + + # This isn't what we actually build; it's a superset, used for target + # dependencies. Basically: all *.go and *.c files, except *_test.go, |