From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- app-emulation/libpod/Manifest | 4 +- app-emulation/libpod/libpod-1.8.0.ebuild | 14 +-- app-emulation/libpod/libpod-1.8.2.ebuild | 141 +++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 6 deletions(-) create mode 100644 app-emulation/libpod/libpod-1.8.2.ebuild (limited to 'app-emulation/libpod') diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest index fb25482a02de..ba39dc97ea51 100644 --- a/app-emulation/libpod/Manifest +++ b/app-emulation/libpod/Manifest @@ -4,7 +4,9 @@ DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25 DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194 DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe DIST libpod-1.8.0.tar.gz 8992983 BLAKE2B a3b12dbfbdb0fe01ef8791de2c938cbf21c01ac0b36314d2a170c593d22eea08d912f8547861b239bb982db6acc9d2426adb97ffda4603739321cff0fb9ff1d8 SHA512 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87 +DIST libpod-1.8.2.tar.gz 30065262 BLAKE2B 1bf4ca9b9547a710f1882ac40aee0cf295fecdb9d43dc6fa30633331ca9e19d15e6d671075627939167cdf100d30e8299e50bd51425226ff1994778782cf261b SHA512 c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366 EBUILD libpod-1.6.4.ebuild 4073 BLAKE2B f0b50d64b5df8ecd7079d744fc26fab7c236d30b50a2ee855db64171ef112d95aa86a9defd71bf4d0ab348b59301e7814543d40ba5bf80a6ea012121a332697c SHA512 c4c99e465743ca0f97351e691edf91c535a734b4e9ac499724904341352dbffb9f5f5772df61bab87ac47bc45e9ff5a72d79eebf4de34c3046a9d458a75a146f EBUILD libpod-1.7.0.ebuild 3740 BLAKE2B 3de42be1182622ed7b050bd15b442b791f2b4ad53472276d46b5cf730d0d179f35c13b621ea210c3395480e7a4353ff93a9749ed13b957e14cbfb7ae20bd456c SHA512 3799b940413f1c02df27133dd93289dd8d9776c84838292dafbd424ffc8fa25ace3f440fb06e579f1d0d11f33d868af643a15cbf96f61e9ff726794f24e28bdc -EBUILD libpod-1.8.0.ebuild 3740 BLAKE2B a14d6f736f790cdcc3d2235e447c10f62a072c958d77381a487aa26486830bf5e7dff558ebceff9697c5add3bbc383dfe905baf1e4f0dddd209f9331cae438ca SHA512 fd2396a399f7290a157abe6f39aff044fb69da5d0790b94af7c19614f308bc8c5a6fb795242794f7a530e84e77ea0399f025407ebc516a0a92492607c7a43c1d +EBUILD libpod-1.8.0.ebuild 3849 BLAKE2B e53bb5e9d01d104de15d8d8a13190cb2d9a53a49c9b583b2aeb30660a85c003b6a2d63f2a3b3d947ca5dff4089a4c58bc3ca123cb2afd095dfbc78384ba06ef2 SHA512 fcb10d5f350d53863190e3b8d328d6c21535042de092ba617b03250fc3c652422fb853f134b785f4a5c7adba7e93a27ef0ef669d5206ab64e3b535d079efe2e2 +EBUILD libpod-1.8.2.ebuild 3873 BLAKE2B 649f6f8b597b1befc950a99a715a6eb561671293e90e0b136647a16cf02d5d71f58991e25627441414870b7069ea14846e5397236cc8653c056c7ee8a1c9dd87 SHA512 2345393f43e103c442bbe389fa14389bfde5719a3a8e916f2f18dd3808feb5490ba0fea594f3e1177388730a90fea803d29863e65ca1f09182fe9f2a3dcfa4a7 MISC metadata.xml 879 BLAKE2B 71e5ad7ed29e426919198aafd97805d704938cf938db4c6ce72e6e490753ed1c7a61e63209e855fddea0598f7c869dc1dde42cd5152f94377763d7163455ca53 SHA512 6a1a84612a4aa99a10d6f9b64168c748e2d19ea26e938938e1581e5f09bfac3d972382dfe7ea78e446d326743e8adf872a2010742d256cb04093c6d3fef36a31 diff --git a/app-emulation/libpod/libpod-1.8.0.ebuild b/app-emulation/libpod/libpod-1.8.0.ebuild index 502e3dde382a..27fe79a5b91b 100644 --- a/app-emulation/libpod/libpod-1.8.0.ebuild +++ b/app-emulation/libpod/libpod-1.8.0.ebuild @@ -41,11 +41,15 @@ src_prepare() { # Disable installation of python modules here, since those are # installed by separate ebuilds. - sed -e '/^GIT_.*/d' \ - -e 's:GO111MODULE=off:GO111MODULE=on:' \ - -e 's/$(GO) build/$(GO) build -v -work -x/' \ - -e 's/^\(install:.*\) install\.python$/\1/' \ - -i Makefile || die + local makefile_sed_args=( + -e '/^GIT_.*/d' + -e 's/$(GO) build/$(GO) build -v -work -x/' + -e 's/^\(install:.*\) install\.python$/\1/' + ) + + has_version -b '>=dev-lang/go-1.14' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') + + sed "${makefile_sed_args[@]}" -i Makefile || die sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ -i hack/get_release_info.sh || die diff --git a/app-emulation/libpod/libpod-1.8.2.ebuild b/app-emulation/libpod/libpod-1.8.2.ebuild new file mode 100644 index 000000000000..c44a3f792ce2 --- /dev/null +++ b/app-emulation/libpod/libpod-1.8.2.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT="028e3317eb1494b9b2acba4a0a295df80fae66cc" + +inherit bash-completion-r1 flag-o-matic go-module + +DESCRIPTION="Library and podman tool for running OCI-based containers in Pods" +HOMEPAGE="https://github.com/containers/libpod/" +SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" +SLOT="0" + +KEYWORDS="~amd64" +IUSE="apparmor btrfs +rootless selinux" +RESTRICT="test" + +COMMON_DEPEND=" + app-crypt/gpgme:= + >=app-emulation/conmon-2.0.0 + || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) + dev-libs/libassuan:= + dev-libs/libgpg-error:= + net-misc/cni-plugins + sys-fs/lvm2 + sys-libs/libseccomp:= + + apparmor? ( sys-libs/libapparmor ) + btrfs? ( sys-fs/btrfs-progs ) + rootless? ( app-emulation/slirp4netns ) + selinux? ( sys-libs/libselinux:= ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-go/go-md2man" +RDEPEND="${COMMON_DEPEND}" + +src_prepare() { + default + + # Disable installation of python modules here, since those are + # installed by separate ebuilds. + local makefile_sed_args=( + -e '/^GIT_.*/d' + -e 's/$(GO) build/$(GO) build -v -work -x/' + -e 's/^\(install:.*\) install\.python$/\1/' + ) + + has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:') + + sed "${makefile_sed_args[@]}" -i Makefile || die + + sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \ + -i hack/get_release_info.sh || die +} + +src_compile() { + # Filter unsupported linker flags + filter-flags '-Wl,*' + + [[ -f hack/apparmor_tag.sh ]] || die + if use apparmor; then + echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die + else + echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die + fi + + [[ -f hack/btrfs_installed_tag.sh ]] || die + if use btrfs; then + echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die + else + echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \ + hack/btrfs_installed_tag.sh || die + fi + + [[ -f hack/selinux_tag.sh ]] || die + if use selinux; then + echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die + else + echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die + fi + + export -n GOCACHE GOPATH XDG_CACHE_HOME + GOBIN="${S}/bin" \ + emake all \ + GIT_BRANCH=master \ + GIT_BRANCH_CLEAN=master \ + COMMIT_NO="${EGIT_COMMIT}" \ + GIT_COMMIT="${EGIT_COMMIT}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + + insinto /etc/containers + newins test/registries.conf registries.conf.example + newins test/policy.json policy.json.example + + insinto /usr/share/containers + doins seccomp.json + + newinitd "${FILESDIR}"/podman.initd podman + + insinto /etc/logrotate.d + newins "${FILESDIR}/podman.logrotated" podman + + dobashcomp completions/bash/* + + keepdir /var/lib/containers +} + +pkg_preinst() { + LIBPOD_ROOTLESS_UPGRADE=false + if use rootless; then + has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true + fi +} + +pkg_postinst() { + local want_newline=false + if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then + elog "You need to create the following config files:" + elog "/etc/containers/registries.conf" + elog "/etc/containers/policy.json" + elog "To copy over default examples, use:" + elog "cp /etc/containers/registries.conf{.example,}" + elog "cp /etc/containers/policy.json{.example,}" + want_newline=true + fi + if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then + ${want_newline} && elog "" + elog "For rootless operation, you need to configure subuid/subgid" + elog "for user running podman. In case subuid/subgid has only been" + elog "configured for root, run:" + elog "usermod --add-subuids 1065536-1131071 " + elog "usermod --add-subgids 1065536-1131071 " + want_newline=true + fi +} -- cgit v1.2.3