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