diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
| commit | e3872864be25f7421015bef2732fa57c0c9fb726 (patch) | |
| tree | 9cb29a544215119b5c5538e37211b994ce1c87ae /sys-process/tini | |
| parent | 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff) | |
gentoo resync : 04.08.2018
Diffstat (limited to 'sys-process/tini')
| -rw-r--r-- | sys-process/tini/Manifest | 4 | ||||
| -rw-r--r-- | sys-process/tini/tini-0.17.0.ebuild | 42 | ||||
| -rw-r--r-- | sys-process/tini/tini-0.18.0.ebuild | 16 |
3 files changed, 15 insertions, 47 deletions
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest index 149ef74eaa4e..9b6b410c78c5 100644 --- a/sys-process/tini/Manifest +++ b/sys-process/tini/Manifest @@ -1,7 +1,5 @@ DIST tini-0.16.1.tar.gz 29641 BLAKE2B 637ee17bbf8553b7803dc78cc40ec55ea919ec003005c7f2524322df6cc93a2e4c6fc017fa25c581f50eb17482956ebf37bf49c7796c33d227c7327ca467a906 SHA512 aa0a802c403a07771a2b28a07b97fa2c93d40b5d5be2cba6556c8e7a92e608453010625d0236d26c27bdd2820aed3ad9ca676b70f7fcd5986d7f91eb928d053c -DIST tini-0.17.0.tar.gz 30881 BLAKE2B 8212bfa56b6ade3b79e1d4d3144b10b98e4daf19e9a9c93f6db44dfea22f80b4c6810619832b339984681d1933d00964f7cfbf516286354141f795d3cb5e745f SHA512 4e59241bd621cd89f9c07dcd7a21754a947c87d3571b06bc5f034c0059a20cbc02d4d22fd08a79633b84fd47980dbf5240e2d2fa382aaf5c32e6003710b7691a DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1 EBUILD tini-0.16.1.ebuild 910 BLAKE2B 44bd74197ebd18fddb00f4f9b285da19dcdbcdce97548317ca4e786e7e3ce5724e3a2c85c5741b6ceff57e46c87c632cd27e2c629a7b18ecb7d98eb91b0f4e63 SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334 -EBUILD tini-0.17.0.ebuild 911 BLAKE2B db44d845dd47b42e0a707d5bb342cfdcc7f6d79ba2f5e114fc03788be003854e7f7b2b53f86b80a1bae961b85d0ae98a8dce34187027aa2e088cd7b33feb4e46 SHA512 1b3d1aa8f75d7ac3fbbae3dbdee31e370e1c2c44c1763ade560e5940153fa0f45c63e7e3ffba97b18fa5c0f41b50efec3bd519964893af77467c2e2c8126709d -EBUILD tini-0.18.0.ebuild 1105 BLAKE2B 356280a58fe5c1f146c83531021e131c9162da1e1075820d1aae4c130b3c71ff214f3270375be83efbbff705a9e5d90a8224ead03c2828e9bc6853789f69a747 SHA512 7cf39465ae7a3a3ea332c9277380d62e813097ef12f5dd50ea1002de87e4925ffddeca550138f7469fdfc19e7701c35ce13fb5f46172df54edb1c698e803d861 +EBUILD tini-0.18.0.ebuild 1429 BLAKE2B 2799a4a06d4edbbced8eafc5a2ca2c8f8aadfc3da16b128933787e4f2e2adcbe9d074600d0b48d0a6ddda713b406aba776ce62fa1006176b1a4340223fea644e SHA512 2ebd3c06e3d81c7072269c12c779cd62e1341f4460fa9b46d9d571ec9858128c998860d09184c65bad0abaa93e4d17542159bef48ad43a38f21ebf831d86650c MISC metadata.xml 603 BLAKE2B 5e702a958ad14189e4be030441833428283784695d116c8404be905b6aece027ec8acbe05394c6108d13ad04eae0284dc88cbab77364aeb73dfc21001457f7f7 SHA512 9e6651c7f9ae7a2b3d856af9e74e8656f89de4496fcacf5d97bcbe4d2b20be01c306cb3e116a0ad7eabe213e2476245894ffa53e5c63ef9b4e73ca989584af9c diff --git a/sys-process/tini/tini-0.17.0.ebuild b/sys-process/tini/tini-0.17.0.ebuild deleted file mode 100644 index 15f145ee4ab7..000000000000 --- a/sys-process/tini/tini-0.17.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -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 ~x86" -IUSE="+args +static" - -src_prepare() { - cmake-utils_src_prepare - # Do not strip binary - sed -i -e 's/-Wl,-s")$/")/' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=() - use args || mycmakeargs+=(-DMINIMAL=ON) - - cmake-utils_src_configure -} - -src_compile() { - append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37 - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - if use static; then - mv "${ED%/}"/usr/bin/{${PN}-static,${PN}} || die - else - rm "${ED%/}"/usr/bin/${PN}-static || die - fi -} diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild index 6055c7e98a14..9650f2b376b0 100644 --- a/sys-process/tini/tini-0.18.0.ebuild +++ b/sys-process/tini/tini-0.18.0.ebuild @@ -17,8 +17,20 @@ IUSE="+args +static" src_prepare() { cmake-utils_src_prepare - # Do not strip binary - sed -i -e 's/-Wl,-s")$/")/' \ + + 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}/" \ |