From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 362B2138334 for ; Thu, 18 Jul 2019 19:48:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E64D8E070D; Thu, 18 Jul 2019 19:48:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9E44E070D for ; Thu, 18 Jul 2019 19:48:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E427348014 for ; Thu, 18 Jul 2019 19:48:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DF026F2 for ; Thu, 18 Jul 2019 19:48:31 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1563479303.2dbf3134e2fa35d02b8f1bd11c2ab567598b8304.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libpod/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libpod/Manifest app-emulation/libpod/libpod-1.4.4.ebuild X-VCS-Directories: app-emulation/libpod/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2dbf3134e2fa35d02b8f1bd11c2ab567598b8304 X-VCS-Branch: master Date: Thu, 18 Jul 2019 19:48:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37e0a047-5b17-4dc3-9ec5-99be1693adb2 X-Archives-Hash: ccabdc3803adc89402f73f5f1f12bc7d commit: 2dbf3134e2fa35d02b8f1bd11c2ab567598b8304 Author: Bruce Guenter untroubled org> AuthorDate: Thu Jul 18 19:43:22 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jul 18 19:48:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbf3134 app-emulation/libpod: Bump to version 1.4.4 Closes: https://bugs.gentoo.org/690156 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Zac Medico gentoo.org> app-emulation/libpod/Manifest | 1 + app-emulation/libpod/libpod-1.4.4.ebuild | 139 +++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest index b687de3f0b3..6585db41526 100644 --- a/app-emulation/libpod/Manifest +++ b/app-emulation/libpod/Manifest @@ -1,2 +1,3 @@ DIST libpod-1.3.2.tar.gz 6901289 BLAKE2B 5de0cf9f47f7e10866839ba01f3c3ed930ebdb716ce10ca4cb6f6b4d0e96088e10a069726125f2dc4af6febe08e6b2fc058fb8e8ecd7dd870612ecb98f29bba5 SHA512 fb959bf6af314baf3d01c53b513390b6d181adca3f9ff2ca747fabd53abdd45907e8a3f8189ff2d1bd70cff8e8bad690407cf278392a0831e6109669a1c1b12b DIST libpod-1.4.0.tar.gz 6937356 BLAKE2B d8fa4920485be89c84adca8a15946bfbac01671ff5460cb0e519cddd208e28b2dae392bfff93cf0b344d7d887e000d4edf430c81bd8a903678e10578a459cf70 SHA512 711de3cf02c96316aaec3d62fb5eaf5d16c6689b4b84cfcc3a375ba5c0554d3a7d2f789eb8d330e38be37d8907427641c077038c9945ed0ca6cd19ec872a451c +DIST libpod-1.4.4.tar.gz 8286321 BLAKE2B 2f7d529d1780694e450d7ac63aef53ad2bbe27a9cdd939fe7b7d5c71020173639a6b7c20e3732cb2a8320e0f55ec906acab29fc3b1bdbec8a05add1baf688194 SHA512 18e9f2cbd308d1fd5cd9d4931530b7c8357784a1cfd84ceb106813e5bfbd404424c656dd82d74c04678e8d83c03d2ef44c16d3a866b6844a3ed0adc0e88dd8b0 diff --git a/app-emulation/libpod/libpod-1.4.4.ebuild b/app-emulation/libpod/libpod-1.4.4.ebuild new file mode 100644 index 00000000000..8dfcea5cf94 --- /dev/null +++ b/app-emulation/libpod/libpod-1.4.4.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_COMMIT="b3f10c8be229bcc58c1673b0431285fd5fce1293" +EGO_PN="github.com/containers/${PN}" + +inherit golang-vcs-snapshot systemd + +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" +SLOT="0" + +KEYWORDS="~amd64" +IUSE="apparmor btrfs ostree +rootless selinux" +REQUIRED_USE="!selinux? ( !ostree )" +RESTRICT="test" + +COMMON_DEPEND=" + app-crypt/gpgme:= + app-emulation/conmon + >=app-emulation/runc-1.0.0_rc6 + dev-libs/libassuan:= + dev-libs/libgpg-error:= + sys-fs/lvm2 + sys-libs/libseccomp:= + + apparmor? ( sys-libs/libapparmor ) + btrfs? ( sys-fs/btrfs-progs ) + ostree? ( + dev-libs/glib:= + dev-util/ostree:= + ) + rootless? ( app-emulation/slirp4netns ) + selinux? ( sys-libs/libselinux:= ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-go/go-md2man" +RDEPEND="${COMMON_DEPEND}" +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_prepare() { + default + + # Disable installation of python modules here, since those are + # installed by separate ebuilds. + sed -e '/^GIT_.*/d' \ + -e 's/$(GO) build/$(GO) build -v -work -x/' \ + -e 's/^\(install:.*\) install\.python$/\1/' \ + -i Makefile || die +} + +src_compile() { + [[ -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/ostree_tag.sh ]] || die + if use ostree; then + echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die + else + echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_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 + + env -u GOCACHE -u LDFLAGS -u XDG_CACHE_HOME GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/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 + + newinitd "${FILESDIR}"/podman.initd podman + + systemd_dounit "${S}"/contrib/varlink/*.service "${S}"/contrib/varlink/*.socket + + insinto /etc/logrotate.d + newins "${FILESDIR}/podman.logrotated" podman + + 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 +}