Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package zot-registry for openSUSE:Factory checked in at 2025-10-23 16:40:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zot-registry (Old) and /work/SRC/openSUSE:Factory/.zot-registry.new.1980 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zot-registry" Thu Oct 23 16:40:02 2025 rev:9 rq:1313098 version:2.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/zot-registry/zot-registry.changes 2025-10-17 17:28:10.116022818 +0200 +++ /work/SRC/openSUSE:Factory/.zot-registry.new.1980/zot-registry.changes 2025-10-23 16:40:21.925781744 +0200 @@ -1,0 +2,11 @@ +Mon Oct 20 05:43:14 UTC 2025 - Johannes Kastl <[email protected]> + +- Update to version 2.1.10: + * fix: make config read/write thread safe (#3432) + * fix: migrate to Go module v2 for proper semantic versioning + (#3462) +- add patch fix_broken_version_output_in_2.1.10.patch to fix the + broken "--version" output + https://github.com/project-zot/zot/issues/3478 + +------------------------------------------------------------------- Old: ---- zot-registry-2.1.9.obscpio New: ---- fix_broken_version_output_in_2.1.10.patch zot-registry-2.1.10.obscpio ----------(New B)---------- New: (#3462) - add patch fix_broken_version_output_in_2.1.10.patch to fix the broken "--version" output ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zot-registry.spec ++++++ --- /var/tmp/diff_new_pack.MsQzMB/_old 2025-10-23 16:40:23.261838086 +0200 +++ /var/tmp/diff_new_pack.MsQzMB/_new 2025-10-23 16:40:23.265838254 +0200 @@ -23,7 +23,7 @@ %define zui_version commit-731b639 Name: zot-registry -Version: 2.1.9 +Version: 2.1.10 Release: 0 Summary: Scale-out production-ready vendor-neutral OCI-native container image registry License: Apache-2.0 @@ -39,6 +39,10 @@ Source21: Makefile Source22: PACKAGING_README.md # +# PATCH-FIX-UPSTREAM fix_broken_version_output_in_2.1.10.patch +# https://github.com/project-zot/zot/pull/3479 +Patch1: https://github.com/project-zot/zot/commit/4ebe1416655b4074494a23fe285c45d15a0c4781.patch#/fix_broken_version_output_in_2.1.10.patch +# BuildRequires: awk BuildRequires: bash-completion BuildRequires: coreutils @@ -47,6 +51,9 @@ BuildRequires: go >= 1.23 BuildRequires: sysuser-tools BuildRequires: zsh +# +BuildRequires: dos2unix +BuildRequires: fdupes %description Production-ready vendor-neutral OCI image registry - images stored in OCI image @@ -107,10 +114,16 @@ # disable ui target as dependency for build-metadata sed -i '/^build-metadata:.*findstring/ s/^build-metadata:.*/build-metadata:/' Makefile +# set the COMMIT manually, to avoid having "dirty" in it +COMMIT_HASH="$(sed -n 's/commit: \(.*\)/\1/p' %_sourcedir/%{name}.obsinfo)" +sed -i '/^COMMIT/ s/= .*$/= $(COMMIT_HASH)/' Makefile make binary %sysusers_generate_pre %{SOURCE12} %{system_user_name} system-user-%{system_user_name}.conf +# +dos2unix ./examples/config-policy.json + %install # Install the binary (which has linux and the architecture in the name... install -D -m 0755 bin/%{executable_name}* %{buildroot}/%{_bindir}/%{executable_name} @@ -141,6 +154,7 @@ install -D -m 0644 examples/%{service_name}.service %{buildroot}%{_unitdir}/%{service_name}.service %check +%{buildroot}/%{_bindir}/%{executable_name} --version %{buildroot}/%{_bindir}/%{executable_name} --version 2>&1 | grep -q %{version} %pre -f %{system_user_name}.pre ++++++ _service ++++++ --- /var/tmp/diff_new_pack.MsQzMB/_old 2025-10-23 16:40:23.357842135 +0200 +++ /var/tmp/diff_new_pack.MsQzMB/_new 2025-10-23 16:40:23.361842303 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="package-meta">yes</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">v2.1.9</param> + <param name="revision">v2.1.10</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="changesgenerate">enable</param> <param name="filename">zot-registry</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.MsQzMB/_old 2025-10-23 16:40:23.409844328 +0200 +++ /var/tmp/diff_new_pack.MsQzMB/_new 2025-10-23 16:40:23.421844833 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/project-zot/zot</param> - <param name="changesrevision">73eef25681afcacc372f16ac5159743ab7b373ec</param></service></servicedata> + <param name="changesrevision">dfb5d1df5403186d2359d95cb24c8e2f17ad930c</param></service></servicedata> (No newline at EOF) ++++++ fix_broken_version_output_in_2.1.10.patch ++++++ >From 4ebe1416655b4074494a23fe285c45d15a0c4781 Mon Sep 17 00:00:00 2001 From: Andrei Aaron <[email protected]> Date: Wed, 22 Oct 2025 06:40:16 +0000 Subject: [PATCH] fix: zot version broken after switching to /v2 Signed-off-by: Andrei Aaron <[email protected]> --- Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4a5a6515c..232379a12 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,13 @@ OS ?= $(shell go env GOOS) ARCH ?= $(shell go env GOARCH) GREP_BIN_PATH ?= $(shell which grep) +MODULE_PATH := $(shell go list -m) +CONFIG_PACKAGE := $(MODULE_PATH)/pkg/api/config +CONFIG_RELEASE_TAG := $(CONFIG_PACKAGE).ReleaseTag +CONFIG_COMMIT := $(CONFIG_PACKAGE).Commit +CONFIG_BINARY_TYPE := $(CONFIG_PACKAGE).BinaryType +CONFIG_GO_VERSION := $(CONFIG_PACKAGE).GoVersion + PROTOC := $(TOOLSDIR)/bin/protoc PROTOC_VERSION := 24.4 GO_PROTOC_VERSION := 1.31.0 @@ -173,25 +180,25 @@ gen-protobuf: $(PROTOC) .PHONY: binary-minimal binary-minimal: EXTENSIONS= binary-minimal: modcheck build-metadata - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-$(OS)-$(ARCH)-minimal$(BIN_EXT) $(BUILDMODE_FLAGS) -v -trimpath -ldflags "-X zotregistry.dev/zot/pkg/api/config.ReleaseTag=${RELEASE_TAG} -X zotregistry.dev/zot/pkg/api/config.Commit=${COMMIT} -X zotregistry.dev/zot/pkg/api/config.BinaryType=minimal -X zotregistry.dev/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zot + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-$(OS)-$(ARCH)-minimal$(BIN_EXT) $(BUILDMODE_FLAGS) -v -trimpath -ldflags "-X $(CONFIG_RELEASE_TAG)=${RELEASE_TAG} -X $(CONFIG_COMMIT)=${COMMIT} -X $(CONFIG_BINARY_TYPE)=minimal -X $(CONFIG_GO_VERSION)=${GO_VERSION} -s -w" ./cmd/zot .PHONY: binary binary: $(if $(findstring ui,$(BUILD_LABELS)), ui) binary: modcheck build-metadata - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-$(OS)-$(ARCH)$(BIN_EXT) $(BUILDMODE_FLAGS) $(GO_CMD_TAGS) -v -trimpath -ldflags "-X zotregistry.dev/zot/pkg/api/config.ReleaseTag=${RELEASE_TAG} -X zotregistry.dev/zot/pkg/api/config.Commit=${COMMIT} -X zotregistry.dev/zot/pkg/api/config.BinaryType=$(extended-name) -X zotregistry.dev/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zot + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-$(OS)-$(ARCH)$(BIN_EXT) $(BUILDMODE_FLAGS) $(GO_CMD_TAGS) -v -trimpath -ldflags "-X $(CONFIG_RELEASE_TAG)=${RELEASE_TAG} -X $(CONFIG_COMMIT)=${COMMIT} -X $(CONFIG_BINARY_TYPE)=$(extended-name) -X $(CONFIG_GO_VERSION)=${GO_VERSION} -s -w" ./cmd/zot .PHONY: binary-debug binary-debug: $(if $(findstring ui,$(BUILD_LABELS)), ui) binary-debug: modcheck swaggercheck build-metadata - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-$(OS)-$(ARCH)-debug$(BIN_EXT) $(BUILDMODE_FLAGS) -tags $(BUILD_LABELS),debug -v -gcflags all='-N -l' -ldflags "-X zotregistry.dev/zot/pkg/api/config.ReleaseTag=${RELEASE_TAG} -X zotregistry.dev/zot/pkg/api/config.Commit=${COMMIT} -X zotregistry.dev/zot/pkg/api/config.BinaryType=$(extended-name) -X zotregistry.dev/zot/pkg/api/config.GoVersion=${GO_VERSION}" ./cmd/zot + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zot-$(OS)-$(ARCH)-debug$(BIN_EXT) $(BUILDMODE_FLAGS) -tags $(BUILD_LABELS),debug -v -gcflags all='-N -l' -ldflags "-X $(CONFIG_RELEASE_TAG)=${RELEASE_TAG} -X $(CONFIG_COMMIT)=${COMMIT} -X $(CONFIG_BINARY_TYPE)=$(extended-name) -X $(CONFIG_GO_VERSION)=${GO_VERSION}" ./cmd/zot .PHONY: cli cli: modcheck build-metadata - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zli-$(OS)-$(ARCH)$(BIN_EXT) $(BUILDMODE_FLAGS) -tags $(BUILD_LABELS),search -v -trimpath -ldflags "-X zotregistry.dev/zot/pkg/api/config.Commit=${COMMIT} -X zotregistry.dev/zot/pkg/api/config.BinaryType=$(extended-name) -X zotregistry.dev/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zli + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zli-$(OS)-$(ARCH)$(BIN_EXT) $(BUILDMODE_FLAGS) -tags $(BUILD_LABELS),search -v -trimpath -ldflags "-X $(CONFIG_COMMIT)=${COMMIT} -X $(CONFIG_BINARY_TYPE)=$(extended-name) -X $(CONFIG_GO_VERSION)=${GO_VERSION} -s -w" ./cmd/zli .PHONY: bench bench: modcheck build-metadata - env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zb-$(OS)-$(ARCH)$(BIN_EXT) $(BUILDMODE_FLAGS) $(GO_CMD_TAGS) -v -trimpath -ldflags "-X zotregistry.dev/zot/pkg/api/config.Commit=${COMMIT} -X zotregistry.dev/zot/pkg/api/config.BinaryType=$(extended-name) -X zotregistry.dev/zot/pkg/api/config.GoVersion=${GO_VERSION} -s -w" ./cmd/zb + env CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o bin/zb-$(OS)-$(ARCH)$(BIN_EXT) $(BUILDMODE_FLAGS) $(GO_CMD_TAGS) -v -trimpath -ldflags "-X $(CONFIG_COMMIT)=${COMMIT} -X $(CONFIG_BINARY_TYPE)=$(extended-name) -X $(CONFIG_GO_VERSION)=${GO_VERSION} -s -w" ./cmd/zb .PHONY: exporter-minimal exporter-minimal: EXTENSIONS= ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/zot-registry/vendor.tar.gz /work/SRC/openSUSE:Factory/.zot-registry.new.1980/vendor.tar.gz differ: char 128, line 1 ++++++ zot-registry-2.1.9.obscpio -> zot-registry-2.1.10.obscpio ++++++ ++++ 15008 lines of diff (skipped) ++++++ zot-registry.obsinfo ++++++ --- /var/tmp/diff_new_pack.MsQzMB/_old 2025-10-23 16:40:24.889906741 +0200 +++ /var/tmp/diff_new_pack.MsQzMB/_new 2025-10-23 16:40:24.897907079 +0200 @@ -1,5 +1,5 @@ name: zot-registry -version: 2.1.9 -mtime: 1760420946 -commit: 73eef25681afcacc372f16ac5159743ab7b373ec +version: 2.1.10 +mtime: 1760775658 +commit: dfb5d1df5403186d2359d95cb24c8e2f17ad930c
