From 6652cc1f200b4ab962aa61286736617e2a4ba046 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 3 Sep 2019 23:08:41 +0200 Subject: [PATCH] Rebuild all go packages with go 1.13 See https://github.com/termux/termux-packages/issues/3619 --- packages/caddy/build.sh | 1 + packages/direnv/build.sh | 2 +- packages/git-lfs/build.sh | 3 +++ packages/gitea/build.sh | 10 +++++++--- packages/gotty/build.sh | 2 +- packages/hub/build.sh | 1 + packages/hugo/build.sh | 1 + packages/ipfs/build.sh | 7 +++++-- packages/keybase/build.sh | 4 ++-- packages/obfs4proxy/build.sh | 1 + packages/rclone/build.sh | 1 + packages/restic/build.sh | 7 +++++-- packages/tweego/build.sh | 5 ++--- 13 files changed, 31 insertions(+), 14 deletions(-) diff --git a/packages/caddy/build.sh b/packages/caddy/build.sh index bc7abefb46..781c190334 100644 --- a/packages/caddy/build.sh +++ b/packages/caddy/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://caddyserver.com/ TERMUX_PKG_DESCRIPTION="Fast, cross-platform HTTP/2 web server" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=1.0.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/mholt/caddy/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=c1c7b337a5008d28c1956fd4f057104a78d0e24b74c30867cea988369b61fed3 diff --git a/packages/direnv/build.sh b/packages/direnv/build.sh index af4b4ebc33..0f7a9185d6 100644 --- a/packages/direnv/build.sh +++ b/packages/direnv/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Environment switcher for shell" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=2.20.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=https://github.com/direnv/direnv/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=dd54393661602bb989ee880f14c41f7a7b47a153777999509127459edae52e47 TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/git-lfs/build.sh b/packages/git-lfs/build.sh index aefb4bd188..9873781741 100644 --- a/packages/git-lfs/build.sh +++ b/packages/git-lfs/build.sh @@ -3,10 +3,13 @@ TERMUX_PKG_DESCRIPTION="Git extension for versioning large files" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=2.8.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/git-lfs/git-lfs/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=10b476bb8862ebceddc6f0a55f5fb63e2c1e5bed6554f6e3b207dd0155a196ad termux_step_make() { + echo 'replace github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066 => github.com/git-lfs/go-ntlm c5056e7fa066' >> $TERMUX_PKG_SRCDIR/go.mod + termux_setup_golang export GOPATH=$TERMUX_PKG_BUILDDIR diff --git a/packages/gitea/build.sh b/packages/gitea/build.sh index e9e24f477e..84b3486a5f 100644 --- a/packages/gitea/build.sh +++ b/packages/gitea/build.sh @@ -2,12 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://gitea.io TERMUX_PKG_DESCRIPTION="Git with a cup of tea, painless self-hosted git service" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=1.8.3 -TERMUX_PKG_SHA256=77ca5fe4468a94454c05c433eace1a7e282a588aeae268387d8651751f8d4e27 +TERMUX_PKG_VERSION=1.9.2 +TERMUX_PKG_SHA256=229e3614bf50bc9fee7f378d422b4dea18d6cf607f94f100070fdfec6d0f2c05 TERMUX_PKG_SRCURL=https://github.com/go-gitea/gitea/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_DEPENDS="dash, git" termux_step_make() { + echo 'replace github.com/go-macaron/cors v0.0.0-20190309005821-6fd6a9bfe14e9 => github.com/go-macaron/cors 6fd6a9bfe14e' >> $TERMUX_PKG_SRCDIR/go.mod + termux_setup_golang export GOPATH=$TERMUX_PKG_BUILDDIR @@ -19,7 +21,9 @@ termux_step_make() { GOOS=linux GOARCH=amd64 go get -u github.com/jteeuwen/go-bindata/... export PATH="$PATH:$GOPATH/bin" - TAGS="bindata sqlite" make generate all + CGO_ENABLED=0 CGO_LDFLAGS="" CGO_CFLAGS="" GOOS=linux GOARCH=amd64 make generate + #CGO_ENABLED=0 CGO_LDFLAGS="" CGO_CFLAGS="" LDFLAGS="" TAGS="bindata sqlite" make all + LDFLAGS="" TAGS="bindata sqlite" make all } termux_step_make_install() { diff --git a/packages/gotty/build.sh b/packages/gotty/build.sh index 5d89b8ee67..55d3989157 100644 --- a/packages/gotty/build.sh +++ b/packages/gotty/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Share your terminal as a web application" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=1.0.1 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://github.com/yudai/gotty/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=32695d70a79f55efdf4fba6f06f830515a2055abc58fc15e2124dff5be75695b diff --git a/packages/hub/build.sh b/packages/hub/build.sh index be78da425e..accc7ac2ae 100644 --- a/packages/hub/build.sh +++ b/packages/hub/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://hub.github.com/ TERMUX_PKG_DESCRIPTION="Command-line wrapper for git that makes you better at GitHub" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=2.12.3 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/github/hub/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=197242fea670353688c541d2e4584b449f18c354a01d89bf1667ea33c0071ddc TERMUX_PKG_DEPENDS="git" diff --git a/packages/hugo/build.sh b/packages/hugo/build.sh index b661a5a992..3d93a3da27 100644 --- a/packages/hugo/build.sh +++ b/packages/hugo/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://gohugo.io/ TERMUX_PKG_DESCRIPTION="A fast and flexible static site generator" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_VERSION=0.57.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/gohugoio/hugo/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=435267c639ce58daea14c1f7d1f64bdd9176d20bd5719457e11051b88a6fffe6 TERMUX_PKG_DEPENDS="libc++" diff --git a/packages/ipfs/build.sh b/packages/ipfs/build.sh index 13b9d576c5..2f09388fab 100644 --- a/packages/ipfs/build.sh +++ b/packages/ipfs/build.sh @@ -3,8 +3,11 @@ TERMUX_PKG_DESCRIPTION="A peer-to-peer hypermedia distribution protocol" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.4.22 -TERMUX_PKG_SRCURL=https://github.com/ipfs/go-ipfs/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=85849d951ba376266ff8c9f08d53f1feeeda60b688bd6c0a0642a8cbcbacde12 +TERMUX_PKG_REVISION=1 +# Use a snapshot to fix building with go 1.13: +#TERMUX_PKG_SRCURL=https://github.com/ipfs/go-ipfs/archive/v${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SRCURL=https://github.com/ipfs/go-ipfs/archive/d5977fc4759137f13c8980323d577759dad3d923.zip +TERMUX_PKG_SHA256=7d8c791489b5de14aa72a78485d5ef87ada205b185b63d25467f42692e5d6d8d termux_step_make() { termux_setup_golang diff --git a/packages/keybase/build.sh b/packages/keybase/build.sh index 74f32a5c53..4ac9efc4b4 100644 --- a/packages/keybase/build.sh +++ b/packages/keybase/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://keybase.io TERMUX_PKG_DESCRIPTION="Key directory that maps social media identities to encryption keys" TERMUX_PKG_LICENSE="BSD 3-Clause" -TERMUX_PKG_VERSION=4.2.1 -TERMUX_PKG_SHA256=6f4087de46ee77eccdebc9cb56536237e1c35e437332d5f6dcb692ce8be36cb1 +TERMUX_PKG_VERSION=4.3.2 +TERMUX_PKG_SHA256=95300e1729b74a8fddd13b5f2ab35a3bd6f2e53402568d723e671b5cfc5d3778 TERMUX_PKG_SRCURL=https://github.com/keybase/client/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_REPLACES="kbfs" TERMUX_PKG_CONFLICTS="kbfs" diff --git a/packages/obfs4proxy/build.sh b/packages/obfs4proxy/build.sh index b67fe9d5d9..53b3f9413e 100644 --- a/packages/obfs4proxy/build.sh +++ b/packages/obfs4proxy/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A pluggable transport plugin for Tor" TERMUX_PKG_LICENSE="BSD 2-Clause, BSD 3-Clause, GPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.0.11 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/Yawning/obfs4/archive/obfs4proxy-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=46f621f1d94d244e7b1d0b93dafea7abadb2428f8b1d0463559426362ea98eae TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/rclone/build.sh b/packages/rclone/build.sh index d3abf5ee00..d0025251ee 100644 --- a/packages/rclone/build.sh +++ b/packages/rclone/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://rclone.org/ TERMUX_PKG_DESCRIPTION="rsync for cloud storage" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_VERSION=1.49.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/rclone/rclone/releases/download/v${TERMUX_PKG_VERSION}/rclone-v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bdb02ac657099a152a30c706323af1355b2152b01f1a47f11f7d15eb8edc18b4 diff --git a/packages/restic/build.sh b/packages/restic/build.sh index c030760f6b..082d8817f5 100644 --- a/packages/restic/build.sh +++ b/packages/restic/build.sh @@ -3,8 +3,11 @@ TERMUX_PKG_DESCRIPTION="Fast, secure, efficient backup program" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Leonid Plyushch " TERMUX_PKG_VERSION=0.9.5 -TERMUX_PKG_SRCURL=https://github.com/restic/restic/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=e22208e946ede07f56ef60c1c89de817b453967663ce4867628dff77761bd429 +TERMUX_PKG_REVISION=1 +# Use a snapshot to fix building with go 1.13: +#TERMUX_PKG_SRCURL=https://github.com/restic/restic/archive/v$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SRCURL=https://github.com/restic/restic/archive/604b18aa7426148a55f76307ca729e829ff6b61d.zip +TERMUX_PKG_SHA256=e1d8c977c541d9503a6aba643cf10896f0de488a20db96f162a3e91a4e9def70 TERMUX_PKG_SUGGESTS="openssh, rclone" termux_step_make() { diff --git a/packages/tweego/build.sh b/packages/tweego/build.sh index 26704ceab0..33285d2294 100644 --- a/packages/tweego/build.sh +++ b/packages/tweego/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://bitbucket.org/tmedwards/tweego TERMUX_PKG_DESCRIPTION="A free command line compiler for Twine/Twee story formats" TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=1.3.0 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=2.0.0 TERMUX_PKG_SRCURL=https://bitbucket.org/tmedwards/tweego/get/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=1c62e3d91d7f3b208695896a51b19771e6f94af7b42d99aa00022b405473d895 +TERMUX_PKG_SHA256=59aef611a91a8a79cc7d216d401b3f3536077da8b3d3a8013ae42633e9c7e736 termux_step_make() { termux_setup_golang