SHA256
5
0
forked from pool/tmux
Files
tmux/tmux-socket-path.patch

41 lines
1.3 KiB
Diff
Raw Permalink Normal View History

Accepting request 980726 from home:dirkmueller:Factory - update to 3.3: * Add an ACL list for users connecting to the tmux socket. Users may be forbidden from attaching, forced to attach read-only, or allowed to attach read-write. A new command, server-access, configures the list. File system permissions must still be configured manually. * Emit window-layout-changed on swap-pane. * Better error reporting when applying custom layouts. * Handle ANSI escape sequences in run-shell output. * Add pane_start_path to match start_command. * Set PWD so shells have a hint about the real path. * Do not allow pipe-pane on dead panes. * Do not report mouse positions (incorrectly) above the maximum of 223 in normal mouse mode. * Add an option (default off) to control the passthrough escape sequence. * Support more mouse buttons when the terminal sends them. * Add a window-resized hook which is fired when the window is actually resized which may be later than the client resize. * Add next_session_id format with the next session ID. * Add formats for client and server UID and user. * Add argument to refresh-client -l to forward clipboard to a pane. * Add remain-on-exit-format to set text shown when pane is dead. * With split-window -f use percentages of window size not pane size. * Add an option (fill-character) to set the character used for unused areas of a client. * Add an option (scroll-on-clear) to control if tmux scrolls into history on clear. * Add a capability for OSC 7 and use it similarly to how the title is set (and controlled by the same set-titles option). * Add support for systemd socket activation (where systemd creates the Unix domain socket for tmux rather than tmux creating it). Build with OBS-URL: https://build.opensuse.org/request/show/980726 OBS-URL: https://build.opensuse.org/package/show/utilities/tmux?expand=0&rev=36
2022-06-07 18:09:09 +00:00
--- tmux-3.3/tmux.c 2022-05-14 21:04:35.000000000 +0200
+++ tmux-3.3/tmux.c 2022-06-04 09:08:04.005234096 +0200
@@ -198,16 +198,16 @@
expand_paths(TMUX_SOCK, &paths, &n, 1);
if (n == 0) {
- xasprintf(cause, "no suitable socket path");
- return (NULL);
+ /* SUSE specific hack - remain compatible with previously used socket path */
+ xasprintf(&base, "/run/tmux/%ld", (long)uid);
+ } else {
+ path = paths[0]; /* can only have one socket! */
+ for (i = 1; i < n; i++)
+ free(paths[i]);
+ free(paths);
+ xasprintf(&base, "%s/tmux-%ld", path, (long)uid);
Accepting request 980726 from home:dirkmueller:Factory - update to 3.3: * Add an ACL list for users connecting to the tmux socket. Users may be forbidden from attaching, forced to attach read-only, or allowed to attach read-write. A new command, server-access, configures the list. File system permissions must still be configured manually. * Emit window-layout-changed on swap-pane. * Better error reporting when applying custom layouts. * Handle ANSI escape sequences in run-shell output. * Add pane_start_path to match start_command. * Set PWD so shells have a hint about the real path. * Do not allow pipe-pane on dead panes. * Do not report mouse positions (incorrectly) above the maximum of 223 in normal mouse mode. * Add an option (default off) to control the passthrough escape sequence. * Support more mouse buttons when the terminal sends them. * Add a window-resized hook which is fired when the window is actually resized which may be later than the client resize. * Add next_session_id format with the next session ID. * Add formats for client and server UID and user. * Add argument to refresh-client -l to forward clipboard to a pane. * Add remain-on-exit-format to set text shown when pane is dead. * With split-window -f use percentages of window size not pane size. * Add an option (fill-character) to set the character used for unused areas of a client. * Add an option (scroll-on-clear) to control if tmux scrolls into history on clear. * Add a capability for OSC 7 and use it similarly to how the title is set (and controlled by the same set-titles option). * Add support for systemd socket activation (where systemd creates the Unix domain socket for tmux rather than tmux creating it). Build with OBS-URL: https://build.opensuse.org/request/show/980726 OBS-URL: https://build.opensuse.org/package/show/utilities/tmux?expand=0&rev=36
2022-06-07 18:09:09 +00:00
+ free(path);
}
- path = paths[0]; /* can only have one socket! */
- for (i = 1; i < n; i++)
- free(paths[i]);
- free(paths);
-
- xasprintf(&base, "%s/tmux-%ld", path, (long)uid);
- free(path);
if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST) {
xasprintf(cause, "couldn't create directory %s (%s)", base,
strerror(errno));
--- tmux-3.3/tmux.h 2022-05-14 21:04:35.000000000 +0200
+++ tmux-3.3/tmux.h 2022-06-04 09:04:55.829136130 +0200
@@ -74,7 +74,7 @@
#define TMUX_CONF "/etc/tmux.conf:~/.tmux.conf"
#endif
#ifndef TMUX_SOCK
-#define TMUX_SOCK "$TMUX_TMPDIR:" _PATH_TMP
+#define TMUX_SOCK "$TMUX_TMPDIR:"
#endif
Accepting request 980726 from home:dirkmueller:Factory - update to 3.3: * Add an ACL list for users connecting to the tmux socket. Users may be forbidden from attaching, forced to attach read-only, or allowed to attach read-write. A new command, server-access, configures the list. File system permissions must still be configured manually. * Emit window-layout-changed on swap-pane. * Better error reporting when applying custom layouts. * Handle ANSI escape sequences in run-shell output. * Add pane_start_path to match start_command. * Set PWD so shells have a hint about the real path. * Do not allow pipe-pane on dead panes. * Do not report mouse positions (incorrectly) above the maximum of 223 in normal mouse mode. * Add an option (default off) to control the passthrough escape sequence. * Support more mouse buttons when the terminal sends them. * Add a window-resized hook which is fired when the window is actually resized which may be later than the client resize. * Add next_session_id format with the next session ID. * Add formats for client and server UID and user. * Add argument to refresh-client -l to forward clipboard to a pane. * Add remain-on-exit-format to set text shown when pane is dead. * With split-window -f use percentages of window size not pane size. * Add an option (fill-character) to set the character used for unused areas of a client. * Add an option (scroll-on-clear) to control if tmux scrolls into history on clear. * Add a capability for OSC 7 and use it similarly to how the title is set (and controlled by the same set-titles option). * Add support for systemd socket activation (where systemd creates the Unix domain socket for tmux rather than tmux creating it). Build with OBS-URL: https://build.opensuse.org/request/show/980726 OBS-URL: https://build.opensuse.org/package/show/utilities/tmux?expand=0&rev=36
2022-06-07 18:09:09 +00:00
#ifndef TMUX_TERM
#define TMUX_TERM "screen"
Nur in b/tmux-3.3: tmux.h.orig.