diff --git a/podman.spec b/podman.spec index 2d9ca00..312a08d 100644 --- a/podman.spec +++ b/podman.spec @@ -1,8 +1,8 @@ -%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/generic-hardened-ld '" -a -v -x %{?**}; +%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/generic-hardened-ld '" -a -v -x %{?**}; Name: podman Version: 4.5.1 -Release: 1 +Release: 2 Summary: A daemonless container engine for managing Containers Epoch: 1 License: Apache-2.0 and MIT @@ -10,7 +10,7 @@ URL: https://podman.io/ Source0: https://github.com/containers/podman/archive/refs/tags/v4.5.1.tar.gz Source1: https://github.com/containers/dnsname/archive/18822f9a4fb35d1349eb256f4cd2bfd372474d84/dnsname-18822f9.tar.gz Source2: https://github.com/containers/podman-machine-cni/archive/0749884b8d1a455c68da30789e37811ec0809d51/podman-machine-cni-0749884.tar.gz -Source3: https://github.com/containers/gvisor-tap-vsock/archive/refs/tags/v0.6.2.tar.gz +Source3: https://github.com/containers/gvisor-tap-vsock/archive/refs/tags/v0.7.1.tar.gz Source4: https://github.com/cpuguy83/go-md2man/archive/refs/tags/v2.0.2.tar.gz BuildRequires: gcc golang btrfs-progs-devel glib2-devel glibc-devel glibc-static @@ -246,6 +246,7 @@ mkdir -p src/github.com/containers ln -s ../../../../ src/github.com/containers/dnsname popd ln -s vendor src +export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/dnsname github.com/containers/dnsname/plugins/meta/dnsname popd @@ -257,20 +258,17 @@ mkdir -p src/github.com/containers ln -s ../../../../ src/github.com/containers/podman-machine-cni popd ln -s vendor src +export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/%{name}-machine github.com/containers/podman-machine-cni/plugins/meta/%{name}-machine popd -pushd gvisor-tap-vsock-0.6.2 -mkdir _build -pushd _build -mkdir -p src/github.com/containers -ln -s ../../../../ src/github.com/containers/gvisor-tap-vsock -popd -ln -s vendor src +pushd gvisor-tap-vsock-0.7.1 +export GO111MODULE=on +export GOFLAGS=-mod=vendor export GOPATH=$(pwd)/_build:$(pwd) -%gobuild -o bin/gvproxy github.com/containers/gvisor-tap-vsock/cmd/gvproxy -%gobuild -o bin/gvforwarder github.com/containers/gvisor-tap-vsock/cmd/vm +%gobuild -o bin/gvproxy ./cmd/gvproxy +%gobuild -o bin/gvforwarder ./cmd/vm popd make docs docker-docs @@ -300,7 +298,7 @@ pushd podman-machine-cni-0749884b8d1a455c68da30789e37811ec0809d51 popd # install gvproxy -pushd gvisor-tap-vsock-0.6.2 +pushd gvisor-tap-vsock-0.7.1 install -dp %{buildroot}%{_libexecdir}/%{name} install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/%{name} @@ -368,13 +366,16 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{_libexecdir}/cni/podman-machine %files gvproxy -%license gvisor-tap-vsock-0.6.2/LICENSE -%doc gvisor-tap-vsock-0.6.2/README.md +%license gvisor-tap-vsock-0.7.1/LICENSE +%doc gvisor-tap-vsock-0.7.1/README.md %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/gvproxy %{_libexecdir}/%{name}/gvforwarder %changelog +* Mon Feb 19 2024 lijian 1:4.5.1-2 +- Resolve compilation failure with issue I9248E + * Fri Jun 30 2023 lijian 1:4.5.1-1 - update to 4.5.1 diff --git a/v0.6.2.tar.gz b/v0.6.2.tar.gz deleted file mode 100644 index d75a639..0000000 Binary files a/v0.6.2.tar.gz and /dev/null differ diff --git a/v0.7.1.tar.gz b/v0.7.1.tar.gz new file mode 100644 index 0000000..71160cf Binary files /dev/null and b/v0.7.1.tar.gz differ