[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/files/, app-containers/buildah/

2024-03-31 Thread Zac Medico 
commit: a279dcf6a4f66dafab10abd264da57b9ac7d13bd
Author: Rahil Bhimjiani  rahil  rocks>
AuthorDate: Mon Apr  1 04:38:18 2024 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr  1 05:57:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a279dcf6

app-containers/buildah: stoppeg calling strip directly

Closes: https://bugs.gentoo.org/928309
Signed-off-by: Rahil Bhimjiani  rahil.rocks>
Closes: https://github.com/gentoo/gentoo/pull/36031
Signed-off-by: Zac Medico  gentoo.org>

 app-containers/buildah/buildah-1.33.7.ebuild   | 12 ++---
 app-containers/buildah/buildah-1.34.3.ebuild   | 14 ---
 app-containers/buildah/buildah-1.35.3.ebuild   |  3 ++-
 app-containers/buildah/buildah-.ebuild |  4 +--
 .../files/softcode-strip-upstream-pr-5446.patch| 29 ++
 5 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/app-containers/buildah/buildah-1.33.7.ebuild 
b/app-containers/buildah/buildah-1.33.7.ebuild
index 60b99c3a6057..a24bd18a767c 100644
--- a/app-containers/buildah/buildah-1.33.7.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
 --- a/Makefile
 +++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -10,6 +10,8 @@
  BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
  BUILDFLAGS := -tags "$(BUILDTAGS)"
  BUILDAH := buildah
 +AS ?= as
++STRIP ?= strip
 
  GO := go
  GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo 
"-gccgoflags"; else echo "-ldflags"; fi)
-@@ -72,7 +73,7 @@
+@@ -72,11 +74,11 @@
  bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz
$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ 
$(BUILDFLAGS) ./cmd/buildah
 
@@ -77,6 +78,11 @@ src_prepare() {
  internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s
$(AS) -o $(patsubst %.s,%.o,$^) $^
$(LD) -o $@ $(patsubst %.s,%.o,$^)
+-  strip $@
++  $(STRIP) $@
+ else
+ .PHONY: internal/mkcw/embed/entrypoint
+ endif
 EOF
 
default
@@ -139,7 +145,7 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-   tc-export AS LD
+   tc-export AS LD STRIP
export GOMD2MAN="$(command -v go-md2man)"
default
 }

diff --git a/app-containers/buildah/buildah-1.34.3.ebuild 
b/app-containers/buildah/buildah-1.34.3.ebuild
index 4b82e782d4f3..cc06bf2ff42d 100644
--- a/app-containers/buildah/buildah-1.34.3.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
 --- a/Makefile
 +++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -14,6 +14,8 @@
  BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
  BUILDFLAGS := -tags "$(BUILDTAGS)"
  BUILDAH := buildah
 +AS ?= as
++STRIP ?= strip
 
  GO := go
  GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo 
"-gccgoflags"; else echo "-ldflags"; fi)
-@@ -77,7 +77,7 @@
+@@ -76,14 +78,14 @@
  bin/buildah: $(SOURCES) cmd/buildah/*.go 
internal/mkcw/embed/entrypoint_amd64.gz
$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ 
$(BUILDFLAGS) ./cmd/buildah
 
@@ -76,6 +77,13 @@ src_prepare() {
 +ifneq ($(shell $(AS) --version | grep x86_64),)
  internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
gzip -k9nf $^
+
+ internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s
+   $(AS) -o $(patsubst %.s,%.o,$^) $^
+   $(LD) -o $@ $(patsubst %.s,%.o,$^)
+-  strip $@
++  $(STRIP) $@
+ endif
 EOF
 
default
@@ -138,7 +146,7 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-   tc-export AS LD
+   tc-export AS LD STRIP
export GOMD2MAN="$(command -v go-md2man)"
default
 }

diff --git a/app-containers/buildah/buildah-1.35.3.ebuild 
b/app-containers/buildah/buildah-1.35.3.ebuild
index b0b39faf03cb..e1c7e23390e5 100644
--- a/app-containers/buildah/buildah-1.35.3.ebuild
+++ b/app-containers/buildah/buildah-1.35.3.ebuild
@@ -46,6 +46,7 @@ BDEPEND="dev-go/go-md2man"
 
 PATCHES=(
"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
+   "${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
 )
 
 pkg_pretend() {
@@ -117,7 +118,7 @@ src_compile() {
# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
[[ ${PV} != * ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-   tc-export AS LD
+   tc-export AS LD STRIP
export GOMD2MAN="$(command -v go-md2man)"
default
 }

diff --git a/app-containers/buildah/buildah-.ebuild 
b/app-containers/buildah/buildah-.ebuild
index b0b39faf03cb..987715de5560

[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/files/, app-containers/buildah/

2024-02-23 Thread Joonas Niilola 
commit: be0e2adad236eb6178daa5f807027172cf9c6982
Author: Rahil Bhimjiani  rahil  rocks>
AuthorDate: Wed Jan 10 19:15:34 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 23 12:53:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0e2ada

app-containers/buildah: cleanup

Signed-off-by: Rahil Bhimjiani  rahil.rocks>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-containers/buildah/Manifest|   4 -
 app-containers/buildah/buildah-1.30.0.ebuild   |  53 -
 app-containers/buildah/buildah-1.32.2.ebuild   | 124 
 app-containers/buildah/buildah-1.33.1.ebuild   | 127 
 app-containers/buildah/buildah-1.33.2.ebuild   | 128 -
 .../buildah/files/fix-non-amd64-build-1.33.2.patch |  44 ---
 6 files changed, 480 deletions(-)

diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index ae0376e78fab..9299c41640e4 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,7 +1,3 @@
-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.1.tar.gz 18635429 BLAKE2B 
93883b02e6b790c029b03dd3ebb5f0d7c8e184989c987034cd429ea804d17b275a2b81c9f37bbaff1a54367bb93a9b0870af86293aa0332c3ccac1bbb6a750fe
 SHA512 
4abab105f6b242dc38e443b53b6c0c90fd7897bceb6b491fd067cd56767616a3df4005bc0bd0d10f217df2e6716cf950d8662788b110929a826660f29516703e
-DIST buildah-1.33.2.tar.gz 18580150 BLAKE2B 
523b75974a27695bbf818f4a1499d15e48e254934549f2ae191f462334aa4dd34a60c82b78b0d3351e05b297a40a8f8e2df94e75d22779a5c042dbd3dd307e4a
 SHA512 
574c1a249d93edd5f89e106cd192da94235edcff097d9bce841e3b3b3a9588029deddaceb301505114b994e854016c72090cc0016a00ef027b25f3672a3fab32
 DIST buildah-1.33.5.tar.gz 18579521 BLAKE2B 
a59bfda3dea1f588a2f77a26b942da6ae02a00f1169008f776a2d7699b6b14f38ab29b46b7d0651e9fff3f007e5f95caed99952cc7585c25ea2a3153402958e9
 SHA512 
82ddfacd69918fb4ca8110d7d5279f4075385e5db5b64b58cf41a90c47e16093f1e65d8ef20136a4cd8f5c23ea8da7f35fb72581cec6472497b9c5b458023e9c
 DIST buildah-1.33.6.tar.gz 18585405 BLAKE2B 
4a6f6ebfce7799a45b0984b6f9a319becfed87d5acf5f1f784249ff6e5397495ac72c00a22ff0bcc68fd94f1d0a591fa4ac5f0f88bcc9c0a6cdefe117166b4ec
 SHA512 
86eab18af459b0b92361d6e9f56ebe9dab65527d829e7771c13b6c574ef45746a7f53520783ff52978b14aac0d6ee8de32cdabf807666a96dcf46e07e36157e2
 DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B 
6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb
 SHA512 
a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db

diff --git a/app-containers/buildah/buildah-1.30.0.ebuild 
b/app-containers/buildah/buildah-1.30.0.ebuild
deleted file mode 100644
index b78fd0f1aa54..
--- a/app-containers/buildah/buildah-1.30.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-GIT_COMMIT=04965f11
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah;
-SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-IUSE="selinux"
-RESTRICT="test"
-
-DEPEND="
-   app-crypt/gpgme:=
-   app-containers/skopeo
-   dev-libs/libgpg-error:=
-   dev-libs/libassuan:=
-   sys-apps/shadow:=
-   sys-fs/lvm2:=
-   sys-libs/libseccomp:=
-   selinux? ( sys-libs/libselinux:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   default
-   [[ -f selinux_tag.sh ]] || die
-   use selinux || { echo -e "#!/bin/sh\ntrue" > \
-   selinux_tag.sh || die; }
-   sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
-}
-
-src_compile() {
-   emake GIT_COMMIT=${GIT_COMMIT} all
-}
-
-src_install() {
-   dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md 
troubleshooting.md
-   doman docs/*.1
-   dodoc -r docs/tutorials
-   dobin bin/{${PN},imgtype}
-   dobashcomp contrib/completions/bash/buildah
-}
-
-src_test() {
-   emake test-unit
-}

diff --git a/app-containers/buildah/buildah-1.32.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-containers/buildah/files/, app-containers/buildah/

2023-12-04 Thread Zac Medico 
commit: 32b9e7fdea62206bf53a30c36284dae17e74e716
Author: Rahil Bhimjiani  rahil  website>
AuthorDate: Fri Dec  1 03:27:53 2023 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Dec  5 05:24:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b9e7fd

app-containers/buildah: add 1.33.2 which fixes arm64 build

Closes: https://bugs.gentoo.org/918903
Signed-off-by: Rahil Bhimjiani  rahil.website>
Closes: https://github.com/gentoo/gentoo/pull/34073
Signed-off-by: Zac Medico  gentoo.org>

 app-containers/buildah/Manifest|  1 +
 app-containers/buildah/buildah-1.33.1.ebuild   |  3 ++
 ...buildah-1.33.1.ebuild => buildah-1.33.2.ebuild} |  4 ++
 app-containers/buildah/buildah-.ebuild |  1 +
 .../buildah/files/fix-non-amd64-build-1.33.2.patch | 44 ++
 5 files changed, 53 insertions(+)

diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index b3742dfa1500..508823a8254f 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,3 +1,4 @@
 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.1.tar.gz 18635429 BLAKE2B 
93883b02e6b790c029b03dd3ebb5f0d7c8e184989c987034cd429ea804d17b275a2b81c9f37bbaff1a54367bb93a9b0870af86293aa0332c3ccac1bbb6a750fe
 SHA512 
4abab105f6b242dc38e443b53b6c0c90fd7897bceb6b491fd067cd56767616a3df4005bc0bd0d10f217df2e6716cf950d8662788b110929a826660f29516703e
+DIST buildah-1.33.2.tar.gz 18580150 BLAKE2B 
523b75974a27695bbf818f4a1499d15e48e254934549f2ae191f462334aa4dd34a60c82b78b0d3351e05b297a40a8f8e2df94e75d22779a5c042dbd3dd307e4a
 SHA512 
574c1a249d93edd5f89e106cd192da94235edcff097d9bce841e3b3b3a9588029deddaceb301505114b994e854016c72090cc0016a00ef027b25f3672a3fab32

diff --git a/app-containers/buildah/buildah-1.33.1.ebuild 
b/app-containers/buildah/buildah-1.33.1.ebuild
index 09a8f30b55b0..bcda107b9f6c 100644
--- a/app-containers/buildah/buildah-1.33.1.ebuild
+++ b/app-containers/buildah/buildah-1.33.1.ebuild
@@ -43,6 +43,9 @@ RDEPEND="
sys-apps/shadow:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=(
+   "${FILESDIR}"/fix-non-amd64-build-1.33.2.patch
+)
 
 pkg_pretend() {
local CONFIG_CHECK=""

diff --git a/app-containers/buildah/buildah-1.33.1.ebuild 
b/app-containers/buildah/buildah-1.33.2.ebuild
similarity index 97%
copy from app-containers/buildah/buildah-1.33.1.ebuild
copy to app-containers/buildah/buildah-1.33.2.ebuild
index 09a8f30b55b0..ce382bf95dfe 100644
--- a/app-containers/buildah/buildah-1.33.1.ebuild
+++ b/app-containers/buildah/buildah-1.33.2.ebuild
@@ -7,6 +7,7 @@ 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
@@ -43,6 +44,9 @@ RDEPEND="
sys-apps/shadow:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=(
+   "${FILESDIR}"/fix-non-amd64-build-1.33.2.patch
+)
 
 pkg_pretend() {
local CONFIG_CHECK=""

diff --git a/app-containers/buildah/buildah-.ebuild 
b/app-containers/buildah/buildah-.ebuild
index 09a8f30b55b0..4b4a54c71ba9 100644
--- a/app-containers/buildah/buildah-.ebuild
+++ b/app-containers/buildah/buildah-.ebuild
@@ -7,6 +7,7 @@ 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

diff --git a/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch 
b/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch
new file mode 100644
index ..51ba7df1aa90
--- /dev/null
+++ b/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch
@@ -0,0 +1,44 @@
+From 12b205f69876bf09bb6dfe03adcdefad5d4ee9f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= 
+Date: Mon, 20 Nov 2023 09:28:06 +0100
+Subject: [PATCH] Remove makefile targets entrypoint{,.gz} for non x86_64
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://github.com/containers/buildah/pull/5183
+The target internal/mkcw/embed/entrypoint is only built on x86_64, but
+internal/mkcw/embed/entrypoint.gz is run on all arches. This causes build
+failures on anything non x86_64 as internal/mkcw/embed/entrypoint is not build.
+
+Signed-off-by: Dan Čermák 
+---
+ Makefile | 9 -
+ 1 file changed, 4