bump to v1.31.1

.gitignore

@@ -696,3 +696,4 @@
 /v1.29.1.tar.gz
 /v1.30.0.tar.gz
 /v1.31.0.tar.gz
+/v1.31.1.tar.gz

buildah.spec

@@ -7,9 +7,12 @@
 %global debug_package   %{nil}
 %endif
 
-%if %{defined rhel} && 0%{?rhel} == 8
+# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
-# RHEL 8's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
+# set it separately here and do not depend on RHEL's go-[s]rpm-macros package
-# set it separately here and do not depend on RHEL 8's go-srpm-macros package.
+# until that's fixed.
+# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
+# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331
+%if %{defined rhel}
 %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
 %endif
 
@@ -32,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.0
+Version: 1.31.1
 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}
@@ -44,7 +47,6 @@ Summary: A command line tool used for creating OCI Images
 URL: https://%{name}.io
 # Tarball fetched from upstream
 Source: %{git0}/archive/v%{version}.tar.gz
-BuildRequires: go-md2man
 BuildRequires: device-mapper-devel
 BuildRequires: git-core
 BuildRequires: golang >= 1.16.6
@@ -69,97 +71,6 @@ BuildRequires: libseccomp-devel
 %endif
 Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
-# DO NOT DELETE BELOW LINE - used for updating downstream goimports
-# vendored libraries
-Provides: bundled(golang(github.com/containerd/containerd/platforms))
-Provides: bundled(golang(github.com/containernetworking/cni/pkg/version))
-Provides: bundled(golang(github.com/containernetworking/plugins/pkg/ns))
-Provides: bundled(golang(github.com/containers/common/libimage))
-Provides: bundled(golang(github.com/containers/common/libimage/manifests))
-Provides: bundled(golang(github.com/containers/common/libnetwork/etchosts))
-Provides: bundled(golang(github.com/containers/common/libnetwork/network))
-Provides: bundled(golang(github.com/containers/common/libnetwork/pasta))
-Provides: bundled(golang(github.com/containers/common/libnetwork/resolvconf))
-Provides: bundled(golang(github.com/containers/common/libnetwork/slirp4netns))
-Provides: bundled(golang(github.com/containers/common/libnetwork/types))
-Provides: bundled(golang(github.com/containers/common/libnetwork/util))
-Provides: bundled(golang(github.com/containers/common/pkg/auth))
-Provides: bundled(golang(github.com/containers/common/pkg/capabilities))
-Provides: bundled(golang(github.com/containers/common/pkg/chown))
-Provides: bundled(golang(github.com/containers/common/pkg/completion))
-Provides: bundled(golang(github.com/containers/common/pkg/config))
-Provides: bundled(golang(github.com/containers/common/pkg/hooks))
-Provides: bundled(golang(github.com/containers/common/pkg/hooks/exec))
-Provides: bundled(golang(github.com/containers/common/pkg/manifests))
-Provides: bundled(golang(github.com/containers/common/pkg/parse))
-Provides: bundled(golang(github.com/containers/common/pkg/retry))
-Provides: bundled(golang(github.com/containers/common/pkg/subscriptions))
-Provides: bundled(golang(github.com/containers/common/pkg/supplemented))
-Provides: bundled(golang(github.com/containers/common/pkg/umask))
-Provides: bundled(golang(github.com/containers/common/pkg/util))
-Provides: bundled(golang(github.com/containers/image/v5/copy))
-Provides: bundled(golang(github.com/containers/image/v5/docker))
-Provides: bundled(golang(github.com/containers/image/v5/docker/reference))
-Provides: bundled(golang(github.com/containers/image/v5/image))
-Provides: bundled(golang(github.com/containers/image/v5/manifest))
-Provides: bundled(golang(github.com/containers/image/v5/oci/layout))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/blobcache))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/compression))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/shortnames))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/strslice))
-Provides: bundled(golang(github.com/containers/image/v5/pkg/sysregistriesv2))
-Provides: bundled(golang(github.com/containers/image/v5/signature))
-Provides: bundled(golang(github.com/containers/image/v5/storage))
-Provides: bundled(golang(github.com/containers/image/v5/transports))
-Provides: bundled(golang(github.com/containers/image/v5/transports/alltransports))
-Provides: bundled(golang(github.com/containers/image/v5/types))
-Provides: bundled(golang(github.com/containers/image/v5/version))
-Provides: bundled(golang(github.com/containers/ocicrypt/config))
-Provides: bundled(golang(github.com/containers/ocicrypt/helpers))
-Provides: bundled(golang(github.com/containers/storage))
-Provides: bundled(golang(github.com/containers/storage/pkg/archive))
-Provides: bundled(golang(github.com/containers/storage/pkg/chrootarchive))
-Provides: bundled(golang(github.com/containers/storage/pkg/fileutils))
-Provides: bundled(golang(github.com/containers/storage/pkg/idtools))
-Provides: bundled(golang(github.com/containers/storage/pkg/ioutils))
-Provides: bundled(golang(github.com/containers/storage/pkg/lockfile))
-Provides: bundled(golang(github.com/containers/storage/pkg/mount))
-Provides: bundled(golang(github.com/containers/storage/pkg/reexec))
-Provides: bundled(golang(github.com/containers/storage/pkg/stringid))
-Provides: bundled(golang(github.com/containers/storage/pkg/system))
-Provides: bundled(golang(github.com/containers/storage/pkg/unshare))
-Provides: bundled(golang(github.com/containers/storage/types))
-Provides: bundled(golang(github.com/cyphar/filepath-securejoin))
-Provides: bundled(golang(github.com/docker/distribution/registry/api/errcode))
-Provides: bundled(golang(github.com/docker/go-units))
-Provides: bundled(golang(github.com/fsouza/go-dockerclient))
-Provides: bundled(golang(github.com/hashicorp/go-multierror))
-Provides: bundled(golang(github.com/mattn/go-shellwords))
-Provides: bundled(golang(github.com/opencontainers/go-digest))
-Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go))
-Provides: bundled(golang(github.com/opencontainers/image-spec/specs-go/v1))
-Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/apparmor))
-Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/devices))
-Provides: bundled(golang(github.com/opencontainers/runc/libcontainer/userns))
-Provides: bundled(golang(github.com/opencontainers/runtime-spec/specs-go))
-Provides: bundled(golang(github.com/opencontainers/runtime-tools/generate))
-Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux))
-Provides: bundled(golang(github.com/opencontainers/selinux/go-selinux/label))
-Provides: bundled(golang(github.com/openshift/imagebuilder))
-Provides: bundled(golang(github.com/openshift/imagebuilder/dockerfile/command))
-Provides: bundled(golang(github.com/openshift/imagebuilder/dockerfile/parser))
-Provides: bundled(golang(github.com/sirupsen/logrus))
-Provides: bundled(golang(github.com/spf13/cobra))
-Provides: bundled(golang(github.com/spf13/pflag))
-Provides: bundled(golang(github.com/syndtr/gocapability/capability))
-Provides: bundled(golang(go.etcd.io/bbolt))
-Provides: bundled(golang(golang.org/x/crypto/bcrypt))
-Provides: bundled(golang(golang.org/x/crypto/ssh))
-Provides: bundled(golang(golang.org/x/crypto/ssh/agent))
-Provides: bundled(golang(golang.org/x/sync/semaphore))
-Provides: bundled(golang(golang.org/x/sys/unix))
-Provides: bundled(golang(golang.org/x/term))
-Provides: bundled(golang(sigs.k8s.io/yaml))
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -217,12 +128,10 @@ export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
 %gobuild -o bin/imgtype ./tests/imgtype
 %gobuild -o bin/copy ./tests/copy
 %gobuild -o bin/tutorial ./tests/tutorial
-GOMD2MAN=go-md2man %{__make} -C docs
+%{__make} docs
 
 %install
-export GOPATH=$(pwd)/_build:$(pwd)
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
-make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
@@ -230,6 +139,8 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 
+rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
+
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 

sources

@@ -1 +1 @@
-SHA512 (v1.31.0.tar.gz) = 613c8e76f134ce46e9d9c21a747914993214f0cc875a193e972f77784ca8d2f683c08557c7b764e3c48c854ca4104e04d3d6529e28397ec76311cc937168a696
+SHA512 (v1.31.1.tar.gz) = 7375877d964197d0690542e1da0636b0a67cdf01f30ddbdd69cced5cfe4f8bb370b37ec58f2dffd2c2f048b897470d8fb06cd9f70c8e75df2aa6b19f86610f7b