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/libpod/
Date: Thu, 02 Apr 2020 00:49:07
Message-Id: 1585788534.3570cf1696f95f5c3d1ee30822f6361657cd369d.zmedico@gentoo
1 commit: 3570cf1696f95f5c3d1ee30822f6361657cd369d
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 2 00:45:51 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 2 00:48:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3570cf16
7
8 app-emulation/libpod: Bump to version 1.8.2
9
10 Closes: https://bugs.gentoo.org/715006
11 Package-Manager: Portage-2.3.96, Repoman-2.3.22
12 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
13
14 app-emulation/libpod/Manifest | 1 +
15 app-emulation/libpod/libpod-1.8.2.ebuild | 141 +++++++++++++++++++++++++++++++
16 2 files changed, 142 insertions(+)
17
18 diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
19 index 504fd208dbf..a3ff0453b37 100644
20 --- a/app-emulation/libpod/Manifest
21 +++ b/app-emulation/libpod/Manifest
22 @@ -2,3 +2,4 @@ DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25
23 DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
24 DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe
25 DIST libpod-1.8.0.tar.gz 8992983 BLAKE2B a3b12dbfbdb0fe01ef8791de2c938cbf21c01ac0b36314d2a170c593d22eea08d912f8547861b239bb982db6acc9d2426adb97ffda4603739321cff0fb9ff1d8 SHA512 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87
26 +DIST libpod-1.8.2.tar.gz 30065262 BLAKE2B 1bf4ca9b9547a710f1882ac40aee0cf295fecdb9d43dc6fa30633331ca9e19d15e6d671075627939167cdf100d30e8299e50bd51425226ff1994778782cf261b SHA512 c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366
27
28 diff --git a/app-emulation/libpod/libpod-1.8.2.ebuild b/app-emulation/libpod/libpod-1.8.2.ebuild
29 new file mode 100644
30 index 00000000000..e4ba0c46114
31 --- /dev/null
32 +++ b/app-emulation/libpod/libpod-1.8.2.ebuild
33 @@ -0,0 +1,141 @@
34 +# Copyright 1999-2020 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=7
38 +
39 +EGIT_COMMIT="028e3317eb1494b9b2acba4a0a295df80fae66cc"
40 +
41 +inherit bash-completion-r1 flag-o-matic go-module
42 +
43 +DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
44 +HOMEPAGE="https://github.com/containers/libpod/"
45 +SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${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"
50 +IUSE="apparmor btrfs +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
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 +
73 +src_prepare() {
74 + default
75 +
76 + # Disable installation of python modules here, since those are
77 + # installed by separate ebuilds.
78 + local makefile_sed_args=(
79 + -e '/^GIT_.*/d'
80 + -e 's/$(GO) build/$(GO) build -v -work -x/'
81 + -e 's/^\(install:.*\) install\.python$/\1/'
82 + )
83 +
84 + has_version -b '>=dev-lang/go-1.14' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
85 +
86 + sed "${makefile_sed_args[@]}" -i Makefile || die
87 +
88 + sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
89 + -i hack/get_release_info.sh || die
90 +}
91 +
92 +src_compile() {
93 + # Filter unsupported linker flags
94 + filter-flags '-Wl,*'
95 +
96 + [[ -f hack/apparmor_tag.sh ]] || die
97 + if use apparmor; then
98 + echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
99 + else
100 + echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
101 + fi
102 +
103 + [[ -f hack/btrfs_installed_tag.sh ]] || die
104 + if use btrfs; then
105 + echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
106 + else
107 + echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
108 + hack/btrfs_installed_tag.sh || die
109 + fi
110 +
111 + [[ -f hack/selinux_tag.sh ]] || die
112 + if use selinux; then
113 + echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
114 + else
115 + echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
116 + fi
117 +
118 + export -n GOCACHE GOPATH XDG_CACHE_HOME
119 + GOBIN="${S}/bin" \
120 + emake all \
121 + GIT_BRANCH=master \
122 + GIT_BRANCH_CLEAN=master \
123 + COMMIT_NO="${EGIT_COMMIT}" \
124 + GIT_COMMIT="${EGIT_COMMIT}"
125 +}
126 +
127 +src_install() {
128 + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
129 +
130 + insinto /etc/containers
131 + newins test/registries.conf registries.conf.example
132 + newins test/policy.json policy.json.example
133 +
134 + insinto /usr/share/containers
135 + doins seccomp.json
136 +
137 + newinitd "${FILESDIR}"/podman.initd podman
138 +
139 + insinto /etc/logrotate.d
140 + newins "${FILESDIR}/podman.logrotated" podman
141 +
142 + dobashcomp completions/bash/*
143 +
144 + keepdir /var/lib/containers
145 +}
146 +
147 +pkg_preinst() {
148 + LIBPOD_ROOTLESS_UPGRADE=false
149 + if use rootless; then
150 + has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
151 + fi
152 +}
153 +
154 +pkg_postinst() {
155 + local want_newline=false
156 + if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
157 + elog "You need to create the following config files:"
158 + elog "/etc/containers/registries.conf"
159 + elog "/etc/containers/policy.json"
160 + elog "To copy over default examples, use:"
161 + elog "cp /etc/containers/registries.conf{.example,}"
162 + elog "cp /etc/containers/policy.json{.example,}"
163 + want_newline=true
164 + fi
165 + if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
166 + ${want_newline} && elog ""
167 + elog "For rootless operation, you need to configure subuid/subgid"
168 + elog "for user running podman. In case subuid/subgid has only been"
169 + elog "configured for root, run:"
170 + elog "usermod --add-subuids 1065536-1131071 <user>"
171 + elog "usermod --add-subgids 1065536-1131071 <user>"
172 + want_newline=true
173 + fi
174 +}