Accepting request 1132992 from devel:microos

OBS-URL: https://build.opensuse.org/request/show/1132992
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/buildah?expand=0&rev=78

0001-set-makefile-target-entrypoint.gz-as-.PHONY-on-non-x.patch

@@ -1,47 +0,0 @@
-From fb455cef8a72ee97e9aba0c42d82782196c43218 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
-Date: Mon, 20 Nov 2023 09:28:06 +0100
-Subject: [PATCH] set makefile target entrypoint.gz as .PHONY on non x86_64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The target internal/mkcw/embed/entrypoint is only built on x86_64, but
-internal/mkcw/embed/entrypoint.gz is run on all arches. This causes build
-failures on anything non x86_64 as internal/mkcw/embed/entrypoint is not build.
-
-Signed-off-by: Dan Čermák <dcermak@suse.com>
----
- Makefile | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 85b43c7b9..cce615d5f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -73,17 +73,19 @@ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz
- 	$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
- 
- ifneq ($(shell as --version | grep x86_64),)
-+internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint
-+	$(RM) $@
-+	gzip -k $^
-+
- internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s
- 	$(AS) -o $(patsubst %.s,%.o,$^) $^
- 	$(LD) -o $@ $(patsubst %.s,%.o,$^)
- 	strip $@
- else
- .PHONY: internal/mkcw/embed/entrypoint
-+.PHONY: internal/mkcw/embed/entrypoint.gz
- endif
- 
--internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint
--	$(RM) $@
--	gzip -k $^
- 
- .PHONY: buildah
- buildah: bin/buildah
--- 
-2.42.0
-

_service

@@ -5,7 +5,7 @@
     <param name="filename">buildah</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v1.33.2</param>
+    <param name="revision">v1.34.0</param>
     <param name="changesgenerate">enable</param>
 </service>
 <service name="recompress" mode="disabled">

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/containers/buildah.git</param>
-              <param name="changesrevision">7fffb33667f502737b66c1c1034744ed2dcc3b69</param></service></servicedata>
+              <param name="changesrevision">21ec7aceb20e475c00bb4d65ae3d5764c59ec997</param></service></servicedata>

buildah-1.33.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98352adc80f8bfcf70486f0152e34e814aa7915cf82d505e73114a8970023c08
-size 11191476

buildah.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Dec 14 07:42:07 UTC 2023 - danish.prakash@suse.com
+
+- Drop 0001-set-makefile-target-entrypoint.gz-as-.PHONY-on-non-x.patch
+  (merged upstream; https://github.com/containers/buildah/pull/5183)
+- Update to version 1.34.0:
+  * Bump to v1.34.0
+  * fix(deps): update module github.com/containerd/containerd to v1.7.11
+  * fix(deps): update github.com/containers/storage digest to 15c3cb7
+  * fix(deps): update module github.com/onsi/ginkgo/v2 to v2.13.2
+  * fix(deps): update github.com/containers/common digest to 630c929
+  * fix(deps): update module github.com/moby/buildkit to v0.12.4
+  * fix(deps): update github.com/openshift/imagebuilder digest to ef2a5fe
+  * [CI:DOCS] man pages: underscores, too-wide lines
+  * fix(deps): update module github.com/containerd/containerd to v1.7.10
+  * run.bats: use --quiet --pull=false when using a prefetched image
+  * internal/mkcw/embed/entrypoint.gz: rename to include the arch
+  * internal/mkcw/embed/entrypoint.gz: compress with -n9
+  * fix(deps): update module golang.org/x/crypto to v0.16.0
+  * Integration tests: make skip_if_no_unshare check --map-users
+  * fix(deps): update module golang.org/x/term to v0.15.0
+  * fix(deps): update module golang.org/x/sys to v0.15.0
+  * fix(deps): update module github.com/onsi/ginkgo to v2
+  * vendor: update c/{common,image,storage}
+  * run: Allow using just one jail per container on FreeBSD
+  * Remove makefile targets entrypoint{,.gz} for non x86_64
+
 -------------------------------------------------------------------
 Mon Nov 27 07:04:59 UTC 2023 - dcermak@suse.com
 

buildah.spec

@@ -18,7 +18,7 @@
 
 %define project github.com/containers/buildah
 Name:           buildah
-Version:        1.33.2
+Version:        1.34.0
 Release:        0
 Summary:        Tool for building OCI containers
 License:        Apache-2.0
@@ -26,8 +26,6 @@ Group:          System/Management
 URL:            https://%{project}
 Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
-# https://github.com/containers/buildah/pull/5183
-Patch0:         0001-set-makefile-target-entrypoint.gz-as-.PHONY-on-non-x.patch
 BuildRequires:  bash-completion
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes