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 2D60C1382C5 for ; Tue, 15 Jun 2021 02:06:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79A1AE0923; Tue, 15 Jun 2021 02:06:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 5FBCDE0923 for ; Tue, 15 Jun 2021 02:06:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 23532335DA0 for ; Tue, 15 Jun 2021 02:06:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 996D57AC for ; Tue, 15 Jun 2021 02:06:21 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1623722746.bfd0e02c8af07b421e9a5d622c97930e97e0516d.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/tini/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/tini/tini-0.19.0-r1.ebuild X-VCS-Directories: sys-process/tini/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: bfd0e02c8af07b421e9a5d622c97930e97e0516d X-VCS-Branch: master Date: Tue, 15 Jun 2021 02:06:21 +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: 02f9c463-e32d-45f5-ac41-35274762aed9 X-Archives-Hash: 12b666b2199a99aa3de819cb30a6cc33 commit: bfd0e02c8af07b421e9a5d622c97930e97e0516d Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jun 15 02:03:37 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jun 15 02:05:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd0e02c sys-process/tini: revbump, specify correct GIT_COMMIT straight to stable, as tarball is the same, just the commit embedded into binary is wrong. Closes: https://bugs.gentoo.org/795936 Signed-off-by: Georgy Yakovlev gentoo.org> sys-process/tini/tini-0.19.0-r1.ebuild | 66 ++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/sys-process/tini/tini-0.19.0-r1.ebuild b/sys-process/tini/tini-0.19.0-r1.ebuild new file mode 100644 index 00000000000..fe80f91738d --- /dev/null +++ b/sys-process/tini/tini-0.19.0-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic + +# guard against forgetfulness, https://bugs.gentoo.org/795936 +GIT_COMMIT_0190="de40ad007797e0dcd8b7126f27bb87401d224240" +GIT_COMMIT="GIT_COMMIT_${PV//./}" +GIT_COMMIT="${!GIT_COMMIT}" + +DESCRIPTION="A tiny but valid init for containers" +HOMEPAGE="https://github.com/krallin/tini" +SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" +IUSE="+args +static" + +src_prepare() { + + [[ -z ${GIT_COMMIT} ]] && die "forgetful maintainer! please define GIT_COMMIT_${PV//./} on bump" + + cmake_src_prepare + + local sed_args=( + # Do not strip binary + -e 's/-Wl,-s")$/")/' + + # Remove -Werror and -pedantic-errors in order to allow macro + # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not + # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2) + # in CMakeLists.txt (bug 626438). + -e "s/ -Werror / /" + -e "s/ -pedantic-errors / /" + ) + + sed -i "${sed_args[@]}" \ + -e "s/git.*status --porcelain.*/true/" \ + -e "s/git.*log -n 1.*/true/" \ + -e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \ + CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=() + use args || mycmakeargs+=(-DMINIMAL=ON) + + cmake_src_configure +} + +src_compile() { + append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37 + cmake_src_compile +} + +src_install() { + cmake_src_install + if use static; then + mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die + else + rm "${ED}"/usr/bin/${PN}-static || die + fi +}