Hi,
update of sysutils/fzf for version 0.43.0
Changelog: https://github.com/junegunn/fzf/releases/tag/0.43.0
- update of Makefile, distinfo and modules.inc for v0.43.0
- simplify WRKDIST in Makefile
- add a patch to fix issue with 'fzf --listen' command (add inet for pledge),
reported by semarie@
Build and tests OK on current/amd64 with Go 1.21.1.
Tests/comments welcome and please commit if OK.
Laurent
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/fzf/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 19 Jun 2023 19:28:08 -0000 1.21
+++ Makefile 16 Oct 2023 11:27:41 -0000
@@ -1,9 +1,9 @@
COMMENT = command-line fuzzy finder
MODGO_MODNAME = github.com/junegunn/fzf
-MODGO_VERSION = v0.0.0-20230614153741-d471067e3f46
+MODGO_VERSION = v0.0.0-20231014165605-d3311d9f43d0
-V = 0.42.0
+V = 0.43.0
DISTNAME = fzf-${V}
CATEGORIES = sysutils
@@ -27,7 +27,7 @@ MODGO_LDFLAGS += -X main.revision=""
RUN_DEPENDS = shells/bash
# for patch to apply
-WRKDIST = ${WRKOBJDIR}/${DISTNAME}/${MODGO_MODNAME}@${MODGO_VERSION}
+WRKDIST = ${WRKSRC}
# Note that unlike zsh and fish, bash has no well-defined site functions
# directory from which to autoload stuff.
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/fzf/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 19 Jun 2023 19:28:08 -0000 1.14
+++ distinfo 16 Oct 2023 11:27:41 -0000
@@ -1,4 +1,4 @@
-SHA256 (fzf-0.42.0.zip) = Ynau5mUAQkjDp60ao0+vUsy/B8sPq4JMx1HbFB/ZH94=
+SHA256 (fzf-0.43.0.zip) = +ahxVf32QagRcSBSv7TVyMIi4TQ13k5q5PPgb2FoFUU=
SHA256 (go_modules/github.com/gdamore/encoding/@v/v1.0.0.mod) = pJgRJVFfDy3yU8LeOjrBlwx0Q+W2adlH6HTnezaBtuU=
SHA256 (go_modules/github.com/gdamore/encoding/@v/v1.0.0.zip) = Y4qYMuL2LRGNfFEdhr2uFiKlHzMd5IoB2Sn9JOvmoqY=
SHA256 (go_modules/github.com/gdamore/tcell/v2/@v/v2.5.4.mod) = 4zhutrVn0oD6CGHqAr93IkVDVuXmzBVThvjmX/RGQ5E=
@@ -37,12 +37,12 @@ SHA256 (go_modules/golang.org/x/sys/@v/v
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220811171246-fbc7d0a398ab.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.8.0.zip) = JYizpkWDg5DjQfEAf4Z59eERe11ayUZ++DLRSLIhmjg=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.13.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.13.0.zip) = PRSa/Jk5mANUN0wNR0Ydzb0dOYDrL3fmAwSyP+5vPTc=
SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo=
SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = dAeU4pFPXMh+JWVsWEMiKyxlZlghIF9FYyoEd8jT95s=
-SHA256 (go_modules/golang.org/x/term/@v/v0.8.0.mod) = XTYtaoNFP3Akcl6CTAXFlJYk749MsT9dfj1Lfxygsyc=
-SHA256 (go_modules/golang.org/x/term/@v/v0.8.0.zip) = GWHf6lnOUx4tbmoyKHgfWViyfG2dnAmTL1/8VMTZzfk=
+SHA256 (go_modules/golang.org/x/term/@v/v0.13.0.mod) = Jid7C1vDPQJB8jN4OeimY9KmxgMFiHDyfO2d8f7n41c=
+SHA256 (go_modules/golang.org/x/term/@v/v0.13.0.zip) = ohQBM6te3qSG7JI52gGZXmBuYmHWbRpnPNKt0z0ID90=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.7.mod) = xF1mkIlCe8RjXQexhfm5aAMy0cSMdbPEnLcVuBoEpbA=
@@ -54,7 +54,7 @@ SHA256 (go_modules/golang.org/x/tools/@v
SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.zip) = SxIuDkcDvEAUyxz4wBT8+T6n1y8B2nlJk2U0b1TLuFE=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.zip) = xOnwY8/tVGyQ8AqWV96sT5FaiZT4y+bb0/GOeeuDAs8=
-SIZE (fzf-0.42.0.zip) = 283506
+SIZE (fzf-0.43.0.zip) = 291787
SIZE (go_modules/github.com/gdamore/encoding/@v/v1.0.0.mod) = 77
SIZE (go_modules/github.com/gdamore/encoding/@v/v1.0.0.zip) = 19867
SIZE (go_modules/github.com/gdamore/tcell/v2/@v/v2.5.4.mod) = 308
@@ -93,12 +93,12 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220811171246-fbc7d0a398ab.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.8.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.8.0.zip) = 1894928
+SIZE (go_modules/golang.org/x/sys/@v/v0.13.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.13.0.zip) = 1901653
SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95
SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = 95
-SIZE (go_modules/golang.org/x/term/@v/v0.8.0.mod) = 67
-SIZE (go_modules/golang.org/x/term/@v/v0.8.0.zip) = 19924
+SIZE (go_modules/golang.org/x/term/@v/v0.13.0.mod) = 68
+SIZE (go_modules/golang.org/x/term/@v/v0.13.0.zip) = 19958
SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25
SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97
SIZE (go_modules/golang.org/x/text/@v/v0.3.7.mod) = 97
Index: modules.inc
===================================================================
RCS file: /cvs/ports/sysutils/fzf/modules.inc,v
retrieving revision 1.4
diff -u -p -r1.4 modules.inc
--- modules.inc 4 Jun 2023 07:40:34 -0000 1.4
+++ modules.inc 16 Oct 2023 11:27:41 -0000
@@ -12,8 +12,8 @@ MODGO_MODULES = \
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \
golang.org/x/net v0.0.0-20220722155237-a158d28d115b \
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 \
- golang.org/x/sys v0.8.0 \
- golang.org/x/term v0.8.0 \
+ golang.org/x/sys v0.13.0 \
+ golang.org/x/term v0.13.0 \
golang.org/x/text v0.5.0 \
golang.org/x/tools v0.1.12 \
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
Index: patches/patch-src_protector_protector_openbsd_go
===================================================================
RCS file: patches/patch-src_protector_protector_openbsd_go
diff -N patches/patch-src_protector_protector_openbsd_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_protector_protector_openbsd_go 16 Oct 2023 11:27:41 -0000
@@ -0,0 +1,13 @@
+Add inet for pledge => see issue#3481
+https://github.com/junegunn/fzf/issues/3481
+
+Index: src/protector/protector_openbsd.go
+--- src/protector/protector_openbsd.go.orig
++++ src/protector/protector_openbsd.go
+@@ -6,5 +6,5 @@ import "golang.org/x/sys/unix"
+
+ // Protect calls OS specific protections like pledge on OpenBSD
+ func Protect() {
+- unix.PledgePromises("stdio rpath tty proc exec")
++ unix.PledgePromises("stdio rpath tty proc exec inet")
+ }