CVS commit: pkgsrc/misc/tmux

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 18 20:30:49 UTC 2026

Modified Files:
        pkgsrc/misc/tmux: Makefile distinfo
        pkgsrc/misc/tmux/patches: patch-compat_imsg-buffer.c
Removed Files:
        pkgsrc/misc/tmux/patches: patch-compat_daemon-darwin.c
            patch-osdep-darwin.c

Log Message:
tmux: update to 3.6a.

CHANGES FROM 3.6 TO 3.6a

* Fix a buffer overread and an infinite loop in format processing (reported by
  Giorgi Kobakhia, issue 4735).

* Allow drag in alternate screen again (issue 4743 reported by Brad King).

* Fix y offset of mouse if status at top (issue 4738 from Michael Grant).

* Add a missing skin tone (from Jake Stewart, issue 4736).

* Allow characters to be combined in either order (issue 4726, reported by Jake
  Stewart).

* Fix horizontal mouse resizing when pane status lines are on (from Michael
  Grant, issue 4720).

* Fix noattr so it does not delete attributes set in the style itself (issue
  4713).

* Newer libevents do not allow event_del on a zero'd event (issue 4706).

* Place cursor on correct line if message-line is not 0 (issue 4707).

* Fix compile error on FreeBSD (from Yasuhiro Kimura, issue 4701).

CHANGES FROM 3.5a TO 3.6

* Add seconds options for clock mode (issue 4697).

* Add a resize callback for menus so that they are correctly moved on resize
  (issue 4696).

* Make -v to source-file pass through to subsequent source-file commands (issue
  4216).

* If display-popup is used inside a popup, modify that popup (issue 4678).

* Add selection-mode command to expilcitly set the selection mode in copy mode
  (issue 3842).

* Save and restore images in alternate screen (issue 3732).

* Ignore Hangul filler character (issue 3998).

* Improve handling of regional indicators and emoji modifiers (issue 3998).

* Preserve marked pane with swap-window and move-window (issue 3443).

* Set and check COLORTERM as a hint for RGB colour.

* If tmux receives a palette request (OSC 4) in a pane and the palette entry
  has not been set, send a request to the most recently used client and
  forward any response instead (based on change from Tim Culverhouse, issue
  4665).

* Add -l flag to command-prompt to disable splitting into multiple prompts
  (issue 4483).

* Don't enter copy mode on mouse wheel in alternate screen (issue 3705).

* Add commands to centre the cursor in copy mode (issue 4662).

* Support case insensitive search in modes in the same way as copy mode
  (like emacs, so all-lowercase means case insensitive) (issue 4396).

* Fix the logic of the no-detached case for the detach-on-destroy option (from
  Martin Louazel, issue 4649).

* Add buffer_full format variable (from Mohammad AlSaleh, issue 4630).

* Introduce a new window option, tiled-layout-max-columns, which configures the
  maximum number of columns in the tiled layout.

* Add support for DECRQSS SP q (report cursor style), DECRQM ?12 (report cursor
  blink state) and DECRQM ?2004, ?1004, ?1006 (report mouse state) ( rom
  Andrea Alberti, issue 4618).

* Fix missing argument from OSC 4 reply (issue 4596).

* Add -k flag to display-popup which allows any key to dismiss the popup once
  the command has exited (from Meriel Luna Mittelbach, issue 4612).

* Add nicer default second and third status lines (from Michael Grant, issue
  4490).

* Add a pane-border-lines "spaces" value to use spaces for pane borders (issue
  4587).

* Replace invalid UTF-8 characters with the placeholder instead of ignoring
  them (issue 4514).

* Fix incorrect handling of Korean Hangul Jamo characters (from Roy Jung, issue
  4546).

* Allow uppercase letters in gray/grey color names (from Pavel Roskin, issue
  4560).

* Add sorting to W, P, L loop operators (from Michael Grant, issue 4516).

* Detect support for OSC 52 using the device attributes report (from James
  Holderness, issue 4539).

* Add noattr for styles and use in mode-style to allow whether attributes are
  ignored or used to be configured (issue 4498).

* Add a set-default style attribute which replaces the current default colours
  and attributes completely.

* Add -E to run-shell to forward stderr as well as stdout (issue 4246).

* Add an option variation-selector-always-wide to instruct tmux not to
  always interpret VS16 as a wide character and assume the terminal does
  likewise.

* Switch to getopt_long from OpenSSH (from Koichi Murase, issue 4492).

