Attachment 269653 Details for Bug 293829 – 0001-net-p2p-go-ethereum-Update-1.16.8-1.17.2.patch

[patch] 0001-net-p2p-go-ethereum-Update-1.16.8-1.17.2.patch

0001-net-p2p-go-ethereum-Update-1.16.8-1.17.2.patch (text/plain), 4.73 KB, created by Yusuf Yaman on 2026-04-12 07:37:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuf Yaman

Created: 2026-04-12 07:37:28 UTC

Size: 4.73 KB

patch

obsolete

>From fcaeb2b65bb52326476b33cba9c1be07e69044b7 Mon Sep 17 00:00:00 2001
>From: Enrique Fynn <me@enriquefynn.com>
>Date: Sat, 11 Apr 2026 23:43:56 +0300
>Subject: [PATCH] net-p2p/go-ethereum: Update 1.16.8 => 1.17.2
>
>Changelogs:
>* https://github.com/ethereum/go-ethereum/releases/tag/v1.16.9
>* https://github.com/ethereum/go-ethereum/releases/tag/v1.17.0
>* https://github.com/ethereum/go-ethereum/releases/tag/v1.17.1
>* https://github.com/ethereum/go-ethereum/releases/tag/v1.17.2
>
>Port changes:
>* Sort pkg-plist.
>* Drop backported patch since it's in upstream now
>
>PR:		293829
>Reported by:	Enrique Fynn <me@enriquefynn.com> (maintainer)
>MFH:		2026Q2
>Security:	CVE-2026-26313
>Security:	CVE-2026-26314
>Security:	CVE-2026-26315
>---
> net-p2p/go-ethereum/Makefile                  | 11 ++++-----
> net-p2p/go-ethereum/distinfo                  | 10 ++++----
> ...or_github.com_karalabe_hid_hid__enabled.go | 23 -------------------
> net-p2p/go-ethereum/pkg-plist                 |  7 ++++--
> 4 files changed, 15 insertions(+), 36 deletions(-)
> delete mode 100644 net-p2p/go-ethereum/files/patch-vendor_github.com_karalabe_hid_hid__enabled.go
>
>diff --git a/net-p2p/go-ethereum/Makefile b/net-p2p/go-ethereum/Makefile
>index 847ac5afa4c0..9467e6086dcb 100644
>--- a/net-p2p/go-ethereum/Makefile
>+++ b/net-p2p/go-ethereum/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	go-ethereum
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.16.8
>-PORTREVISION=	3
>+DISTVERSION=	1.17.2
> CATEGORIES=	net-p2p
> 
> MAINTAINER=	me@enriquefynn.com
>@@ -11,8 +10,8 @@ WWW=		https://github.com/ethereum/go-ethereum
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libiconv.so:converters/libiconv \
>-		libhidapi.so:comms/hidapi
>+LIB_DEPENDS=	libhidapi.so:comms/hidapi \
>+		libiconv.so:converters/libiconv
> 
> USES=		cpe go:modules
> CPE_VENDOR=	ethereum
>@@ -22,13 +21,13 @@ GO_MODULE=	github.com/ethereum/go-ethereum
> 
> CGO_LDFLAGS=	-liconv
> 
>-TMPDIR=	${WRKDIR}
>+TMPDIR=		${WRKDIR}
> 
> OPTIONS_DEFINE=	DEVTOOLS
> OPTIONS_SUB=	yes
> DEVTOOLS_DESC=	Ethereum developer tools
> 
>-DEVTOOLS_VARS=		GO_TARGET="./cmd/geth ./cmd/abigen ./cmd/evm ./cmd/rlpdump ./cmd/clef"
>+DEVTOOLS_VARS=		GO_TARGET="./cmd/geth ./cmd/abigen ./cmd/evm ./cmd/rlpdump ./cmd/clef ./cmd/ethkey ./cmd/blsync ./cmd/era"
> DEVTOOLS_VARS_OFF=	GO_TARGET=./cmd/geth
> 
> .include <bsd.port.mk>
>diff --git a/net-p2p/go-ethereum/distinfo b/net-p2p/go-ethereum/distinfo
>index db8c145512f5..fa4c17926446 100644
>--- a/net-p2p/go-ethereum/distinfo
>+++ b/net-p2p/go-ethereum/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1770233730
>-SHA256 (go/net-p2p_go-ethereum/go-ethereum-v1.16.8/v1.16.8.mod) = 1d074633a25a2488327fb9a629d35118e472d6d4fd7903a4ec25877ca403f0b1
>-SIZE (go/net-p2p_go-ethereum/go-ethereum-v1.16.8/v1.16.8.mod) = 7139
>-SHA256 (go/net-p2p_go-ethereum/go-ethereum-v1.16.8/v1.16.8.zip) = aefb8134bf81b4332e5c3a82e81bd8a920adc4a786b91c91f85f25dd2a4c442a
>-SIZE (go/net-p2p_go-ethereum/go-ethereum-v1.16.8/v1.16.8.zip) = 22906212
>+TIMESTAMP = 1775931555
>+SHA256 (go/net-p2p_go-ethereum/go-ethereum-v1.17.2/v1.17.2.mod) = 82ed3bdb0efc7392f913361c306af3cd11089fa9c9815815ee6dbcc99966fe06
>+SIZE (go/net-p2p_go-ethereum/go-ethereum-v1.17.2/v1.17.2.mod) = 7891
>+SHA256 (go/net-p2p_go-ethereum/go-ethereum-v1.17.2/v1.17.2.zip) = c5f5c0a1bd98e174cea63bc88634dc9ef9f4d582fcb4f063873d4904df994916
>+SIZE (go/net-p2p_go-ethereum/go-ethereum-v1.17.2/v1.17.2.zip) = 23590148
>diff --git a/net-p2p/go-ethereum/files/patch-vendor_github.com_karalabe_hid_hid__enabled.go b/net-p2p/go-ethereum/files/patch-vendor_github.com_karalabe_hid_hid__enabled.go
>deleted file mode 100644
>index 1274c8e490e7..000000000000
>--- a/net-p2p/go-ethereum/files/patch-vendor_github.com_karalabe_hid_hid__enabled.go
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- vendor/github.com/karalabe/hid/hid_enabled.go.orig	2026-02-04 22:48:45 UTC
>-+++ vendor/github.com/karalabe/hid/hid_enabled.go
>-@@ -31,7 +31,7 @@ specifically for the linux platform, below.
>- #cgo windows LDFLAGS: -lsetupapi
>- 
>- #cgo freebsd CFLAGS: -DOS_FREEBSD
>--#cgo freebsd LDFLAGS: -lusb
>-+#cgo freebsd LDFLAGS: -lhidapi -lusb
>- 
>- #cgo openbsd CFLAGS: -DOS_OPENBSD
>- 
>-@@ -64,8 +64,9 @@ specifically for the linux platform, below.
>- #elif OS_WINDOWS
>- 	#include "hidapi/windows/hid.c"
>- #elif OS_FREEBSD
>--	#include <libusb.h>
>--	#include "hidapi/libusb/hid.c"
>-+	#include <stdlib.h>
>-+	#include <wchar.h>
>-+	#include <hidapi/hidapi.h>
>- #elif DOS_OPENBSD
>- 	#include "hidapi/libusb/hid.c"
>- #endif
>diff --git a/net-p2p/go-ethereum/pkg-plist b/net-p2p/go-ethereum/pkg-plist
>index 2a0d45e37b4b..8393bb37d9ec 100644
>--- a/net-p2p/go-ethereum/pkg-plist
>+++ b/net-p2p/go-ethereum/pkg-plist
>@@ -1,5 +1,8 @@
>-bin/geth
> %%DEVTOOLS%%bin/abigen
>+%%DEVTOOLS%%bin/blsync
>+%%DEVTOOLS%%bin/clef
>+%%DEVTOOLS%%bin/era
>+%%DEVTOOLS%%bin/ethkey
> %%DEVTOOLS%%bin/evm
> %%DEVTOOLS%%bin/rlpdump
>-%%DEVTOOLS%%bin/clef
>+bin/geth
>-- 
>2.53.0
>

Actions: View | Diff

Attachments on bug 293829: 268817 | 269641 | 269653 | 269654 | 269665 | 269719