diff --git a/.gitignore b/.gitignore index e543672..b3ba3c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1835,3 +1835,4 @@ /v4.6.1.tar.gz /v4.6.2.tar.gz /v4.7.0-rc1.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 fb21255..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} && 0%{?fedora} <= 37 -%define gvproxy_subpackage 1 -%endif - %global container_base_path github.com/containers %global container_base_url https://%{container_base_path} @@ -57,11 +47,6 @@ %global commit_plugins 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global import_path_plugins %{container_base_path}/%{repo_plugins} -# gvproxy -%global repo_gvproxy gvisor-tap-vsock -%global git_gvproxy %{container_base_url}/%{repo_gvproxy} -%global commit_gvproxy 407efb5dcdb0f4445935f7360535800b60447544 - Name: podman %if %{defined copr_username} Epoch: 102 @@ -74,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~rc1 +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 @@ -86,9 +71,8 @@ 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/v4.7.0-rc1.tar.gz +Source0: %{git0}/archive/v%{version}.tar.gz Source1: %{git_plugins}/archive/%{commit_plugins}/%{repo_plugins}-%{commit_plugins}.tar.gz -Source2: %{git_gvproxy}/archive/%{commit_gvproxy}/%{repo_gvproxy}-%{commit_gvproxy}.tar.gz Provides: %{name}-manpages = %{epoch}:%{version}-%{release} BuildRequires: %{_bindir}/envsubst %if %{defined build_with_btrfs} @@ -121,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} @@ -196,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 @@ -210,17 +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. -%endif - %package -n %{name}sh Summary: Confined login and user shell using %{name} Requires: %{name} = %{epoch}:%{version}-%{release} @@ -235,17 +200,12 @@ 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}-4.7.0-rc1 +%autosetup -Sgit -n %{name}-%{version} 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 @@ -281,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 @@ -328,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 @@ -397,15 +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 -%{_libexecdir}/%{name}/gvforwarder -%endif - %files -n %{name}sh %{_bindir}/%{name}sh diff --git a/sources b/sources index e63fc86..921e188 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ +SHA512 (v4.7.0.tar.gz) = 4cab8698a819cd42de4cb588978c94c91b0c85693db2476aa6d20d7f4e4a7674d417703f70bdbb5a0e94b678fd585ae03a95ff0e5b7eb2682d9f400b92915742 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 -SHA512 (v4.7.0-rc1.tar.gz) = 3a69210db0bc074627818d7990506a361402fbdd70c312464dd351f9664eaea91190fe438cc194cd1f572afbcbba4cf4a187b688c724c1784a01165d8bdaf56c -SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c