From a29a0019eaf0bf87941bdc1d9cd53937685852ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 Nov 2023 23:08:59 +0000 Subject: gentoo auto-resync : 19:11:2023 - 23:08:59 --- app-containers/buildah/Manifest | 4 +- app-containers/buildah/buildah-1.33.0.ebuild | 124 --------------------------- app-containers/buildah/buildah-1.33.1.ebuild | 124 +++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 app-containers/buildah/buildah-1.33.0.ebuild create mode 100644 app-containers/buildah/buildah-1.33.1.ebuild (limited to 'app-containers/buildah') diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest index 72f437584e96..9b9f35fed069 100644 --- a/app-containers/buildah/Manifest +++ b/app-containers/buildah/Manifest @@ -1,8 +1,8 @@ DIST buildah-1.30.0.tar.gz 15623786 BLAKE2B e0b2f6d26827cfe40f88a9915f12b6acb385fbd576fa227d4fee02c162077e9c6fe0591c7171405f5645cd06e4068f26e17c2cb963898e38cfbdd61abe68dae2 SHA512 185fd98a59fa8d86fe9f1eadc9b7591e5053674464be10538a7581d8e1f6a25e5032a354c821c32a167e2864acea010243efbbe4f5a4205d8eaa2894f062a25b DIST buildah-1.32.2.tar.gz 18451694 BLAKE2B 885b940e804394d18451e5dce3e3af4097a8adf01e59d7a288dda7063a888759abd9a5c18d8f4522709c7d296fc9a2b5d61229143f3545a786dc59ac837214e2 SHA512 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1 -DIST buildah-1.33.0.tar.gz 18632278 BLAKE2B f5984aa01fbe4957de07c5925795ceb106af07fc05f2f772ff8a5812f8ebcc5b9e86ec1d2f04bda5fa0e264a1c904f74a6e8795e1af8a0dbe9e1dabfe5832bc9 SHA512 926c748bd9dbbaf86e266dec778ecf31c65c58016f09ae8b6f9e570a6603fd9c6fc72db4b8c371e999ecb4e1a2cb2429082da66bd8069916652318a0362b40da +DIST buildah-1.33.1.tar.gz 18635429 BLAKE2B 93883b02e6b790c029b03dd3ebb5f0d7c8e184989c987034cd429ea804d17b275a2b81c9f37bbaff1a54367bb93a9b0870af86293aa0332c3ccac1bbb6a750fe SHA512 4abab105f6b242dc38e443b53b6c0c90fd7897bceb6b491fd067cd56767616a3df4005bc0bd0d10f217df2e6716cf950d8662788b110929a826660f29516703e EBUILD buildah-1.30.0.ebuild 1196 BLAKE2B eefce023ce7e2662b1598fb3f6d5b885816d54a6397a788e10851b7ccc174ae6d9e4fa4ec387d3a21a7fdff4670ee68bfb59e9171e76032c3c28882d164cc446 SHA512 3c139484015e3e85c8f891babb375c560c3fc3e1827a44862eb262f95b8654a2c8d2a3c4102d3081c3a3677f20c0c5371a6579e9c0e1adfa339e5198475c357b EBUILD buildah-1.32.2.ebuild 2918 BLAKE2B 89f20f481c3f35b29175f7544214be1259d36ddeb4096a7e89418d5d0d40d48435c26caa146cd07ce1e47d9da3c86b5e9ddc52fec2e0bab7936f222e065f4cc1 SHA512 099c0c6bee12574558f630f98a94e482cdea04310d6bd6bfea82e470efcb9e000146d57620965b1ae580d4766e1f34b8f9946edbd1903e28b82a6d0f748c3f80 -EBUILD buildah-1.33.0.ebuild 2909 BLAKE2B 1bd072e376d43d94301c5b5ead70c2036cb15326bdbcc5d862641457a4a91d3fd9c12ca5c7d1921b6a1622370076d5eff58c962abb541a3cc8ea590512e64909 SHA512 5f4232178cd668a54127a2e7f3ed87012279e0379c07951664ecaa0bfa8f443db9a86b8456db02b33a2ed5e6c46adad2889b2c00a5d618e3d0590991d9cb232a +EBUILD buildah-1.33.1.ebuild 2909 BLAKE2B 1bd072e376d43d94301c5b5ead70c2036cb15326bdbcc5d862641457a4a91d3fd9c12ca5c7d1921b6a1622370076d5eff58c962abb541a3cc8ea590512e64909 SHA512 5f4232178cd668a54127a2e7f3ed87012279e0379c07951664ecaa0bfa8f443db9a86b8456db02b33a2ed5e6c46adad2889b2c00a5d618e3d0590991d9cb232a EBUILD buildah-9999.ebuild 2909 BLAKE2B 1bd072e376d43d94301c5b5ead70c2036cb15326bdbcc5d862641457a4a91d3fd9c12ca5c7d1921b6a1622370076d5eff58c962abb541a3cc8ea590512e64909 SHA512 5f4232178cd668a54127a2e7f3ed87012279e0379c07951664ecaa0bfa8f443db9a86b8456db02b33a2ed5e6c46adad2889b2c00a5d618e3d0590991d9cb232a MISC metadata.xml 718 BLAKE2B 8a075660ff80fd4dddf223b5f5fbe42b1d32febfbd67cd6e52bc750958209d4b24c6f42e62e65d3efa771eb171378f4a869ce20566b2d9abae03546c149c6351 SHA512 cad4369d24640e41ccc6427260733681631cef23250fd6f5fe2e50af778ca0cae31cb7b4498f24e08e0ad1051340b801f18f4da035850172bb15e34fe6ae8e16 diff --git a/app-containers/buildah/buildah-1.33.0.ebuild b/app-containers/buildah/buildah-1.33.0.ebuild deleted file mode 100644 index 09a8f30b55b0..000000000000 --- a/app-containers/buildah/buildah-1.33.0.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module linux-info - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah" -# main pkg -LICENSE="Apache-2.0" -# deps -LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" - -SLOT="0" -IUSE="apparmor btrfs +seccomp systemd doc test" -RESTRICT="test" -EXTRA_DOCS=( - "CHANGELOG.md" - "CONTRIBUTING.md" - "install.md" - "troubleshooting.md" - "docs/tutorials" -) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/buildah.git" -else - SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -RDEPEND=" - systemd? ( sys-apps/systemd ) - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp:= ) - apparmor? ( sys-libs/libapparmor:= ) - app-containers/containers-common - app-crypt/gpgme:= - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= -" -DEPEND="${RDEPEND}" - -pkg_pretend() { - local CONFIG_CHECK="" - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - check_extra_config - - linux_config_exists || ewarn "Cannot determine configuration of your kernel." -} - -src_prepare() { - default - - # ensure all necessary files are there - local file - for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ - hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do - [[ -f "${file}" ]] || die - done - - sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die - echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die - - cat <<-EOF > hack/apparmor_tag.sh || die - #!/usr/bin/env bash - $(usex apparmor 'echo apparmor' echo) - EOF - - use seccomp || { - cat <<-'EOF' > "${T}/disable_seccomp.patch" - --- a/Makefile - +++ b/Makefile - @@ -5 +5 @@ - -SECURITYTAGS ?= seccomp $(APPARMORTAG) - +SECURITYTAGS ?= $(APPARMORTAG) - EOF - eapply "${T}/disable_seccomp.patch" || die - } - - cat <<-EOF > hack/systemd_tag.sh || die - #!/usr/bin/env bash - $(usex systemd 'echo systemd' echo) - EOF - - echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die - cat <<-EOF > btrfs_tag.sh || die - #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') - EOF - - use test || { - cat <<-'EOF' > "${T}/disable_tests.patch" - --- a/Makefile - +++ b/Makefile - @@ -54 +54 @@ - -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs - +all: bin/buildah docs - EOF - eapply "${T}/disable_tests.patch" || die - } - -} - -src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" - - default -} - -src_test() { - emake test-unit -} - -src_install() { - emake DESTDIR="${ED}" install install.completions - einstalldocs - use doc && dodoc -r "${EXTRA_DOCS[@]}" -} diff --git a/app-containers/buildah/buildah-1.33.1.ebuild b/app-containers/buildah/buildah-1.33.1.ebuild new file mode 100644 index 000000000000..09a8f30b55b0 --- /dev/null +++ b/app-containers/buildah/buildah-1.33.1.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module linux-info + +DESCRIPTION="A tool that facilitates building OCI images" +HOMEPAGE="https://github.com/containers/buildah" +# main pkg +LICENSE="Apache-2.0" +# deps +LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" + +SLOT="0" +IUSE="apparmor btrfs +seccomp systemd doc test" +RESTRICT="test" +EXTRA_DOCS=( + "CHANGELOG.md" + "CONTRIBUTING.md" + "install.md" + "troubleshooting.md" + "docs/tutorials" +) + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/buildah.git" +else + SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +RDEPEND=" + systemd? ( sys-apps/systemd ) + btrfs? ( sys-fs/btrfs-progs ) + seccomp? ( sys-libs/libseccomp:= ) + apparmor? ( sys-libs/libapparmor:= ) + app-containers/containers-common + app-crypt/gpgme:= + dev-libs/libgpg-error:= + dev-libs/libassuan:= + sys-apps/shadow:= +" +DEPEND="${RDEPEND}" + +pkg_pretend() { + local CONFIG_CHECK="" + use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" + check_extra_config + + linux_config_exists || ewarn "Cannot determine configuration of your kernel." +} + +src_prepare() { + default + + # ensure all necessary files are there + local file + for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ + hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do + [[ -f "${file}" ]] || die + done + + sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die + echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die + + cat <<-EOF > hack/apparmor_tag.sh || die + #!/usr/bin/env bash + $(usex apparmor 'echo apparmor' echo) + EOF + + use seccomp || { + cat <<-'EOF' > "${T}/disable_seccomp.patch" + --- a/Makefile + +++ b/Makefile + @@ -5 +5 @@ + -SECURITYTAGS ?= seccomp $(APPARMORTAG) + +SECURITYTAGS ?= $(APPARMORTAG) + EOF + eapply "${T}/disable_seccomp.patch" || die + } + + cat <<-EOF > hack/systemd_tag.sh || die + #!/usr/bin/env bash + $(usex systemd 'echo systemd' echo) + EOF + + echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die + cat <<-EOF > btrfs_tag.sh || die + #!/usr/bin/env bash + $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') + EOF + + use test || { + cat <<-'EOF' > "${T}/disable_tests.patch" + --- a/Makefile + +++ b/Makefile + @@ -54 +54 @@ + -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs + +all: bin/buildah docs + EOF + eapply "${T}/disable_tests.patch" || die + } + +} + +src_compile() { + # For non-live versions, prevent git operations which causes sandbox violations + # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 + [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" + + default +} + +src_test() { + emake test-unit +} + +src_install() { + emake DESTDIR="${ED}" install install.completions + einstalldocs + use doc && dodoc -r "${EXTRA_DOCS[@]}" +} -- cgit v1.2.3