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: Fri, 26 Feb 2021 00:27:15
Message-Id: 1614299211.d9f0cfadb9f345905a350a9389c1f0034ff22754.zmedico@gentoo
1 commit: d9f0cfadb9f345905a350a9389c1f0034ff22754
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 26 00:26:27 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 26 00:26:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f0cfad
7
8 app-emulation/podman: Remove vulnerable version 2.2.1
9
10 Bug: https://bugs.gentoo.org/768597
11 Package-Manager: Portage-3.0.15, Repoman-3.0.2
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 app-emulation/podman/Manifest | 1 -
15 app-emulation/podman/podman-2.2.1.ebuild | 161 -------------------------------
16 2 files changed, 162 deletions(-)
17
18 diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest
19 index 0bcd773bc36..f8087bc702c 100644
20 --- a/app-emulation/podman/Manifest
21 +++ b/app-emulation/podman/Manifest
22 @@ -1,2 +1 @@
23 -DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367
24 DIST podman-3.0.1.tar.gz 10365348 BLAKE2B 93a227bf1395145ebaec8e18aa8ad8101704e8e0f7344c8850ee9e1532b191aef96b1cbbba2e21bd716591d68969cfd16ee811621a383cb2d31e4105a44834bf SHA512 4addc986ad94b512d90b675a5a1988eeef365fff02c3449fd310582245a91d4ee96ff9fd3c56ce333a972dca627aa28fbd468a4a363c5c8963524bb67bc26754
25
26 diff --git a/app-emulation/podman/podman-2.2.1.ebuild b/app-emulation/podman/podman-2.2.1.ebuild
27 deleted file mode 100644
28 index 32c38f9a790..00000000000
29 --- a/app-emulation/podman/podman-2.2.1.ebuild
30 +++ /dev/null
31 @@ -1,161 +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 -
37 -EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd"
38 -
39 -inherit bash-completion-r1 flag-o-matic go-module
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"
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 - # Filter unsupported linker flags
98 - filter-flags '-Wl,*'
99 -
100 - [[ -f hack/apparmor_tag.sh ]] || die
101 - if use apparmor; then
102 - echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
103 - else
104 - echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
105 - fi
106 -
107 - [[ -f hack/btrfs_installed_tag.sh ]] || die
108 - if use btrfs; then
109 - echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
110 - else
111 - echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
112 - hack/btrfs_installed_tag.sh || die
113 - fi
114 -
115 - [[ -f hack/selinux_tag.sh ]] || die
116 - if use selinux; then
117 - echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
118 - else
119 - echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
120 - fi
121 -
122 - # Avoid this error when generating pkg/varlink/iopodman.go:
123 - # cannot find package "github.com/varlink/go/varlink/idl"
124 - mkdir -p _output || die
125 - ln -snf ../vendor _output/src || die
126 - GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
127 - rm _output/src || die
128 -
129 - export -n GOCACHE GOPATH XDG_CACHE_HOME
130 - GOBIN="${S}/bin" \
131 - emake all \
132 - GIT_BRANCH=master \
133 - GIT_BRANCH_CLEAN=master \
134 - COMMIT_NO="${EGIT_COMMIT}" \
135 - GIT_COMMIT="${EGIT_COMMIT}"
136 -}
137 -
138 -src_install() {
139 - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
140 -
141 - insinto /etc/containers
142 - newins test/registries.conf registries.conf.example
143 - newins test/policy.json policy.json.example
144 -
145 - insinto /usr/share/containers
146 - doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
147 -
148 - newconfd "${FILESDIR}"/podman.confd podman
149 - newinitd "${FILESDIR}"/podman.initd podman
150 -
151 - insinto /etc/logrotate.d
152 - newins "${FILESDIR}/podman.logrotated" podman
153 -
154 - dobashcomp completions/bash/*
155 -
156 - insinto /usr/share/zsh/site-functions
157 - doins completions/zsh/*
158 -
159 - insinto /usr/share/fish/vendor_completions.d
160 - doins completions/fish/*
161 -
162 - keepdir /var/lib/containers
163 -}
164 -
165 -pkg_preinst() {
166 - PODMAN_ROOTLESS_UPGRADE=false
167 - if use rootless; then
168 - has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
169 - fi
170 -}
171 -
172 -pkg_postinst() {
173 - local want_newline=false
174 - if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
175 - elog "You need to create the following config files:"
176 - elog "/etc/containers/registries.conf"
177 - elog "/etc/containers/policy.json"
178 - elog "To copy over default examples, use:"
179 - elog "cp /etc/containers/registries.conf{.example,}"
180 - elog "cp /etc/containers/policy.json{.example,}"
181 - want_newline=true
182 - fi
183 - if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
184 - ${want_newline} && elog ""
185 - elog "For rootless operation, you need to configure subuid/subgid"
186 - elog "for user running podman. In case subuid/subgid has only been"
187 - elog "configured for root, run:"
188 - elog "usermod --add-subuids 1065536-1131071 <user>"
189 - elog "usermod --add-subgids 1065536-1131071 <user>"
190 - want_newline=true
191 - fi
192 -}