* Add more features for boolean expressions in formats: 1) extend && and || to
  support arbitrarily many arguments and 2) add ! and !! for not and not-not
  (from David Mandelberg).

* Do not mistake other DCS sequences for SIXEL sequences (from James
  Holderness, issue 4488).

* Improve #? conditional expression in formats: add support for else if and
  default empty string if no else value (from David Mandelberg, issue 4451).

* Add default-client-command to set the command used if tmux is run without a
  command; the default stays new-session (from David Mandelberg, issue
  4422).

* Add S-Up and S-Down to move windows in tree mode (from David Mandelberg,
  issue 4415).

* Add mode 2031 support to automatically report dark or light theme. tmux will
  guess the theme from the background colour on terminals which do not
  themselves support the escape sequence (from Jonathan Slenders, issue 4353).

* Add -M flag to capture-pane to use the copy mode screen (issue 4358).

* Align index numbers in trees (from David Mandelberg, issue 4360).

* Add display-message -C flag to update pane while message is displayed (from
  Vitaly Ostrosablin, issue 4363).

* Make list-commands command show only one command if an argument is given
  (from Ilya Grigoriev, issue 4352).

* Count line numbers correctly inside strings in configuration files (reported
  by Pedro Navarro, issue 4325).

* Map bright black (colour 8) to white (7) if the background is black on
  terminals with only eight colours so the text is not invisible (from Dmytro
  Bagrii, issue 4322).

* New codepoint-widths option allowing users to override the width of
  individual Unicode codepoints.

* Add a nesting limit to source-file (from Fadi Afani, issue 4223).

* Add copy-mode-position-style and copy-mode-selection-style options for copy
  mode.

* Add no-detach-on-destroy client option (issue 4242).

* Add input-buffer-size option (from Ken Lau).

* Add support for a scrollbar at the side of each pane. New options
  pane-scrollbars turn them on or off, pane-scrollbars-position sets the
  position (left or right), and pane-scrollbars-style to set the colours (from
  Michael Grant, issue 4221).

* Allow control characters to be entered at the command prompt by prefixing
  with C-v (from Alexander Arch, issue 4206).

* Do not attempt to search for zero length strings (from Alexander Arch, issue
  4209).

* Preserve tabs for copying and capture-pane (from Alexander Arch, issue
  4201).

* Increase the maximum for repeat-time.

* Adjust how Ctrl and Meta keys are sent to use standard representation if
  available in mode 1 (from Stanislav Kljuhhin, issue 4188).

* Allow attributes in menu style (from Japin Li, issue 4194).

* Add a sixel_support format variable which is 1 if SIXEL is supported, always
  0 on OpenBSD (requested by Misaki Masa, issue 4177).

* Add prompt-cursor-colour and prompt-cursor-style to set the style of the
  cursor in the command prompt and remove the emulated cursor (from Alexander
  Arch, issue 4170).

* Add initial-repeat-time option to allow the first repeat time to be increased
  and later reduced (from David le Blanc, issue 4164).

* Send focus events to pane when entering or leaving popup (issue 3991).

* Add copy-mode-position-format to configure the position indicator.

* Add -y flag to disable confirmation prompts in modes (issue 4152).

* Add -C and -P flags to the copy commands in copy mode: -C prevents the
  commands from sending the text to the clipboard and -P prevents them from
  adding the text as a paste buffer (issue 4153).

* Preserve transparency and raster attribute dimensions when sending a SIXEL
  image, and avoid collapsing empty lines (issue 4149).

* Bypass permission check for Cygwin (based on a change by Yuya Adachi via
  Rafael Kitover, issue 4148).

* Add MSYSTEM to default update-environment (for Cgywin).

* Set client stdout file descriptor also for Cgywin (from Michael Wild via Rafael
  Kitover, issue 4148).

* Use global cursor style and colour options for modes instead of default
  (issue 4117).

* Fix pasting so it does not interpret keys but instead copies the input
  without interpretation (reported by Mark Kelly).

