Hi,
update for sysutils/fzf with the latest version 0.44.1
- update Makefile, distinfo and modules.inc
- update PLIST to add bin/fzf-preview.sh (new in 0.44.0 version)
- modify patch for src/protector/protector_openbsd_go:
* remove inet for pledge (merged upstream with my PR
https://github.com/junegunn/fzf/pull/3483)
* add tmppath for pledge => needed by tools that uses /tmp directory with
temporary files (I will submit an PR to add it upstream)
Build and tests OK on current/amd64 with Go 1.21.3.
Tests/comments welcome and please commit if OK.
Laurent
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/fzf/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 17 Oct 2023 13:43:53 -0000 1.22
+++ Makefile 19 Nov 2023 08:45:41 -0000
@@ -1,9 +1,9 @@
COMMENT = command-line fuzzy finder
MODGO_MODNAME = github.com/junegunn/fzf
-MODGO_VERSION = v0.0.0-20231014165605-d3311d9f43d0
+MODGO_VERSION = v0.0.0-20231117101700-d7d2ac39513f
-V = 0.43.0
+V = 0.44.1
DISTNAME = fzf-${V}
CATEGORIES = sysutils
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/fzf/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 17 Oct 2023 13:43:53 -0000 1.15
+++ distinfo 19 Nov 2023 08:45:41 -0000
@@ -1,4 +1,4 @@
-SHA256 (fzf-0.43.0.zip) = +ahxVf32QagRcSBSv7TVyMIi4TQ13k5q5PPgb2FoFUU=
+SHA256 (fzf-0.44.1.zip) = Z7IDQP5IKomXtvHSis7zng1Nykffq8AOGvAw+PWpGb8=
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=
@@ -38,7 +38,8 @@ SHA256 (go_modules/golang.org/x/sys/@v/v
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.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/sys/@v/v0.14.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.14.0.zip) = uJkTyWdZSsEE3AjxtqLxrIiNDQAUlPgOBTzpXQoTmJ0=
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.13.0.mod) = Jid7C1vDPQJB8jN4OeimY9KmxgMFiHDyfO2d8f7n41c=
@@ -54,7 +55,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.43.0.zip) = 291787
+SIZE (fzf-0.44.1.zip) = 296093
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
@@ -94,7 +95,8 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.
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.13.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.13.0.zip) = 1901653
+SIZE (go_modules/golang.org/x/sys/@v/v0.14.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.14.0.zip) = 1900122
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.13.0.mod) = 68
Index: modules.inc
===================================================================
RCS file: /cvs/ports/sysutils/fzf/modules.inc,v
retrieving revision 1.5
diff -u -p -r1.5 modules.inc
--- modules.inc 17 Oct 2023 13:43:53 -0000 1.5
+++ modules.inc 19 Nov 2023 08:45:41 -0000
@@ -12,7 +12,7 @@ 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.13.0 \
+ golang.org/x/sys v0.14.0 \
golang.org/x/term v0.13.0 \
golang.org/x/text v0.5.0 \
golang.org/x/tools v0.1.12 \
@@ -31,6 +31,7 @@ MODGO_MODFILES = \
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a \
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f \
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab \
+ golang.org/x/sys v0.13.0 \
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 \
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 \
golang.org/x/text v0.3.0 \
Index: patches/patch-src_protector_protector_openbsd_go
===================================================================
RCS file: /cvs/ports/sysutils/fzf/patches/patch-src_protector_protector_openbsd_go,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_protector_protector_openbsd_go
--- patches/patch-src_protector_protector_openbsd_go 17 Oct 2023 13:43:53 -0000 1.1
+++ patches/patch-src_protector_protector_openbsd_go 19 Nov 2023 08:45:41 -0000
@@ -1,6 +1,3 @@
-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
@@ -8,6 +5,6 @@ Index: src/protector/protector_openbsd.g
// 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")
+- unix.PledgePromises("stdio rpath tty proc exec inet")
++ unix.PledgePromises("stdio rpath tty proc exec inet tmppath")
}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/fzf/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 11 Mar 2022 19:57:26 -0000 1.4
+++ pkg/PLIST 19 Nov 2023 08:45:41 -0000
@@ -1,4 +1,5 @@
@bin bin/fzf
+bin/fzf-preview.sh
bin/fzf-tmux
@man man/man1/fzf-tmux.1
@man man/man1/fzf.1
