Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/podman/
Date: Wed, 08 Dec 2021 04:11:49
Message-Id: 1638936142.0b698c783002bbe170b7918de1b4b25b77dedd06.zmedico@gentoo
1 commit: 0b698c783002bbe170b7918de1b4b25b77dedd06
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 8 04:02:22 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 8 04:02:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b698c78
7
8 app-emulation/podman: Bump to version 3.4.3
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/podman/Manifest | 1 +
14 app-emulation/podman/podman-3.4.3.ebuild | 164 +++++++++++++++++++++++++++++++
15 2 files changed, 165 insertions(+)
16
17 diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest
18 index b9e4624bfd2d..a34f08efc379 100644
19 --- a/app-emulation/podman/Manifest
20 +++ b/app-emulation/podman/Manifest
21 @@ -2,3 +2,4 @@ DIST podman-3.3.1.tar.gz 10917305 BLAKE2B fe7856c2ad8893e40ec42fb242a088794ea189
22 DIST podman-3.4.0.tar.gz 10950594 BLAKE2B 4a96b9be980f336bc7cfa6efa0f955da90b67e1ff3e45c34097b9eb4fcd611b3454860048410238aeb1063331b246e9c156f738813e7f585d2254a1568d20642 SHA512 195354b15beaaed19b4d5f71f5dbfcd1ebfc5c80c07db91043b76e3254d62b5fd001c52c536773656e5eba65954511c1639a50b955a9992fa4d18a55e573c2a1
23 DIST podman-3.4.1.tar.gz 10953738 BLAKE2B 423aaecabce5242ae87887e36e9caaf499b3d5c18978e47b738ef3b6a0a094c64f18f5fef614193157c3de0a6c0d88a232efcdcb60de4ae8ab14abbe266ad512 SHA512 b8602464358ab73429a9003262c92c38c9a06e1133c776fd0c4ce65dae26639db66f8f5ad510528f3e6e7bc2fe692746fcf1d90d4e95d701d102006d9a83b27e
24 DIST podman-3.4.2.tar.gz 10959727 BLAKE2B 6c5ead8f4dc6e79edeb16e72fb906c6aa77f84b53bdd2435f100f923f7cb708c68898d3a1837db2c154700730adcedfb9769b996b5f602954f8388fda09c3650 SHA512 849a4d5897de7dae5d6ac71fab11449f7a814e6414a0f463846ddd3817cd91c5f12e288bd44e64cc5bdf5f6073d52dfbf77aba5cbc1fec6ac12a7b222d2a21a2
25 +DIST podman-3.4.3.tar.gz 10945852 BLAKE2B cb2076be27900b2ce4d781fa94592503d3b0421535e225e0166477aede4892b7f2b428a4f466daa6c85f3c479f8f197194d2b827afe5dd1b3b7c3e9c7829f800 SHA512 c3eed482ac78a70f9babb39798a2925f29d0452f5e66f2e46f8eb9bb8aeeb4cd8392a9d961a9a37fc5aa3bccad8fb6754db65191b80f3ad882d72a329722994f
26
27 diff --git a/app-emulation/podman/podman-3.4.3.ebuild b/app-emulation/podman/podman-3.4.3.ebuild
28 new file mode 100644
29 index 000000000000..f81d6968c3fe
30 --- /dev/null
31 +++ b/app-emulation/podman/podman-3.4.3.ebuild
32 @@ -0,0 +1,164 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +EGIT_COMMIT="3450a60d2196cc0bee8a3fc28a7c93a7370d4515"
38 +
39 +inherit bash-completion-r1 flag-o-matic go-module tmpfiles
40 +
41 +DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
42 +HOMEPAGE="https://github.com/containers/podman/"
43 +MY_PN=podman
44 +MY_P=${MY_PN}-${PV}
45 +SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
46 +LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
47 +SLOT="0"
48 +
49 +KEYWORDS="~amd64 ~arm64 ~ppc64"
50 +IUSE="apparmor btrfs +fuse +rootless selinux"
51 +RESTRICT+=" test"
52 +
53 +COMMON_DEPEND="
54 + app-crypt/gpgme:=
55 + >=app-emulation/conmon-2.0.0
56 + || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
57 + dev-libs/libassuan:=
58 + dev-libs/libgpg-error:=
59 + >=net-misc/cni-plugins-0.8.6
60 + sys-fs/lvm2
61 + sys-libs/libseccomp:=
62 +
63 + apparmor? ( sys-libs/libapparmor )
64 + btrfs? ( sys-fs/btrfs-progs )
65 + rootless? ( app-emulation/slirp4netns )
66 + selinux? ( sys-libs/libselinux:= )
67 +"
68 +DEPEND="
69 + ${COMMON_DEPEND}
70 + dev-go/go-md2man"
71 +RDEPEND="${COMMON_DEPEND}
72 + fuse? ( sys-fs/fuse-overlayfs )"
73 +
74 +S=${WORKDIR}/${MY_P}
75 +
76 +src_prepare() {
77 + default
78 +
79 + # Disable installation of python modules here, since those are
80 + # installed by separate ebuilds.
81 + local makefile_sed_args=(
82 + -e '/^GIT_.*/d'
83 + -e 's/$(GO) build/$(GO) build -v -work -x/'
84 + -e 's/^\(install:.*\) install\.python$/\1/'
85 + -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
86 + )
87 +
88 + has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
89 +
90 + sed "${makefile_sed_args[@]}" -i Makefile || die
91 +
92 + sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
93 + -i hack/get_release_info.sh || die
94 +}
95 +
96 +src_compile() {
97 + local git_commiT=${EGIT_COMMIT}
98 +
99 + # Filter unsupported linker flags
100 + filter-flags '-Wl,*'
101 +
102 + [[ -f hack/apparmor_tag.sh ]] || die
103 + if use apparmor; then
104 + echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
105 + else
106 + echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
107 + fi
108 +
109 + [[ -f hack/btrfs_installed_tag.sh ]] || die
110 + if use btrfs; then
111 + echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
112 + else
113 + echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
114 + hack/btrfs_installed_tag.sh || die
115 + fi
116 +
117 + [[ -f hack/selinux_tag.sh ]] || die
118 + if use selinux; then
119 + echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
120 + else
121 + echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
122 + fi
123 +
124 + # Avoid this error when generating pkg/varlink/iopodman.go:
125 + # cannot find package "github.com/varlink/go/varlink/idl"
126 + mkdir -p _output || die
127 + ln -snf ../vendor _output/src || die
128 + GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
129 + rm _output/src || die
130 +
131 + export -n GOCACHE GOPATH XDG_CACHE_HOME
132 + GOBIN="${S}/bin" \
133 + emake all \
134 + GIT_BRANCH=master \
135 + GIT_BRANCH_CLEAN=master \
136 + COMMIT_NO="${git_commit}" \
137 + GIT_COMMIT="${git_commit}"
138 +}
139 +
140 +src_install() {
141 + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
142 +
143 + insinto /etc/containers
144 + newins test/registries.conf registries.conf.example
145 + newins test/policy.json policy.json.example
146 +
147 + insinto /usr/share/containers
148 + doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
149 +
150 + newconfd "${FILESDIR}"/podman.confd podman
151 + newinitd "${FILESDIR}"/podman.initd podman
152 +
153 + insinto /etc/logrotate.d
154 + newins "${FILESDIR}/podman.logrotated" podman
155 +
156 + dobashcomp completions/bash/*
157 +
158 + insinto /usr/share/zsh/site-functions
159 + doins completions/zsh/*
160 +
161 + insinto /usr/share/fish/vendor_completions.d
162 + doins completions/fish/*
163 +
164 + keepdir /var/lib/containers
165 +}
166 +
167 +pkg_preinst() {
168 + PODMAN_ROOTLESS_UPGRADE=false
169 + if use rootless; then
170 + has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
171 + fi
172 +}
173 +
174 +pkg_postinst() {
175 + tmpfiles_process podman.conf
176 +
177 + local want_newline=false
178 + if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
179 + elog "You need to create the following config files:"
180 + elog "/etc/containers/registries.conf"
181 + elog "/etc/containers/policy.json"
182 + elog "To copy over default examples, use:"
183 + elog "cp /etc/containers/registries.conf{.example,}"
184 + elog "cp /etc/containers/policy.json{.example,}"
185 + want_newline=true
186 + fi
187 + if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
188 + ${want_newline} && elog ""
189 + elog "For rootless operation, you need to configure subuid/subgid"
190 + elog "for user running podman. In case subuid/subgid has only been"
191 + elog "configured for root, run:"
192 + elog "usermod --add-subuids 1065536-1131071 <user>"
193 + elog "usermod --add-subgids 1065536-1131071 <user>"
194 + want_newline=true
195 + fi
196 +}