From 42ad40f49a16da9c8b048680a3945abbb05aa817 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Thu, 6 May 2021 12:34:40 +0000 Subject: [PATCH] geth: update to 1.10.3 --- packages/geth/build.sh | 4 ++-- packages/geth/usb.patch | 41 ++++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/packages/geth/build.sh b/packages/geth/build.sh index b58379d521..9b9a486ed4 100644 --- a/packages/geth/build.sh +++ b/packages/geth/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://geth.ethereum.org/ TERMUX_PKG_DESCRIPTION="Go implementation of the Ethereum protocol" TERMUX_PKG_LICENSE="LGPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Pliushch " -TERMUX_PKG_VERSION=1.10.2 +TERMUX_PKG_VERSION=1.10.3 TERMUX_PKG_SRCURL=https://github.com/ethereum/go-ethereum/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=bb98065fadca84ad7f8a3536739071192aaaa154dbebefc7d613220718f84941 +TERMUX_PKG_SHA256=693d202e3ee4a989c753ffd5032572621e3ee243eb344e6d0bfad5e2fe4ffa0d termux_step_make() { termux_setup_golang diff --git a/packages/geth/usb.patch b/packages/geth/usb.patch index 53189f921b..40fba7794a 100644 --- a/packages/geth/usb.patch +++ b/packages/geth/usb.patch @@ -1,8 +1,6 @@ -This patch will not be necessary once https://github.com/karalabe/usb/pull/14 has been merged. - -diff -uNr go-ethereum-1.10.2/accounts/usbwallet/hub.go go-ethereum-1.10.2.mod/accounts/usbwallet/hub.go ---- go-ethereum-1.10.2/accounts/usbwallet/hub.go 2021-04-08 11:02:25.000000000 +0000 -+++ go-ethereum-1.10.2.mod/accounts/usbwallet/hub.go 2021-05-04 14:37:49.283368163 +0000 +diff -uNr go-ethereum-1.10.3/accounts/usbwallet/hub.go go-ethereum-1.10.3.mod/accounts/usbwallet/hub.go +--- go-ethereum-1.10.3/accounts/usbwallet/hub.go 2021-05-05 11:20:06.000000000 +0000 ++++ go-ethereum-1.10.3.mod/accounts/usbwallet/hub.go 2021-05-06 13:36:26.658385060 +0000 @@ -26,7 +26,7 @@ "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/event" @@ -12,9 +10,9 @@ diff -uNr go-ethereum-1.10.2/accounts/usbwallet/hub.go go-ethereum-1.10.2.mod/ac ) // LedgerScheme is the protocol scheme prefixing account and wallet URLs. -diff -uNr go-ethereum-1.10.2/accounts/usbwallet/wallet.go go-ethereum-1.10.2.mod/accounts/usbwallet/wallet.go ---- go-ethereum-1.10.2/accounts/usbwallet/wallet.go 2021-04-08 11:02:25.000000000 +0000 -+++ go-ethereum-1.10.2.mod/accounts/usbwallet/wallet.go 2021-05-04 14:37:55.783368221 +0000 +diff -uNr go-ethereum-1.10.3/accounts/usbwallet/wallet.go go-ethereum-1.10.3.mod/accounts/usbwallet/wallet.go +--- go-ethereum-1.10.3/accounts/usbwallet/wallet.go 2021-05-05 11:20:06.000000000 +0000 ++++ go-ethereum-1.10.3.mod/accounts/usbwallet/wallet.go 2021-05-06 13:36:26.658385060 +0000 @@ -31,7 +31,7 @@ "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" @@ -24,22 +22,22 @@ diff -uNr go-ethereum-1.10.2/accounts/usbwallet/wallet.go go-ethereum-1.10.2.mod ) // Maximum time between wallet health checks to detect USB unplugs. -diff -uNr go-ethereum-1.10.2/go.mod go-ethereum-1.10.2.mod/go.mod ---- go-ethereum-1.10.2/go.mod 2021-04-08 11:02:25.000000000 +0000 -+++ go-ethereum-1.10.2.mod/go.mod 2021-05-04 14:39:41.515369240 +0000 -@@ -36,7 +36,7 @@ +diff -uNr go-ethereum-1.10.3/go.mod go-ethereum-1.10.3.mod/go.mod +--- go-ethereum-1.10.3/go.mod 2021-05-05 11:20:06.000000000 +0000 ++++ go-ethereum-1.10.3.mod/go.mod 2021-05-06 13:41:23.670391169 +0000 +@@ -42,7 +42,7 @@ github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e github.com/julienschmidt/httprouter v1.2.0 - github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 + github.com/fornwall/usb v0.0.0-20191212001557-3a1f5af8866c + github.com/kylelemons/godebug v1.1.0 // indirect github.com/mattn/go-colorable v0.1.0 github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035 - github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 -diff -uNr go-ethereum-1.10.2/go.sum go-ethereum-1.10.2.mod/go.sum ---- go-ethereum-1.10.2/go.sum 2021-04-08 11:02:25.000000000 +0000 -+++ go-ethereum-1.10.2.mod/go.sum 2021-05-04 14:40:35.155369756 +0000 -@@ -153,6 +153,8 @@ +diff -uNr go-ethereum-1.10.3/go.sum go-ethereum-1.10.3.mod/go.sum +--- go-ethereum-1.10.3/go.sum 2021-05-05 11:20:06.000000000 +0000 ++++ go-ethereum-1.10.3.mod/go.sum 2021-05-06 13:39:32.890388869 +0000 +@@ -131,6 +131,8 @@ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -48,3 +46,12 @@ diff -uNr go-ethereum-1.10.2/go.sum go-ethereum-1.10.2.mod/go.sum github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +@@ -244,8 +246,6 @@ + github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= + github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= + github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= +-github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 h1:I/yrLt2WilKxlQKCM52clh5rGzTKpVctGT1lH4Dc8Jw= +-github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= + github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= + github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= + github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=