From 7b3ab712c0339dd8636bce6dd6c349c774ef1c8b Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 4 Feb 2022 08:10:23 +0100 Subject: [PATCH] podman-4.0.0-0.1.el9 - update to the latest content of https://github.com/containers/podman/tree/v4.0 (https://github.com/containers/podman/commit/337f706) - Related: #2000051 Signed-off-by: Jindrich Novy --- podman.spec | 67 ++++++++++++++++++++++++++++++++--------------------- sources | 4 ++-- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/podman.spec b/podman.spec index b1eb8e7..d1bc215 100644 --- a/podman.spec +++ b/podman.spec @@ -6,21 +6,17 @@ %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 -%if 0%{?rhel} > 7 && ! 0%{?fedora} %define gobuild(o:) \ -go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**}; -%else -%if ! 0%{?gobuild:1} -%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**}; -%endif -%endif +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 v3.4 -%global commit0 a54320a793c156e13d6880f7e898ac8232623a60 +%global branch v4.0 +%global commit0 337f706f6118f2c91e9906afcdaa233f7cfdbaf9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.7 -%global dnsnamever 1.3.0 +#%%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 commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 @@ -28,8 +24,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 2 Name: podman -Version: 3.4.5 -Release: 0.8%{?dist} +Version: 4.0.0 +Release: 0.1%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -39,7 +35,8 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz %endif Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz -Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz +#Source2: https://github.com/containers/dnsname/archive/v%%{dnsnamever}.tar.gz +Source2: https://github.com/containers/dnsname/archive/%{commit_dnsname}/dnsname-%{shortcommit_dnsname}.tar.gz Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz Source4: https://github.com/containers/%{gvproxyrepo}/archive/v%{gvproxyver}.tar.gz # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures @@ -51,7 +48,7 @@ BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git-core -BuildRequires: go-md2man +BuildRequires: /usr/bin/go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel @@ -182,6 +179,7 @@ dynamic port forwarding. %else %autosetup -Sgit -n %{name}-%{commit0} %endif +sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile tar fx %{SOURCE1} tar fx %{SOURCE2} tar fx %{SOURCE3} @@ -194,8 +192,16 @@ rm -rf docs/source/markdown/containers-mounts.conf.5.md %build export GO111MODULE=off -export GOPATH=$(pwd):$(pwd)/_build -export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +export GOPATH=$(pwd)/_build:$(pwd) +export CGO_CFLAGS=$CFLAGS +# These extra flags present in $CFLAGS have been skipped for now as they break the build +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-flto=auto//g') +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-Wp,D_GLIBCXX_ASSERTIONS//g') +CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g') + +%ifarch x86_64 +export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" +%endif mkdir _build pushd _build @@ -206,9 +212,13 @@ ln -s vendor src rm -rf vendor/github.com/containers/storage/drivers/register/register_btrfs.go -export BUILDTAGS="systemd selinux seccomp btrfs_noversion exclude_graphdriver_devicemapper $(hack/libdm_tag.sh) $(hack/libsubid_tag.sh)" # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" + +# build rootlessport first +%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)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} # build %%{name}-remote @@ -235,7 +245,7 @@ popd # build dnsname plugin unset LDFLAGS -pushd dnsname-%{dnsnamever} +pushd dnsname-%{commit_dnsname} mkdir _build pushd _build mkdir -p src/github.com/containers @@ -271,11 +281,10 @@ export GOPATH=$(pwd)/_build:$(pwd) popd %install -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \ - ETCDIR=%{buildroot}%{_sysconfdir} \ - install.bin-nobuild \ - install.remote-nobuild \ - install.man-nobuild \ +PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ + install.bin \ + install.remote \ + install.man \ install.systemd \ install.completions \ install.docker @@ -300,7 +309,7 @@ install -p catatonit-%{cataver}/COPYING %{buildroot}%{_datadir}/licenses/podman- ln -s %{_libexecdir}/catatonit/catatonit %{buildroot}%{_libexecdir}/podman/catatonit # install dnsname plugin -pushd dnsname-%{dnsnamever} +pushd dnsname-%{commit_dnsname} %{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install popd @@ -346,6 +355,7 @@ exit 0 %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md %{_bindir}/%{name} +%{_libexecdir}/%{name}/rootlessport %{_datadir}/bash-completion/completions/%{name} # By "owning" the site-functions dir, we don't need to Require zsh %dir %{_datadir}/zsh/site-functions @@ -387,8 +397,8 @@ exit 0 %{_libexecdir}/podman/catatonit %files plugins -%license dnsname-%{dnsnamever}/LICENSE -%doc dnsname-%{dnsnamever}/{README.md,README_PODMAN.md} +%license dnsname-%{commit_dnsname}/LICENSE +%doc dnsname-%{commit_dnsname}/{README.md,README_PODMAN.md} %{_libexecdir}/cni/dnsname %{_libexecdir}/cni/%{name}-machine @@ -403,6 +413,11 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Fri Feb 04 2022 Jindrich Novy - 2:4.0.0-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v4.0 + (https://github.com/containers/podman/commit/337f706) +- Related: #2000051 + * Thu Jan 27 2022 Jindrich Novy - 2:3.4.5-0.8 - update to the latest content of https://github.com/containers/podman/tree/v3.4 (https://github.com/containers/podman/commit/a54320a) diff --git a/sources b/sources index 181ad5f..0d06e9a 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (v0.1.0.tar.gz) = 72d27e2a7c20f956a177bcda96508c1ec7b8ac0a512f9ab1a045bcf2450c8c13e6b37033053dc68af986194c9381d1be9d065fbdfbbffe8634ea525924a35ebc -SHA512 (v1.3.0.tar.gz) = df48c4715582f098c41d45533163632ac1953621ce91fc78e88cc84e61d8a0a537e6da5aabab2be18cbddccd8e4c867670ae1fbc5ff7b6473bf7f4b464cb6ee2 SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4 +SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67 -SHA512 (v3.4-a54320a.tar.gz) = a85dbd5c8cecf0b401eff373ec49ec4698468ba6a4edd99c37a7c86db1526be8c03d21266ca4a9412d13a24123f886c5b54a1dd81a28c12902135d956a2dc88a +SHA512 (v4.0-337f706.tar.gz) = 0786e1b57f207fe8edd33dc07fba8c738409beecb6ea9fff7ffad79f72d52a674695967b20ddcfa576c9502423b72f2acae6fa8b14f911ed8c49f37335a5a3a1