From 4bd9b130c57796e14823fb7c5e7dc98ef3ff02a9 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 10 Aug 2023 17:59:10 +0000 Subject: [PATCH 1/7] [packit] 1.31.2 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: v1.31.2 Upstream commit: d4d1d751 If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/buildah.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.31.2-f37-update-propose_downstream ``` --- .gitignore | 1 + .packit.yaml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ README.packit | 3 +++ buildah.spec | 2 +- sources | 2 +- 5 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 069b25d..759ec3a 100644 --- a/.gitignore +++ b/.gitignore @@ -697,3 +697,4 @@ /v1.30.0.tar.gz /v1.31.0.tar.gz /v1.31.1.tar.gz +/v1.31.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..80f8a05 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,49 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/buildah.spec +upstream_tag_template: v{version} + +srpm_build_deps: + - make + +jobs: + - job: copr_build + trigger: pull_request + # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + enable_net: true + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - fedora-eln-x86_64 + - fedora-eln-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + # Run on commit to main branch + - job: copr_build + trigger: commit + owner: rhcontainerbot + project: podman-next + enable_net: true + + - job: propose_downstream + trigger: release + update_release: false + dist_git_branches: + - fedora-all + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..d7c433c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.78.2.post2+g81828af. diff --git a/buildah.spec b/buildah.spec index 7eeba61..72a3ae3 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,7 +35,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.31.1 +Version: 1.31.2 License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0 Release: %autorelease %if %{defined golang_arches_future} diff --git a/sources b/sources index 1be5825..2046290 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.31.1.tar.gz) = 7375877d964197d0690542e1da0636b0a67cdf01f30ddbdd69cced5cfe4f8bb370b37ec58f2dffd2c2f048b897470d8fb06cd9f70c8e75df2aa6b19f86610f7b +SHA512 (v1.31.2.tar.gz) = c8611016448de7e9548ff692d1b352d7234f357440001106276e513df135a28ba0d4413a14f5c30e4b88615267d92f4aea63e1687b84a0638f1f9ab4f348c74a From f99638235e4e80fb62a4d2fbb6103c95f28d93d2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 11 Aug 2023 10:01:39 -0400 Subject: [PATCH 2/7] fix buildtags (cherry picked from commit 2ded9f0893f850d9fd94578d71c519a02ef6b562) --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index 72a3ae3..58265d2 100644 --- a/buildah.spec +++ b/buildah.spec @@ -119,7 +119,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" -export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $hack/libsubid_tag.sh)' +export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)' %if !%{defined build_with_btrfs} export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs' %endif From f828a92a5c4e1b230463315e5586b4a1e6e1e99f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 11 Aug 2023 14:10:23 -0400 Subject: [PATCH 3/7] use double quotes for buildtags (cherry picked from commit 047a9f8cdfc0459065e2c4ef83f137ecb193e54a) --- buildah.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildah.spec b/buildah.spec index 58265d2..b728251 100644 --- a/buildah.spec +++ b/buildah.spec @@ -119,9 +119,9 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" -export BUILDTAGS='seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)' +export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" %if !%{defined build_with_btrfs} -export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs' +export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs" %endif %gobuild -o bin/%{name} ./cmd/%{name} From f8a1f00f82175180f375b7bcd85ea40952221b6b Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 24 Aug 2023 20:53:23 +0000 Subject: [PATCH 4/7] [packit] 1.31.3 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: v1.31.3 Upstream commit: 3ae75d4a If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/buildah.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.31.3-f37-update-propose_downstream ``` --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 5 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 759ec3a..8c69906 100644 --- a/.gitignore +++ b/.gitignore @@ -698,3 +698,4 @@ /v1.31.0.tar.gz /v1.31.1.tar.gz /v1.31.2.tar.gz +/v1.31.3.tar.gz diff --git a/README.packit b/README.packit index d7c433c..797aefb 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.78.2.post2+g81828af. +The file was generated using packit 0.79.0.post2+g93f33d9. diff --git a/buildah.spec b/buildah.spec index b728251..2208df3 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,8 +35,9 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.31.2 -License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0 +Version: 1.31.3 +# The `AND` needs to be uppercase in the License for SPDX compatibility +License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} diff --git a/sources b/sources index 2046290..bd6291e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.31.2.tar.gz) = c8611016448de7e9548ff692d1b352d7234f357440001106276e513df135a28ba0d4413a14f5c30e4b88615267d92f4aea63e1687b84a0638f1f9ab4f348c74a +SHA512 (v1.31.3.tar.gz) = efa656c818f7b07f903cb5f70b2c50c8d5b85a11ce9093707d051f3d6e67a8dfa5ab6ecb720900c563d879173ebeb3ac0e5175c0090f4608a0dd253f4149af93 From 90e666590bd4f8326d8b2adac2a60b3241c8bfe9 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 14 Sep 2023 19:06:11 +0000 Subject: [PATCH 5/7] [packit] 1.32.0 upstream release Upstream tag: v1.32.0 Upstream commit: 2326d492 --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8c69906..f4f3bf4 100644 --- a/.gitignore +++ b/.gitignore @@ -699,3 +699,4 @@ /v1.31.1.tar.gz /v1.31.2.tar.gz /v1.31.3.tar.gz +/v1.32.0.tar.gz diff --git a/README.packit b/README.packit index 797aefb..786c2a0 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.79.0.post2+g93f33d9. +The file was generated using packit 0.80.0.post8+gf2b5fcbc. diff --git a/buildah.spec b/buildah.spec index 2208df3..83fdfc0 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,7 +35,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.31.3 +Version: 1.32.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index bd6291e..4983eb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.31.3.tar.gz) = efa656c818f7b07f903cb5f70b2c50c8d5b85a11ce9093707d051f3d6e67a8dfa5ab6ecb720900c563d879173ebeb3ac0e5175c0090f4608a0dd253f4149af93 +SHA512 (v1.32.0.tar.gz) = 7c61141e43ea2f968a50b4c5ae6b69c2b9734a19774c7ca48bc942b900ca55ec381ac93fdf04f08061640a457551a9e03a45a37d22cb94b34cecded192dced8f From baa5db3d1347a8bb80097ef69c72f7139761917d Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 24 Oct 2023 14:17:43 +0000 Subject: [PATCH 6/7] [packit] 1.32.1 upstream release Upstream tag: v1.32.1 Upstream commit: bfd436d1 --- .gitignore | 1 + README.packit | 2 +- buildah.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f4f3bf4..45a4983 100644 --- a/.gitignore +++ b/.gitignore @@ -700,3 +700,4 @@ /v1.31.2.tar.gz /v1.31.3.tar.gz /v1.32.0.tar.gz +/v1.32.1.tar.gz diff --git a/README.packit b/README.packit index 786c2a0..2a3acd4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.80.0.post8+gf2b5fcbc. +The file was generated using packit 0.84.0. diff --git a/buildah.spec b/buildah.spec index 83fdfc0..5679494 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,7 +35,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.32.0 +Version: 1.32.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 4983eb4..6de0749 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.32.0.tar.gz) = 7c61141e43ea2f968a50b4c5ae6b69c2b9734a19774c7ca48bc942b900ca55ec381ac93fdf04f08061640a457551a9e03a45a37d22cb94b34cecded192dced8f +SHA512 (v1.32.1.tar.gz) = e5c59f158b786809c89465361a662211bbef6bb4c27c79490604923d924c2030398a0878b122b246b02ae246bd977b7ccffdc6de4f06e80f096c2921c34bf04a From 44f9d5279350fc703bf5ed44ab301fe7addad114 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Oct 2023 18:18:31 +0000 Subject: [PATCH 7/7] [packit] 1.32.2 upstream release Upstream tag: v1.32.2 Upstream commit: 050318f8 --- .gitignore | 1 + buildah.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 45a4983..b550c51 100644 --- a/.gitignore +++ b/.gitignore @@ -701,3 +701,4 @@ /v1.31.3.tar.gz /v1.32.0.tar.gz /v1.32.1.tar.gz +/v1.32.2.tar.gz diff --git a/buildah.spec b/buildah.spec index 5679494..44714be 100644 --- a/buildah.spec +++ b/buildah.spec @@ -35,7 +35,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.32.1 +Version: 1.32.2 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: %autorelease diff --git a/sources b/sources index 6de0749..551ddf6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.32.1.tar.gz) = e5c59f158b786809c89465361a662211bbef6bb4c27c79490604923d924c2030398a0878b122b246b02ae246bd977b7ccffdc6de4f06e80f096c2921c34bf04a +SHA512 (v1.32.2.tar.gz) = 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1