From 93b97e60910fad556bab7fbfdca113b9a61d0ec3 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 10 Aug 2023 20:58:12 +0000 Subject: [PATCH 01/22] [packit] 4.6.1 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: v4.6.1 Upstream commit: f3069b3f 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/podman.git refs/heads/*:refs/remotes/packit/* git checkout packit/4.6.1-f39-update-propose_downstream ``` --- .gitignore | 1 + README.packit | 2 +- podman.spec | 21 +++++++++++++++------ sources | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 32554f2..832a07c 100644 --- a/.gitignore +++ b/.gitignore @@ -1832,3 +1832,4 @@ /v4.6.0-rc1.tar.gz /v4.6.0-rc2.tar.gz /v4.6.0.tar.gz +/v4.6.1.tar.gz diff --git a/README.packit b/README.packit index 9d6cbbc..d7c433c 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.1. +The file was generated using packit 0.78.2.post2+g81828af. diff --git a/podman.spec b/podman.spec index 44691da..8372b55 100644 --- a/podman.spec +++ b/podman.spec @@ -7,12 +7,18 @@ %global debug_package %{nil} %endif -# 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 8's go-srpm-macros package. -%if %{defined rhel} && 0%{?rhel} == 8 +# RHEL'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 +# 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} && !%{defined eln} %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 %{?**}; +# python3 dep conditional for rhel8 +%if %{?rhel} == 8 %define rhel8py3 1 %endif +%endif %global gomodulesmode GO111MODULE=on @@ -25,12 +31,13 @@ %define build_with_btrfs 1 %endif -# gvproxy can be included as a standalone package on copr. +# gvproxy doesn't currently build on rawhide because of go1.21. +# It can be included as a standalone package on copr. # It is currently open for review on bugzilla until which fedora releases can't # include it. Official rawhide should be able to fetch the last active build of # gvproxy, the min version requirement has been removed to allow it. # Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2224434 -%if !%{defined copr_username} && 0%{?fedora} <= 38 +%if !%{defined copr_username} && 0%{?fedora} <= 37 %define gvproxy_subpackage 1 %endif @@ -50,10 +57,12 @@ %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global import_path_plugins %{container_base_path}/%{repo_plugins} +%if %{defined gvproxy_subpackage} # gvproxy %global repo_gvproxy gvisor-tap-vsock %global git_gvproxy %{container_base_url}/%{repo_gvproxy} %global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544 +%endif Name: podman %if %{defined copr_username} @@ -67,7 +76,7 @@ Epoch: 5 # 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: 4.6.0 +Version: 4.6.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} diff --git a/sources b/sources index 930594b..8909bac 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (v4.6.0.tar.gz) = a0f045e3275f072abcf2e59636527f1b98b7579d7b64df37cbabbf1f9d2cb3852a95240f6145ccd81d4b31da0175003ab0043d269c75f9dfb31586065554c986 +SHA512 (v4.6.1.tar.gz) = e875fd8f40be94a589ac2404e82e282490bdd639b75943f669feadf81a26abf9a1bf6649be7d9d2dd07e62df58af7d495c673f30c98cc27a2cf6e7892daf3f28 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c From bbb1d5b455a9225fb1bb982505bea7aed69857d3 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 28 Aug 2023 19:17:27 +0000 Subject: [PATCH 02/22] [packit] 4.6.2 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: v4.6.2 Upstream commit: 5db42e86 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/podman.git refs/heads/*:refs/remotes/packit/* git checkout packit/4.6.2-f39-update-propose_downstream ``` --- .gitignore | 1 + .packit.yaml | 52 +++++++++++++++++++++++++++++++++++++-------------- README.packit | 2 +- podman.spec | 6 ++++-- sources | 2 +- 5 files changed, 45 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 832a07c..a609cd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1833,3 +1833,4 @@ /v4.6.0-rc2.tar.gz /v4.6.0.tar.gz /v4.6.1.tar.gz +/v4.6.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 2d53d26..fb8aefa 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,27 +2,51 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -# Build targets can be found at: -# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ - specfile_path: rpm/podman.spec upstream_tag_template: v{version} -jobs: - - &copr - job: copr_build - trigger: pull_request - owner: rhcontainerbot - project: packit-builds - enable_net: true - srpm_build_deps: - - make +srpm_build_deps: + - make - - <<: *copr - # Run on commit to main branch +jobs: + - job: copr_build + trigger: pull_request + enable_net: true + # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + targets: + - fedora-all-x86_64 + - fedora-all-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 branch: main + owner: rhcontainerbot project: podman-next + enable_net: true + + - job: tests + identifier: cockpit-revdeps + trigger: pull_request + targets: + - fedora-latest-stable + - fedora-development + tf_extra_params: + environments: + - artifacts: + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo + - type: repository-file + id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo + tmt: + context: + revdeps: "yes" - job: propose_downstream trigger: release 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/podman.spec b/podman.spec index 8372b55..35f6168 100644 --- a/podman.spec +++ b/podman.spec @@ -76,8 +76,9 @@ Epoch: 5 # 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: 4.6.1 -License: Apache-2.0 and BSD-2-Clause and BSD-3-Clause and ISC and MIT and MPL-2.0 +Version: 4.6.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 %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} @@ -115,6 +116,7 @@ BuildRequires: libselinux-devel BuildRequires: shadow-utils-subid-devel BuildRequires: pkgconfig BuildRequires: make +BuildRequires: man-db BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel diff --git a/sources b/sources index 8909bac..8ebecd1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (v4.6.1.tar.gz) = e875fd8f40be94a589ac2404e82e282490bdd639b75943f669feadf81a26abf9a1bf6649be7d9d2dd07e62df58af7d495c673f30c98cc27a2cf6e7892daf3f28 +SHA512 (v4.6.2.tar.gz) = 0c89ff3df21e9ca0eb6891600eb86c47463a53bd004d1564cc4661f0ea303dc245b47467d586db29587f960d5c78e0326b7f33ef87ba95e142e3320c56ceaa99 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c From 8c78cc01f706a356828ca5df33bc268136a75bed Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 29 Aug 2023 14:34:10 -0400 Subject: [PATCH 03/22] tests: add passt to rpm -qa so we know what version is used in tests (cherry picked from commit 01f53fd3b585ecab4e80c90ebdeb6e1338937816) --- tests/roles/run_bats_tests/files/run_bats_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index 249c3ec..90884cb 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/tests/roles/run_bats_tests/files/run_bats_tests.sh @@ -27,7 +27,7 @@ exec &> >(tee -a $FULL_LOG) echo "Packages:" echo " Kernel: $(uname -r)" rpm -qa |\ - egrep 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux' |\ + egrep 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ sort |\ sed -e 's/^/ /' From 480cbb5a6e1c0972eb2c0d31dee56e13b6c13a33 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 12 Sep 2023 15:39:19 -0400 Subject: [PATCH 04/22] podman has hard dependency on gvisor-tap-vsock-gvforwarder (cherry picked from commit e937b31ec5a1f2cff1c1514e49b702469f5f6e7e) --- podman.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/podman.spec b/podman.spec index 35f6168..4473d84 100644 --- a/podman.spec +++ b/podman.spec @@ -95,7 +95,6 @@ Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvpro %endif Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst -BuildRequires: %{_bindir}/go-md2man %if %{defined build_with_btrfs} BuildRequires: btrfs-progs-devel %endif @@ -131,6 +130,7 @@ Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} %else Recommends: %{name}-gvproxy %endif +Requires: gvisor-tap-vsock-gvforwarder Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} @@ -223,6 +223,13 @@ A replacement for libslirp and VPNKit, written in pure Go. It is based on the network stack of gVisor. Compared to libslirp, gvisor-tap-vsock brings a configurable DNS server and dynamic port forwarding. + +%global desc_gvforwarder Forward traffic from a tap interface over vsock +%package -n gvisor-tap-vsock-gvforwarder +Summary: %{desc_gvforwarder} + +%description -n gvisor-tap-vsock-gvforwarder +%{desc_gvforwarder} %endif %package -n %{name}sh @@ -236,7 +243,7 @@ Provides: %{name}-%{name}sh = %{epoch}:%{version}-%{release} capabilities specified in user quadlets. It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container -when `%{_bindir}/%{name}sh is set as a login shell or set as os.Args[0]. +when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. %prep %autosetup -Sgit -n %{name}-%{version} @@ -393,7 +400,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_datadir}/zsh/site-functions/_%{name}-remote %files tests -%license LICENSE %{_datadir}/%{name}/test %files plugins @@ -408,12 +414,13 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %doc %{repo_gvproxy}-%{commit_gvproxy}/README.md %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy + +%files -n gvisor-tap-vsock-gvforwarder +%dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvforwarder %endif %files -n %{name}sh -%license LICENSE -%doc README.md CONTRIBUTING.md install.md transfer.md %{_bindir}/%{name}sh %changelog From 4b992653c635281d19abe86d8c5e750331446156 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 27 Sep 2023 18:05:15 +0000 Subject: [PATCH 05/22] [packit] 4.7.0 upstream release Upstream tag: v4.7.0 Upstream commit: 073183fe --- .gitignore | 1 + .packit.yaml | 14 +++++++- README.packit | 2 +- podman.spec | 88 +++------------------------------------------------ sources | 3 +- 5 files changed, 20 insertions(+), 88 deletions(-) diff --git a/.gitignore b/.gitignore index a609cd9..3e7c5ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1834,3 +1834,4 @@ /v4.6.0.tar.gz /v4.6.1.tar.gz /v4.6.2.tar.gz +/v4.7.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index fb8aefa..3044626 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -6,16 +6,25 @@ specfile_path: rpm/podman.spec upstream_tag_template: v{version} srpm_build_deps: + - git-archive-all - make +actions: + fix-spec-file: + - "bash .packit.sh" + jobs: - job: copr_build trigger: pull_request + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true - # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next 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 @@ -26,6 +35,9 @@ jobs: # Run on commit to main branch - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main owner: rhcontainerbot project: podman-next diff --git a/README.packit b/README.packit index 797aefb..8b12de4 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.81.0.post1.dev4+g3347ce2b. diff --git a/podman.spec b/podman.spec index 4473d84..e7fc75d 100644 --- a/podman.spec +++ b/podman.spec @@ -31,16 +31,6 @@ %define build_with_btrfs 1 %endif -# gvproxy doesn't currently build on rawhide because of go1.21. -# It can be included as a standalone package on copr. -# It is currently open for review on bugzilla until which fedora releases can't -# include it. Official rawhide should be able to fetch the last active build of -# gvproxy, the min version requirement has been removed to allow it. -# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2224434 -%if !%{defined copr_username} && 0%{?fedora} <= 37 -%define gvproxy_subpackage 1 -%endif - %global container_base_path github.com/containers %global container_base_url https://%{container_base_path} @@ -57,13 +47,6 @@ %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global import_path_plugins %{container_base_path}/%{repo_plugins} -%if %{defined gvproxy_subpackage} -# gvproxy -%global repo_gvproxy gvisor-tap-vsock -%global git_gvproxy %{container_base_url}/%{repo_gvproxy} -%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544 -%endif - Name: podman %if %{defined copr_username} Epoch: 102 @@ -76,7 +59,7 @@ Epoch: 5 # 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: 4.6.2 +Version: 4.7.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 @@ -90,9 +73,6 @@ URL: https://%{name}.io/ # All SourceN files fetched from upstream Source0: %{git0}/archive/v%{version}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz -%if %{defined gvproxy_subpackage} -Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz -%endif Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} @@ -125,12 +105,8 @@ BuildRequires: python3 Requires: catatonit Requires: conmon >= 2:2.1.7-2 Requires: containers-common-extra -%if %{defined gvproxy_subpackage} -Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} -%else -Recommends: %{name}-gvproxy -%endif Requires: gvisor-tap-vsock-gvforwarder +Recommends: gvisor-tap-vsock Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release} @@ -200,11 +176,7 @@ connections as well. %package plugins Summary: Plugins for %{name} Requires: dnsmasq -%if %{defined gvproxy_subpackage} -Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} -%else -Recommends: %{name}-gvproxy -%endif +Recommends: gvisor-tap-vsock %description plugins This plugin sets up the use of dnsmasq on a given CNI network so @@ -214,24 +186,6 @@ that dnsmasq will read in. Similarly, when a pod is removed from the network, it will remove the entry from the hosts file. Each CNI network will have its own dnsmasq instance. -%if %{defined gvproxy_subpackage} -%package gvproxy -Summary: Go replacement for libslirp and VPNKit - -%description gvproxy -A replacement for libslirp and VPNKit, written in pure Go. -It is based on the network stack of gVisor. Compared to libslirp, -gvisor-tap-vsock brings a configurable DNS server and -dynamic port forwarding. - -%global desc_gvforwarder Forward traffic from a tap interface over vsock -%package -n gvisor-tap-vsock-gvforwarder -Summary: %{desc_gvforwarder} - -%description -n gvisor-tap-vsock-gvforwarder -%{desc_gvforwarder} -%endif - %package -n %{name}sh Summary: Confined login and user shell using %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -252,11 +206,6 @@ sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile # untar dnsname tar zxf %{SOURCE1} -%if %{defined gvproxy_subpackage} -# untar %%{name}-gvproxy -tar zxf %{SOURCE2} -%endif - %build %set_build_flags export CGO_CFLAGS=$CFLAGS @@ -292,17 +241,9 @@ export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remot export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" %gobuild -o bin/quadlet ./cmd/quadlet -# reset LDFLAGS for plugins and gvisor binaries +# reset LDFLAGS for plugins binaries LDFLAGS='' -%if %{defined gvproxy_subpackage} -# build gvisor-tap-vsock binaries -cd %{repo_gvproxy}-%{commit_gvproxy} -%gobuild -o bin/gvproxy ./cmd/gvproxy -%gobuild -o bin/gvforwarder ./cmd/vm -cd .. -%endif - %{__make} docs docker-docs # build dnsname the old way otherwise it fails on koji @@ -339,15 +280,6 @@ cd %{repo_plugins}-%{commit_plugins} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install cd .. -%if %{defined gvproxy_subpackage} -# install gvproxy -cd %{repo_gvproxy}-%{commit_gvproxy} -install -dp %{buildroot}%{_libexecdir}/%{name} -install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} -install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/%{name} -cd .. -%endif - # do not include docker and podman-remote man pages in main package for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do echo "$file*" >> podman.file-list @@ -408,18 +340,6 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %dir %{_libexecdir}/cni %{_libexecdir}/cni/dnsname -%if %{defined gvproxy_subpackage} -%files gvproxy -%license %{repo_gvproxy}-%{commit_gvproxy}/LICENSE -%doc %{repo_gvproxy}-%{commit_gvproxy}/README.md -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/gvproxy - -%files -n gvisor-tap-vsock-gvforwarder -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/gvforwarder -%endif - %files -n %{name}sh %{_bindir}/%{name}sh diff --git a/sources b/sources index 8ebecd1..921e188 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (v4.6.2.tar.gz) = 0c89ff3df21e9ca0eb6891600eb86c47463a53bd004d1564cc4661f0ea303dc245b47467d586db29587f960d5c78e0326b7f33ef87ba95e142e3320c56ceaa99 +SHA512 (v4.7.0.tar.gz) = 4cab8698a819cd42de4cb588978c94c91b0c85693db2476aa6d20d7f4e4a7674d417703f70bdbb5a0e94b678fd585ae03a95ff0e5b7eb2682d9f400b92915742 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c From ee7f1b4ff1d2b6d575c615da317362e3f782b412 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 5 Oct 2023 17:19:51 +0000 Subject: [PATCH 06/22] [packit] 4.7.1 upstream release Upstream tag: v4.7.1 Upstream commit: ef83eeb9 --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3e7c5ad..f9e4262 100644 --- a/.gitignore +++ b/.gitignore @@ -1835,3 +1835,4 @@ /v4.6.1.tar.gz /v4.6.2.tar.gz /v4.7.0.tar.gz +/v4.7.1.tar.gz diff --git a/README.packit b/README.packit index 8b12de4..a50d49c 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.81.0.post1.dev4+g3347ce2b. +The file was generated using packit 0.82.0.post1.dev2+g77334714. diff --git a/podman.spec b/podman.spec index e7fc75d..2dda8f6 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 5 # 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: 4.7.0 +Version: 4.7.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 921e188..152c219 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.7.0.tar.gz) = 4cab8698a819cd42de4cb588978c94c91b0c85693db2476aa6d20d7f4e4a7674d417703f70bdbb5a0e94b678fd585ae03a95ff0e5b7eb2682d9f400b92915742 +SHA512 (v4.7.1.tar.gz) = cb89a687900bdc8ab9aec01d11c4e3062d8735122aa03639fa6eeecde10ea4bc3633381bce1e65955bf112d4fda330182f81d81054916b1eca8b7354c0f55c14 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From 9302d2259b132ed532ac41288a43254c21009f2c Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 31 Oct 2023 14:11:09 +0000 Subject: [PATCH 07/22] [packit] 4.7.2 upstream release Upstream tag: v4.7.2 Upstream commit: 750b4c3a --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9e4262..1f733b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1836,3 +1836,4 @@ /v4.6.2.tar.gz /v4.7.0.tar.gz /v4.7.1.tar.gz +/v4.7.2.tar.gz diff --git a/README.packit b/README.packit index a50d49c..5998f60 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.82.0.post1.dev2+g77334714. +The file was generated using packit 0.85.0. diff --git a/podman.spec b/podman.spec index 2dda8f6..8ae7567 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 5 # 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: 4.7.1 +Version: 4.7.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 152c219..46638fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.7.1.tar.gz) = cb89a687900bdc8ab9aec01d11c4e3062d8735122aa03639fa6eeecde10ea4bc3633381bce1e65955bf112d4fda330182f81d81054916b1eca8b7354c0f55c14 +SHA512 (v4.7.2.tar.gz) = 1873a158f2e0527b6e57929f391c4ea5adee5fba33e861eb7744cd0ac845f7296f6149b5e824142e701e5b4db95466585206f37402298301f99cc40b781a51ba SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From 834154571ab11433183fe925e3a95d1c3a405668 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 27 Nov 2023 16:00:53 +0530 Subject: [PATCH 08/22] bump to v4.8.0-rc1 --- .gitignore | 1 + podman.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1f733b6..41cf042 100644 --- a/.gitignore +++ b/.gitignore @@ -1837,3 +1837,4 @@ /v4.7.0.tar.gz /v4.7.1.tar.gz /v4.7.2.tar.gz +/v4.8.0-rc1.tar.gz diff --git a/podman.spec b/podman.spec index 8ae7567..5cb58ca 100644 --- a/podman.spec +++ b/podman.spec @@ -59,7 +59,7 @@ Epoch: 5 # 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: 4.7.2 +Version: 4.8.0~rc1 # 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 @@ -71,7 +71,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64 Summary: Manage Pods, Containers and Container Images URL: https://%{name}.io/ # All SourceN files fetched from upstream -Source0: %{git0}/archive/v%{version}.tar.gz +Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst @@ -200,7 +200,7 @@ It is a symlink to %{_bindir}/%{name} and execs into the `%{name}sh` container when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. %prep -%autosetup -Sgit -n %{name}-%{version} +%autosetup -Sgit -n %{name}-%{version_no_tilde} sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile # untar dnsname diff --git a/sources b/sources index 46638fd..1328ecc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.7.2.tar.gz) = 1873a158f2e0527b6e57929f391c4ea5adee5fba33e861eb7744cd0ac845f7296f6149b5e824142e701e5b4db95466585206f37402298301f99cc40b781a51ba SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 +SHA512 (v4.8.0-rc1.tar.gz) = 5b3cb3e78d311cf41c5b79ac0b93c34e77b7168230b6f307304be210a34606a937aa6039e2de14a5ae6271b94e7a19e12503335c3796f57c968df004d5f13607 From e687e040f525063a5a0c372f7bd890fda9ed0b98 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 27 Nov 2023 19:52:25 +0000 Subject: [PATCH 09/22] [packit] 4.8.0 upstream release Upstream tag: v4.8.0 Upstream commit: c4dfcf14 --- .gitignore | 1 + .packit.yaml | 3 +++ README.packit | 2 +- podman.spec | 22 ++++++++++++++++++++-- sources | 2 +- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 41cf042..f2a59d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1838,3 +1838,4 @@ /v4.7.1.tar.gz /v4.7.2.tar.gz /v4.8.0-rc1.tar.gz +/v4.8.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 3044626..31218d6 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -46,6 +46,9 @@ jobs: - job: tests identifier: cockpit-revdeps trigger: pull_request + notifications: + failure_comment: + message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check." targets: - fedora-latest-stable - fedora-development diff --git a/README.packit b/README.packit index 5998f60..d778d97 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.85.0. +The file was generated using packit 0.86.2.post1.dev2+g209847d1. diff --git a/podman.spec b/podman.spec index 5cb58ca..0f5bf54 100644 --- a/podman.spec +++ b/podman.spec @@ -31,6 +31,10 @@ %define build_with_btrfs 1 %endif +%if %{defined copr_username} +%define copr_build 1 +%endif + %global container_base_path github.com/containers %global container_base_url https://%{container_base_path} @@ -48,7 +52,7 @@ %global import_path_plugins %{container_base_path}/%{repo_plugins} Name: podman -%if %{defined copr_username} +%if %{defined copr_build} Epoch: 102 %else Epoch: 5 @@ -59,7 +63,7 @@ Epoch: 5 # 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: 4.8.0~rc1 +Version: 4.8.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 @@ -105,7 +109,11 @@ BuildRequires: python3 Requires: catatonit Requires: conmon >= 2:2.1.7-2 Requires: containers-common-extra +%if %{defined rhel} && !%{defined eln} +Recommends: gvisor-tap-vsock-gvforwarder +%else Requires: gvisor-tap-vsock-gvforwarder +%endif Recommends: gvisor-tap-vsock Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 @@ -203,6 +211,14 @@ when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0]. %autosetup -Sgit -n %{name}-%{version_no_tilde} sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile +# These changes are only meant for copr builds +%if %{defined copr_build} +# podman --version should show short sha +sed -i "s/^const RawVersion = .*/const RawVersion = \"##VERSION##-##SHORT_SHA##\"/" version/rawversion/version.go +# use ParseTolerant to allow short sha in version +sed -i "s/^var Version.*/var Version, err = semver.ParseTolerant(rawversion.RawVersion)/" version/version.go +%endif + # untar dnsname tar zxf %{SOURCE1} @@ -219,6 +235,8 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" %endif +export GOPROXY=direct + LDFLAGS="-X %{ld_libpod}/define.buildInfo=$(date +%s) \ -X %{ld_libpod}/config._installPrefix=%{_prefix} \ -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \ diff --git a/sources b/sources index 1328ecc..029e7a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (v4.8.0.tar.gz) = 2178a9c8428a0cf2c402e0f299efe2ad9a797143e641a92438112694a4acbdfb69ba8c104c87f4763d001f17cedb709eef24d86460d095a61a64d29a168a2051 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (v4.8.0-rc1.tar.gz) = 5b3cb3e78d311cf41c5b79ac0b93c34e77b7168230b6f307304be210a34606a937aa6039e2de14a5ae6271b94e7a19e12503335c3796f57c968df004d5f13607 From fdb5239ed7b9bf5339af6c2a3e62b9e84524a383 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 5 Dec 2023 11:55:23 +0000 Subject: [PATCH 10/22] [packit] 4.8.1 upstream release Upstream tag: v4.8.1 Upstream commit: ef6e5ac4 --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f2a59d0..0d22fff 100644 --- a/.gitignore +++ b/.gitignore @@ -1839,3 +1839,4 @@ /v4.7.2.tar.gz /v4.8.0-rc1.tar.gz /v4.8.0.tar.gz +/v4.8.1.tar.gz diff --git a/README.packit b/README.packit index d778d97..d51b2f8 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.86.2.post1.dev2+g209847d1. +The file was generated using packit 0.87.1.post1.dev5+g6e286a7b. diff --git a/podman.spec b/podman.spec index 0f5bf54..f87be59 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.8.0 +Version: 4.8.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 029e7a0..bc9c268 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.8.0.tar.gz) = 2178a9c8428a0cf2c402e0f299efe2ad9a797143e641a92438112694a4acbdfb69ba8c104c87f4763d001f17cedb709eef24d86460d095a61a64d29a168a2051 +SHA512 (v4.8.1.tar.gz) = a9188b81d4f4babb04c5a44d8a3aefb73c5d8f53d056d32c5c8563f296e27fa4f4b60f6c8581bebb7ee47c3f760743fd386211906ef0a88249f78256b24a4764 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From dc663f33a98deb162b09847456cf6ebd814ec594 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 11 Dec 2023 12:58:08 +0000 Subject: [PATCH 11/22] [packit] 4.8.2 upstream release Upstream tag: v4.8.2 Upstream commit: aa546902 --- .gitignore | 1 + podman.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d22fff..8ea050c 100644 --- a/.gitignore +++ b/.gitignore @@ -1840,3 +1840,4 @@ /v4.8.0-rc1.tar.gz /v4.8.0.tar.gz /v4.8.1.tar.gz +/v4.8.2.tar.gz diff --git a/podman.spec b/podman.spec index f87be59..781ddcc 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.8.1 +Version: 4.8.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 bc9c268..deb78ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.8.1.tar.gz) = a9188b81d4f4babb04c5a44d8a3aefb73c5d8f53d056d32c5c8563f296e27fa4f4b60f6c8581bebb7ee47c3f760743fd386211906ef0a88249f78256b24a4764 +SHA512 (v4.8.2.tar.gz) = 4ad4d03010fc706bb53de4d5de4779f0f32f623cda301f5bbcfd9d2e8f443f2955d2c8b9278f4741aad72498e87081475a53d5e5b1ce8a28035e18aa6d5acb0c SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From 2c60ecd5a8825780ff3bc3173da70f1e8a2d8106 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 3 Jan 2024 13:55:56 +0000 Subject: [PATCH 12/22] [packit] 4.8.3 upstream release Upstream tag: v4.8.3 Upstream commit: 85dc30df --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8ea050c..9b8a670 100644 --- a/.gitignore +++ b/.gitignore @@ -1841,3 +1841,4 @@ /v4.8.0.tar.gz /v4.8.1.tar.gz /v4.8.2.tar.gz +/v4.8.3.tar.gz diff --git a/README.packit b/README.packit index d51b2f8..f27b296 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.87.1.post1.dev5+g6e286a7b. +The file was generated using packit 0.87.1.post1.dev11+gd1f7091b. diff --git a/podman.spec b/podman.spec index 781ddcc..ad6197a 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.8.2 +Version: 4.8.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 diff --git a/sources b/sources index deb78ef..b5b288c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.8.2.tar.gz) = 4ad4d03010fc706bb53de4d5de4779f0f32f623cda301f5bbcfd9d2e8f443f2955d2c8b9278f4741aad72498e87081475a53d5e5b1ce8a28035e18aa6d5acb0c +SHA512 (v4.8.3.tar.gz) = 13ade866b888d32ada3b38130d7cc4677591136e25234e040b478c5d002d1b7907ed46731996d25cc41b992b98b75f109c6e6eea44251f4ad89162b20266976d SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From 5eb7416af2d72a2444b43043143ea412aa70751e Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 24 Jan 2024 09:56:10 +0000 Subject: [PATCH 13/22] [packit] 4.9.0 upstream release Upstream tag: v4.9.0 Upstream commit: f7c7b0a7 --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9b8a670..026f3bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1842,3 +1842,4 @@ /v4.8.1.tar.gz /v4.8.2.tar.gz /v4.8.3.tar.gz +/v4.9.0.tar.gz diff --git a/README.packit b/README.packit index f27b296..bba9424 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.87.1.post1.dev11+gd1f7091b. +The file was generated using packit 0.89.0.post1.dev4+gabf90471. diff --git a/podman.spec b/podman.spec index ad6197a..58f3a15 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.8.3 +Version: 4.9.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 b5b288c..9ffe3c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.8.3.tar.gz) = 13ade866b888d32ada3b38130d7cc4677591136e25234e040b478c5d002d1b7907ed46731996d25cc41b992b98b75f109c6e6eea44251f4ad89162b20266976d +SHA512 (v4.9.0.tar.gz) = 70f395c8ff048aafeab81a526b2ff3a884a16f4e55435e643d8cea620ac2d48ef93b5482f6fcc75cffc9652b76dc385ff3baa911797600e30b0bb125e289ce52 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From 4d2e17d211219f26b60e0492a37df636af2c5938 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 1 Feb 2024 14:12:47 +0000 Subject: [PATCH 14/22] [packit] 4.9.1 upstream release Upstream tag: v4.9.1 Upstream commit: 118829d7 --- .gitignore | 1 + README.packit | 2 +- podman.spec | 4 ++-- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 026f3bf..065b0f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1843,3 +1843,4 @@ /v4.8.2.tar.gz /v4.8.3.tar.gz /v4.9.0.tar.gz +/v4.9.1.tar.gz diff --git a/README.packit b/README.packit index bba9424..9a6e969 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.89.0.post1.dev4+gabf90471. +The file was generated using packit 0.90.0.post1.dev3+g3d9551d2. diff --git a/podman.spec b/podman.spec index 58f3a15..fb0148d 100644 --- a/podman.spec +++ b/podman.spec @@ -12,7 +12,7 @@ # 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} && !%{defined eln} +%if %{defined rhel} && 0%{?rhel} < 10 %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 %{?**}; # python3 dep conditional for rhel8 %if %{?rhel} == 8 @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.9.0 +Version: 4.9.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 9ffe3c4..805f1dc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.9.0.tar.gz) = 70f395c8ff048aafeab81a526b2ff3a884a16f4e55435e643d8cea620ac2d48ef93b5482f6fcc75cffc9652b76dc385ff3baa911797600e30b0bb125e289ce52 +SHA512 (v4.9.1.tar.gz) = 59cece9806df3b69e202b39e0a45d71b3f6fd77dbbbe1452bc046468d5504fc52c21ad3056a89bab7d3f9a86c86e22369902e0a2840ca43e0dd3a6c4c10affc2 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From 27a14aa1b7f32a5734d250d0352aa8ba39d8b21a Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 2 Feb 2024 23:34:23 +0000 Subject: [PATCH 15/22] [packit] 4.9.2 upstream release Upstream tag: v4.9.2 Upstream commit: f9a48ebc --- .gitignore | 1 + podman.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 065b0f8..3285755 100644 --- a/.gitignore +++ b/.gitignore @@ -1844,3 +1844,4 @@ /v4.8.3.tar.gz /v4.9.0.tar.gz /v4.9.1.tar.gz +/v4.9.2.tar.gz diff --git a/podman.spec b/podman.spec index fb0148d..c1a741a 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.9.1 +Version: 4.9.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 805f1dc..595152b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.9.1.tar.gz) = 59cece9806df3b69e202b39e0a45d71b3f6fd77dbbbe1452bc046468d5504fc52c21ad3056a89bab7d3f9a86c86e22369902e0a2840ca43e0dd3a6c4c10affc2 +SHA512 (v4.9.2.tar.gz) = 09f6c1839d67fb7404688c8fc6fcb65471ca9f9d1651f7c5c57baa52eb64f0a8f73523d7761a857794b6307d3a943aecd92fc247dd193ccf1d53eb234f9f6ff5 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From 58a342e9dd51fdfe0c3825c2879f18f059e010e8 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 13 Feb 2024 22:40:10 +0000 Subject: [PATCH 16/22] [packit] 4.9.3 upstream release Upstream tag: v4.9.3 Upstream commit: 8d2b55dd --- .gitignore | 1 + .packit.yaml | 11 +++++------ README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3285755..f28e281 100644 --- a/.gitignore +++ b/.gitignore @@ -1845,3 +1845,4 @@ /v4.9.0.tar.gz /v4.9.1.tar.gz /v4.9.2.tar.gz +/v4.9.3.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 31218d6..4ee1ab7 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -66,15 +66,14 @@ jobs: - job: propose_downstream trigger: release update_release: false - dist_git_branches: - - fedora-all + dist_git_branches: &stable_fedora + - fedora-39 + - fedora-38 - job: koji_build trigger: commit - dist_git_branches: - - fedora-all + dist_git_branches: *stable_fedora - job: bodhi_update trigger: commit - dist_git_branches: - - fedora-branched # rawhide updates are created automatically + dist_git_branches: *stable_fedora diff --git a/README.packit b/README.packit index 9a6e969..f592284 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.90.0.post1.dev3+g3d9551d2. +The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. diff --git a/podman.spec b/podman.spec index c1a741a..5abd65f 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.9.2 +Version: 4.9.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 diff --git a/sources b/sources index 595152b..9f1c480 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.9.2.tar.gz) = 09f6c1839d67fb7404688c8fc6fcb65471ca9f9d1651f7c5c57baa52eb64f0a8f73523d7761a857794b6307d3a943aecd92fc247dd193ccf1d53eb234f9f6ff5 +SHA512 (v4.9.3.tar.gz) = 395014bbe70923f1444d2f33440013a16e9c339b70be5e6a9c7026617a40795a1c0e410c08a52fba46b9f5e853d853ce4133db36167a3c5ace7d325f8b3a3327 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From c0d8f73a58878c5c50f68848d1680bbf0a955b46 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 13 Feb 2024 22:40:59 +0100 Subject: [PATCH 17/22] Update how Toolbx is spelt This is meant to make the project more searchable on the Internet. More and more people have been pointing out that "toolbox" is terribly difficult to search for, and it's impossible to find any decent Internet real estate by that name. Some exceptions: * The code repository is still https://github.com/containers/toolbox. It will be renamed after giving a heads-up to other contributors. * The name of the binary is still 'toolbox'. The name is embedded into existing Toolbx containers as their entry point, which is bind mounted from the host operating system when the containers are started. Trivially renaming the binary will prevent these containers from starting. * The name of the Fedora package is still 'toolbox'. https://src.fedoraproject.org/rpms/podman/pull-request/135 https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/122 (cherry picked from commit 7bff8d08f668797fa44881a1bc65632c18bdeb94) (cherry picked from commit d5ceaea2061255e91c7a18634b325d983d4c56b7) --- tests/test_podman.yml | 4 ++-- tests/{test_toolbox.yml => test_toolbx.yml} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename tests/{test_toolbox.yml => test_toolbx.yml} (89%) diff --git a/tests/test_podman.yml b/tests/test_podman.yml index 0b4c41b..a47cd5d 100644 --- a/tests/test_podman.yml +++ b/tests/test_podman.yml @@ -43,8 +43,8 @@ - name: test podman-remote include_tasks: test_podman_remote.yml - - name: test toolbox - include_tasks: test_toolbox.yml + - name: test toolbx + include_tasks: test_toolbx.yml # Postprocessing: check for FAIL or ERROR in any test, exit 1 if so - name: check results diff --git a/tests/test_toolbox.yml b/tests/test_toolbx.yml similarity index 89% rename from tests/test_toolbox.yml rename to tests/test_toolbx.yml index 9b0859c..a7470c5 100644 --- a/tests/test_toolbox.yml +++ b/tests/test_toolbx.yml @@ -3,7 +3,7 @@ name: run_bats_tests vars: tests: - - name: toolbox + - name: toolbx package: toolbox become: true environment: From 50f1c1b2788b4a4026beadb06c975f05d6230378 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 15 Feb 2024 15:04:49 +0100 Subject: [PATCH 18/22] Silence warnings about deprecated grep(1) use in test logs The egrep command was deprecated in 2007 as part of Grep 2.5.3, and since Grep 3.8 it actually warns about it [1]. The warning shows up in the test logs as: egrep: warning: egrep is obsolescent; using grep -E [1] Grep commit a9515624709865d4 https://git.savannah.gnu.org/cgit/grep.git/commit/?id=a9515624709865d4 https://src.fedoraproject.org/rpms/podman/pull-request/135 https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/125 (cherry picked from commit 89acf13e05c727b0b001cc3a4cf4a2887135e89c) (cherry picked from commit 864ae2707f8871b3bb073f088885efd9281a6ecf) --- tests/roles/run_bats_tests/files/run_bats_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index 90884cb..bddd851 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/tests/roles/run_bats_tests/files/run_bats_tests.sh @@ -27,7 +27,7 @@ exec &> >(tee -a $FULL_LOG) echo "Packages:" echo " Kernel: $(uname -r)" rpm -qa |\ - egrep 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ + grep -E 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ sort |\ sed -e 's/^/ /' From cce3558dc12ba81e28b437c336fd0c50a5fb34e0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 19 Feb 2024 20:32:59 +0100 Subject: [PATCH 19/22] Avoid running out of storage space when running the Toolbx tests Toolbx's system tests download several images when setting up the test suite, and cache them for later use by the tests [1]. This saves time and avoids hitting rate limits imposed by OCI registries by not downloading the same images repeatedly for several tests, but at the cost of increased use of storage space to cache the images. The images are cached under BATS_TMPDIR. It defaults to the TMPDIR environment variable, and if that's not set then to /tmp [2]. Normally, TMPDIR isn't set, and the images end up getting cached under /tmp. Now, /tmp is typically on tmpfs backed by RAM or swap, which means that it should be used for smaller size-bounded files only, and /var/tmp should be used for everything else [3]. The images are big enough that a collection of them can't be described as smaller and size-bounded, and it led to: 1..306 # test suite: Set up # test suite: Tear down not ok 1 setup_suite # (from function `setup_suite' in test file ./setup_suite.bash, line 55) # `_pull_and_cache_distro_image fedora "$((system_version-1))" || false' failed # Failed to cache image registry.fedoraproject.org/fedora-toolbox:40 to /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40 # time="2024-02-19T11:41:43Z" level=fatal msg="copying system image from manifest list: writing blob: write /tmp/bats-run-IPz4Cn/image-cache/fedora-toolbox-40/dir-put-blob607392514: no space left on device" # bats warning: Executed 1 instead of expected 306 tests So, change the default location of the BATS_TMPDIR environment variable to /var/tmp by setting TMPDIR. [1] Toolbx commit 50683c9d9a78adc9 https://github.com/containers/toolbox/commit/50683c9d9a78adc9 https://github.com/containers/toolbox/pull/375 [2] https://bats-core.readthedocs.io/en/stable/writing-tests.html [3] https://systemd.io/TEMPORARY_DIRECTORIES/ https://src.fedoraproject.org/rpms/podman/pull-request/135 https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/128 (cherry picked from commit c2712c6a6b64069dbc00c991fd1688e75305f6c5) (cherry picked from commit c616ef65810090a49b311badeccd67b9c0c473e9) --- tests/test_toolbx.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_toolbx.yml b/tests/test_toolbx.yml index a7470c5..58494f4 100644 --- a/tests/test_toolbx.yml +++ b/tests/test_toolbx.yml @@ -7,4 +7,5 @@ package: toolbox become: true environment: + TMPDIR: /var/tmp XDG_RUNTIME_DIR: /run/user/{{ rootless_uid }} From 431ac99dfeaaaf157100a6975478838fa983689b Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 29 Feb 2024 14:17:38 +0100 Subject: [PATCH 20/22] Show the toolbox RPMs used to run the tests This will make it easier to debug test failures by confirming if they are caused by old buggy toolbox RPMs or if the fixes don't work as intended. https://src.fedoraproject.org/rpms/podman/pull-request/135 https://src.fedoraproject.org/rpms/podman/pull-request/134 https://src.fedoraproject.org/rpms/podman/pull-request/133 (cherry picked from commit 5a89a8566598871e6684dd5b5e4dd09bda84ea01) (cherry picked from commit 46b5dceb08259315ac447efaa0ef7f105a6791da) --- tests/roles/run_bats_tests/files/run_bats_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/roles/run_bats_tests/files/run_bats_tests.sh b/tests/roles/run_bats_tests/files/run_bats_tests.sh index bddd851..f1df29d 100755 --- a/tests/roles/run_bats_tests/files/run_bats_tests.sh +++ b/tests/roles/run_bats_tests/files/run_bats_tests.sh @@ -27,7 +27,7 @@ exec &> >(tee -a $FULL_LOG) echo "Packages:" echo " Kernel: $(uname -r)" rpm -qa |\ - grep -E 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ + grep -E 'toolbox|podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\ sort |\ sed -e 's/^/ /' From b47d19cb91262c636551497beb07040596caae3f Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 25 Mar 2024 21:24:28 +0000 Subject: [PATCH 21/22] [packit] 4.9.4 upstream release Upstream tag: v4.9.4 Upstream commit: 3aceae8a --- .gitignore | 1 + .packit.yaml | 10 +--------- README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f28e281..53d616d 100644 --- a/.gitignore +++ b/.gitignore @@ -1846,3 +1846,4 @@ /v4.9.1.tar.gz /v4.9.2.tar.gz /v4.9.3.tar.gz +/v4.9.4.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 4ee1ab7..8d0fb3e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -66,14 +66,6 @@ jobs: - job: propose_downstream trigger: release update_release: false - dist_git_branches: &stable_fedora + dist_git_branches: - fedora-39 - fedora-38 - - - job: koji_build - trigger: commit - dist_git_branches: *stable_fedora - - - job: bodhi_update - trigger: commit - dist_git_branches: *stable_fedora diff --git a/README.packit b/README.packit index f592284..d401b46 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.91.0.post1.dev4+ge6fd4a25. +The file was generated using packit 0.94.0.post1.dev8+g4b1f9717. diff --git a/podman.spec b/podman.spec index 5abd65f..a6bb53b 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.9.3 +Version: 4.9.4 # 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 9f1c480..887353d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.9.3.tar.gz) = 395014bbe70923f1444d2f33440013a16e9c339b70be5e6a9c7026617a40795a1c0e410c08a52fba46b9f5e853d853ce4133db36167a3c5ace7d325f8b3a3327 +SHA512 (v4.9.4.tar.gz) = 7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 From d1d0cff67ed5dfc8a4f79329ff2791c67d997520 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 30 May 2024 15:09:45 +0000 Subject: [PATCH 22/22] Update to 4.9.5 upstream release Upstream tag: v4.9.5 Upstream commit: 1d51e914 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + README.packit | 2 +- podman.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 53d616d..b14dfc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1847,3 +1847,4 @@ /v4.9.2.tar.gz /v4.9.3.tar.gz /v4.9.4.tar.gz +/v4.9.5.tar.gz diff --git a/README.packit b/README.packit index d401b46..2fa216c 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.94.0.post1.dev8+g4b1f9717. +The file was generated using packit 0.97.1.post1.dev4+g1268842e. diff --git a/podman.spec b/podman.spec index a6bb53b..6b99fbe 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 5 # 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: 4.9.4 +Version: 4.9.5 # 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 887353d..ad17651 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v4.9.4.tar.gz) = 7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b +SHA512 (v4.9.5.tar.gz) = 979f855d453034bb053d2cad52dd6b9050ff1a534efebf2c8967dd38c7df9139a2b546caf3d20f76fe130189233ded5e6354e2e68b1ef7bae2617f35b0f4ad4d SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8