* Try to query window pixel size from the outside terminal if the values
  returned by TIOCGWINSZ are zero (Dmitry Galchinsky, issue 4099).


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/misc/tmux/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/misc/tmux/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/tmux/patches/patch-compat_daemon-darwin.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c
cvs rdiff -u -r1.4 -r0 pkgsrc/misc/tmux/patches/patch-osdep-darwin.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/tmux/Makefile
diff -u pkgsrc/misc/tmux/Makefile:1.68 pkgsrc/misc/tmux/Makefile:1.69
--- pkgsrc/misc/tmux/Makefile:1.68      Sun Oct  5 10:53:23 2025
+++ pkgsrc/misc/tmux/Makefile   Sun Jan 18 20:30:48 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2025/10/05 10:53:23 js Exp $
+# $NetBSD: Makefile,v 1.69 2026/01/18 20:30:48 wiz Exp $
 
-DISTNAME=      tmux-3.5a
+DISTNAME=      tmux-3.6a
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tmux/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}

Index: pkgsrc/misc/tmux/distinfo
diff -u pkgsrc/misc/tmux/distinfo:1.61 pkgsrc/misc/tmux/distinfo:1.62
--- pkgsrc/misc/tmux/distinfo:1.61      Mon Oct  6 07:42:31 2025
+++ pkgsrc/misc/tmux/distinfo   Sun Jan 18 20:30:48 2026
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.61 2025/10/06 07:42:31 leot Exp $
+$NetBSD: distinfo,v 1.62 2026/01/18 20:30:48 wiz Exp $
 
-BLAKE2s (tmux-3.5a.tar.gz) = 9dc22390e1eee87b1c7f3edf102752edbc8bd9d669403ba539485ceaf6f0022a
-SHA512 (tmux-3.5a.tar.gz) = 2383e99aec2dcdb1d899793d5ecab40a68b921194f84770d3f4d19712bfc85590657a99d2a9a7bec36d4ba5ab39fa713f13937b0acad3b61cd9b2302dba61d43
-Size (tmux-3.5a.tar.gz) = 715619 bytes
+BLAKE2s (tmux-3.6a.tar.gz) = 6fb0b99293cc877b8d78dafb267851e332b9ac03635ad7875cb423ab78e3c921
+SHA512 (tmux-3.6a.tar.gz) = bdc1a1dc7505b98966c5ed1303decc0cad883aae73ed9bc6d628ae060a7e9c4828a6ad64335de2a2f9b610118ce161ba456185676bb289c6f063091afa0a5b8b
+Size (tmux-3.6a.tar.gz) = 750698 bytes
 SHA1 (patch-client.c) = 5fe1e0c82665b805573dab59c7f3faa5fc2c8abe
-SHA1 (patch-compat_daemon-darwin.c) = e8feeb4b100e73ab197eb2fd776fa648a1da28e4
-SHA1 (patch-compat_imsg-buffer.c) = 0143b23778ff62cf3c66b9930120ffee84f259d4
+SHA1 (patch-compat_imsg-buffer.c) = a4946b98414a0fbd8d3799f2622c5e736bb90833
 SHA1 (patch-compat_queue.h) = a65435dedb40f653f3c2650a6d2189743f5a6dcd
-SHA1 (patch-osdep-darwin.c) = 715b1e206add7d911edec381942706220ea2fbb6
 SHA1 (patch-proc.c) = 500f9f7d33fdd7a554e77ec0a04358aac0eb0521
 SHA1 (patch-tmux.c) = 9d7901d4f8e2be49d542f294d0eda92e3a9c9a07

Index: pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c
diff -u pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c:1.2 pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c:1.3
--- pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c:1.2     Sun Oct  5 11:04:21 2025
+++ pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c Sun Jan 18 20:30:49 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-compat_imsg-buffer.c,v 1.2 2025/10/05 11:04:21 leot Exp $
+$NetBSD: patch-compat_imsg-buffer.c,v 1.3 2026/01/18 20:30:49 wiz Exp $
 
 Add support for QNX.
 
---- compat/imsg-buffer.c.orig  2024-01-17 10:56:43.000000000 +0000
+--- compat/imsg-buffer.c.orig  2025-06-24 14:04:21.000000000 +0000
 +++ compat/imsg-buffer.c
 @@ -45,6 +45,10 @@
  #undef be64toh
@@ -12,6 +12,6 @@ Add support for QNX.
 +# define IOV_MAX 16
 +#endif
 +
- static int    ibuf_realloc(struct ibuf *, size_t);
- static void   ibuf_enqueue(struct msgbuf *, struct ibuf *);
- static void   ibuf_dequeue(struct msgbuf *, struct ibuf *);
+ struct ibufqueue {
+       TAILQ_HEAD(, ibuf)      bufs;
+       uint32_t                queued;