diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest index 547f65a024bd4..02c2894f8a5fc 100644 --- a/app-containers/buildah/Manifest +++ b/app-containers/buildah/Manifest @@ -1,3 +1,4 @@ DIST buildah-1.41.0.tar.gz 11971274 BLAKE2B af197271bf519f84d1e7d08cbaab6a4aef3d1bdc234eaf8127f33e1fdd0c3f66c09262bf1aef9776d8d3fdfd853ae23cccd4ae6fcd06b2f86b7769d82f71617a SHA512 50be5c400a5063c12d5b97dc285d4969e50e88fa21de537f1c2317df36a1ccabf26ba70ece9e3e5c891e76ee8d85ab946029dc240de40ec88c86ad678e963823 DIST buildah-1.44.0.tar.gz 10888725 BLAKE2B 409046d73dbc4ffb835a37e26c28111f6c1f28c165ab6c979738fc6459b81edfdcfe468337b39a2edce018cb568df32b2868e6c46a5b414eb005cfb4d2546b8c SHA512 660f29ff9b8c8f7f3776e96391bb803feb54622c92aaf78f5ac37783bdc77573353acd5f692502b61169ad58f6b89a8e8268ec41c0cb080dfec3f8466dd6419e DIST buildah-1.44.1.tar.gz 10812896 BLAKE2B 5d36c37828b355fa25f0911584cbd19aab2bf63a7dccfd55dcf0802efddf34cda389fc0c118d9b210b73840da443785b33ca1035367e68e03878b43fd5205750 SHA512 ece4a05bfae24e997a4520974f396d77728387bdd2d996dbcef27f491b44d97c916b8b2d5afa272929b658d13d924992c8c73ecd7d944d08259504a390cfacbc +DIST buildah-1.45.0.tar.gz 11415484 BLAKE2B 6e3e585b0f75d60f129cd25ab87da8162cadf510c2e180a0470bf116beb2c21a795abced8b3c925e61a2300db56bb13d812fef987679d72829491a1efa22e408 SHA512 570b68c0b6791e2e832b6e39906373da058308c017f6b460a658466e281d3b9eac5b5b842488e658438bb41c9926c160a90c956ba12ba57afcef88f523354ffe diff --git a/app-containers/buildah/buildah-1.45.0.ebuild b/app-containers/buildah/buildah-1.45.0.ebuild new file mode 100644 index 0000000000000..bf3b639b7a98a --- /dev/null +++ b/app-containers/buildah/buildah-1.45.0.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module linux-info toolchain-funcs + +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 selinux systemd test" +RESTRICT="test" + +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=" + >=app-containers/container-libs-0.68.0[extra(-)] + app-crypt/gpgme:= + dev-db/sqlite:3= + dev-libs/libgpg-error:= + dev-libs/libassuan:= + sys-apps/shadow:= + apparmor? ( sys-libs/libapparmor:= ) + btrfs? ( sys-fs/btrfs-progs ) + seccomp? ( sys-libs/libseccomp:= ) + selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= ) + systemd? ( sys-apps/systemd ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-go/go-md2man + >=dev-lang/go-1.25.9 +" + +DOCS=( CHANGELOG.md troubleshooting.md docs/tutorials ) +PATCHES=( "${FILESDIR}/buildah-1.44.1-pr6984-dontbuild-on-install.patch" ) + +pkg_pretend() { + if use btrfs; then + local CONFIG_CHECK="~BTRFS_FS" + check_extra_config + linux_config_exists || ewarn "Cannot determine configuration of your kernel." + fi +} + +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; 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 || eapply "${FILESDIR}/${PN}-1.37.5-disable-seccomp.patch" + + cat <<-EOF > hack/systemd_tag.sh || die + #!/usr/bin/env bash + $(usex systemd 'echo systemd' echo) + EOF + + cat <<-EOF > btrfs_installed_tag.sh || die + #!/usr/bin/env bash + $(usex btrfs echo 'echo exclude_graphdriver_btrfs') + EOF + + # hardcode using system sqlite instead of bundled one + [[ -f hack/sqlite_tag.sh ]] && echo -e '#!/usr/bin/env bash\necho libsqlite3' > hack/sqlite_tag.sh || die + + use test || eapply "${FILESDIR}/${PN}-1.45.0-disable-tests.patch" +} + +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="" + + tc-export AS LD STRIP + export GOMD2MAN="$(command -v go-md2man)" + emake binaries + emake -C docs +} + +src_test() { + emake test-unit +} + +src_install() { + emake DESTDIR="${ED}" SELINUXOPT= install.nobuild install.completions + einstalldocs +} diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild index 418d5505dac20..bf3b639b7a98a 100644 --- a/app-containers/buildah/buildah-9999.ebuild +++ b/app-containers/buildah/buildah-9999.ebuild @@ -41,7 +41,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" dev-go/go-md2man - >=dev-lang/go-1.25.6 + >=dev-lang/go-1.25.9 " DOCS=( CHANGELOG.md troubleshooting.md docs/tutorials ) @@ -88,7 +88,7 @@ src_prepare() { # hardcode using system sqlite instead of bundled one [[ -f hack/sqlite_tag.sh ]] && echo -e '#!/usr/bin/env bash\necho libsqlite3' > hack/sqlite_tag.sh || die - use test || eapply "${FILESDIR}/${PN}-1.44.1-disable-tests.patch" + use test || eapply "${FILESDIR}/${PN}-1.45.0-disable-tests.patch" } src_compile() { diff --git a/app-containers/buildah/files/buildah-1.45.0-disable-tests.patch b/app-containers/buildah/files/buildah-1.45.0-disable-tests.patch new file mode 100644 index 0000000000000..a4f9107162504 --- /dev/null +++ b/app-containers/buildah/files/buildah-1.45.0-disable-tests.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 413ade4..68d698f 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,7 +60,7 @@ export GOLANGCI_LINT_VERSION := 2.12.2 + # use source debugging tools like delve. + all: binaries docs + +-binaries: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial bin/dumpspec bin/passwd bin/crash bin/wait bin/grpcnoop bin/pipeloop ++binaries: bin/buildah + + bin/buildah: $(SOURCES) internal/mkcw/embed/entrypoint_amd64.gz + $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah