Date: Thursday, March 2, 2023 @ 19:52:30 Author: foxboron Revision: 1407419
upgpkg: toolbox 0.0.99.4-1 Modified: toolbox/trunk/PKGBUILD ----------+ PKGBUILD | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-02 19:45:35 UTC (rev 1407418) +++ PKGBUILD 2023-03-02 19:52:30 UTC (rev 1407419) @@ -2,15 +2,15 @@ # Maintainer: Morten Linderud <[email protected]> pkgname=toolbox -pkgver=0.0.99.3 -pkgrel=2 +pkgver=0.0.99.4 +pkgrel=1 pkgdesc='Unprivileged development environment' arch=(x86_64) url='https://github.com/containers/toolbox' license=(APACHE) depends=(podman bash flatpak) -makedepends=(go shellcheck go-md2man bash-completion ninja git meson) -_commit=52c85b60d95ecb2c01cbd3901a16e7c43cd85440 #refs/tags/0.0.99.3^{} +makedepends=(go shellcheck go-md2man bash-completion ninja git meson podman) +_commit=f7c4c7dedb34be33333065296275869e77464400 #refs/tags/0.0.99.4^{} source=("git+$url#commit=$_commit") sha256sums=('SKIP') @@ -19,6 +19,15 @@ git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } +prepare() { + cd toolbox + # Fixes https://github.com/containers/toolbox/issues/1246 + git cherry-pick -n 816a7cab9e2f02f2eb828062be54ffef2e3666dc + git cherry-pick -n f555029304415a06bde410deb879cd2cc7dad444 + git cherry-pick -n fc5f568c5d82f4a16982268fa67092e52be91fbe + +} + build() { export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" export CGO_LDFLAGS="${LDFLAGS}"
