From 00650b0dda15e05f67a073356b3bc03c471df9cd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 29 2022 19:35:03 +0000 Subject: import podman-4.2.0-1.module+el8.7.0+16493+89f82ab8 --- diff --git a/.gitignore b/.gitignore index 67f3f6d..dbb29b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/dnsname-18822f9.tar.gz -SOURCES/podman-4.0.2-342c825.tar.gz +SOURCES/podman-4.2.0-7fe5a41.tar.gz SOURCES/podman-machine-cni-0749884.tar.gz -SOURCES/v0.1.0.tar.gz SOURCES/v0.1.7.tar.gz +SOURCES/v0.2.0.tar.gz diff --git a/.podman.metadata b/.podman.metadata index a7f1d4e..8ba6b3e 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,5 +1,5 @@ 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz -056e82ce8263115e4f87febd5d015c9b20a33a5c SOURCES/podman-4.0.2-342c825.tar.gz +3407e210353afdd5fcaffe91c6eeabb5d41c3c75 SOURCES/podman-4.2.0-7fe5a41.tar.gz 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz -d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz +64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 45f6b2e..666fc64 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -7,21 +7,21 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; %global import_path github.com/containers/podman -#%%global branch v4.0 -%global commit0 342c8259381b63296e96ad29519bd4b9c7afbf97 +#%%global branch v4.1.1-rhel +%global commit0 7fe5a419cfd2880df2028ad3d7fd9378a88a04f4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 #%%global dnsnamever 1.3.0 %global commit_dnsname 18822f9a4fb35d1349eb256f4cd2bfd372474d84 %global shortcommit_dnsname %(c=%{commit_dnsname}; echo ${c:0:7}) %global gvproxyrepo gvisor-tap-vsock -%global gvproxyver 0.1.0 +%global gvproxyver 0.2.0 %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) Epoch: 2 Name: podman -Version: 4.0.2 +Version: 4.2.0 Release: 1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ @@ -40,7 +40,7 @@ Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar ExclusiveArch: %{go_arches} Provides: %{name}-manpages = %{epoch}:%{version}-%{release} Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release} -BuildRequires: golang >= 1.16.6 +BuildRequires: golang >= 1.17.7 BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static @@ -63,12 +63,13 @@ BuildRequires: automake BuildRequires: file BuildRequires: gcc BuildRequires: libtool -Requires: containers-common >= 2:1-2 +Requires: containers-common >= 2:1-27 Requires: containernetworking-plugins >= 0.9.1-1 +Suggests: netavark Requires: iptables Requires: nftables Obsoletes: oci-systemd-hook < 1 -Requires: libseccomp >= 2.4.1 +Requires: libseccomp >= 2.5 Requires: conmon >= 2.0.25 Requires: (container-selinux if selinux-policy) Requires: slirp4netns >= 0.4.0-1 @@ -178,17 +179,34 @@ dynamic port forwarding. %autosetup -Sgit -n %{name}-%{commit0} %endif sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile +sed -i 's,-Werror,,' pkg/rootless/rootless_linux.go tar fx %{SOURCE1} +pushd catatonit-%{cataver} +sed -i '$d' configure.ac +popd tar fx %{SOURCE2} tar fx %{SOURCE3} tar fx %{SOURCE4} -mv pkg/hooks/README.md pkg/hooks/README-hooks.md - # this is shipped by skopeo: containers-common subpackage rm -rf docs/source/markdown/containers-mounts.conf.5.md %build +# build catatonit first because C code +pushd catatonit-%{cataver} +autoreconf -fi +%configure +CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +%{__make} %{?_smp_mflags} +# Make sure we *always* build a static binary for catatonit. Otherwise we'll break containers +# that don't have the necessary shared libs. +file catatonit | grep 'statically linked' +if [ $? != 0 ]; then + echo "ERROR: catatonit binary must be statically linked!" + exit 1 +fi +popd + export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd) CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" @@ -210,10 +228,11 @@ ln -s vendor src rm -rf vendor/github.com/containers/storage/drivers/register/register_btrfs.go +unset LDFLAGS # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" -# build rootlessport first +# build rootlessport %gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport export BUILDTAGS="seccomp btrfs_noversion exclude_graphdriver_devicemapper exclude_graphdriver_btrfs $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" @@ -225,22 +244,6 @@ export BUILDTAGS="remote $BUILDTAGS" %{__make} docs -# build catatonit -LDFLAGS="%__global_ldflags" -CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -pushd catatonit-%{cataver} -autoreconf -fi -%configure -%{__make} %{?_smp_mflags} -# Make sure we *always* build a static binary for catatonit. Otherwise we'll break containers -# that don't have the necessary shared libs. -file catatonit | grep 'statically linked' -if [ $? != 0 ]; then - echo "ERROR: catatonit binary must be statically linked!" - exit 1 -fi -popd - # build dnsname plugin unset LDFLAGS pushd dnsname-%{commit_dnsname} @@ -344,12 +347,21 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_bindir}/%{name} system renumber exit 0 +%preun +if [ $1 == 0 ]; then + systemctl stop podman.service > /dev/null 2>&1 || : + systemctl stop podman.socket > /dev/null 2>&1 || : + systemctl disable podman.service > /dev/null 2>&1 || : + systemctl disable podman.socket > /dev/null 2>&1 || : +fi +: + #define license tag if not already defined %{!?_licensedir:%global license %doc} %files -f podman.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md +%doc README.md CONTRIBUTING.md install.md transfer.md %{_bindir}/%{name} %{_libexecdir}/%{name}/rootlessport %{_datadir}/bash-completion/completions/%{name} @@ -409,6 +421,67 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Thu Aug 11 2022 Jindrich Novy - 2:4.2.0-1 +- update to https://github.com/containers/podman/releases/tag/v4.2.0 + (https://github.com/containers/podman/commit/7fe5a419cfd2880df2028ad3d7fd9378a88a04f4) +- Related: #2061390 + +* Fri Aug 05 2022 Lokesh Mandvekar - 2:4.2.0-0.2rc3 +- update to 4.2.0-rc3 +- Related: #2061390 + +* Mon Aug 01 2022 Jindrich Novy - 2:4.2.0-0.1rc2 +- update to 4.2.0-rc2 +- Related: #2061390 + +* Fri Jul 08 2022 Jindrich Novy - 2:4.1.1-6 +- update to the latest content of https://github.com/containers/podman/tree/v4.1.1-rhel + (https://github.com/containers/podman/commit/fa692a6) +- Related: #2061390 + +* Fri Jul 01 2022 Jindrich Novy - 2:4.1.1-5 +- don't allow systemd commands to fail the transaction +- Related: #2061390 + +* Thu Jun 30 2022 Jindrich Novy - 2:4.1.1-4 +- stopping service/socket might execute podman command too - move to preun +- Related: #2061390 + +* Thu Jun 30 2022 Jindrich Novy - 2:4.1.1-3 +- be sure podman socket is stopped only in case of package removal +- Related: #2061390 + +* Thu Jun 30 2022 Jindrich Novy - 2:4.1.1-2 +- be sure podman socket is closed after podman package is removed +- Related: #2061390 + +* Wed Jun 15 2022 Jindrich Novy - 2:4.1.1-1 +- update to https://github.com/containers/podman/releases/tag/v4.1.1 +- Related: #2061390 + +* Wed May 18 2022 Jindrich Novy - 2:4.1.0-3 +- Require CNI and make netavark optional +- Related: #2061390 + +* Wed May 11 2022 Jindrich Novy - 2:4.1.0-2 +- update gvisor-tap-vsock to 0.2.0 to fix compilation with golang 1.18 +- Related: #2061390 + +* Mon May 09 2022 Jindrich Novy - 2:4.1.0-1 +- update to https://github.com/containers/podman/releases/tag/v4.1.0 +- Related: #2061390 + +* Fri Apr 08 2022 Jindrich Novy - 2:4.0.3-2 +- Related: #2061390 + +* Fri Apr 01 2022 Jindrich Novy - 2:4.0.3-1 +- update to https://github.com/containers/podman/releases/tag/v4.0.3 +- Related: #2061390 + +* Fri Mar 18 2022 Jindrich Novy - 2:4.0.2-2 +- bump minimal libseccomp version requirement +- Related: #2061390 + * Mon Mar 07 2022 Jindrich Novy - 2:4.0.2-1 - update to https://github.com/containers/podman/releases/tag/v4.0.2 - Related: #2061390