public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/tmux] f43: Merge branch 'rawhide' into f43
@ 2026-06-28 19:36 Filipe Rosset
0 siblings, 0 replies; 2+ messages in thread
From: Filipe Rosset @ 2026-06-28 19:36 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/tmux
Branch : f43
Commit : b780c0d4f98c2777a8f6ffd63918aa567b815cac
Author : Filipe Rosset <filiperosset@fedoraproject.org>
Date : 2026-06-28T16:36:02-03:00
Stats : +120/-99 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/tmux/c/b780c0d4f98c2777a8f6ffd63918aa567b815cac?branch=f43
Log:
Merge branch 'rawhide' into f43
---
diff --git a/0001-Setting-working-directory-after-fork-means-there-is-.patch b/0001-Setting-working-directory-after-fork-means-there-is-.patch
deleted file mode 100644
index e3f072a..0000000
--- a/0001-Setting-working-directory-after-fork-means-there-is-.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From f1e4ec1c9fa89f4fc062b5bc4aacc5f93f93f11b Mon Sep 17 00:00:00 2001
-From: nicm <nicm>
-Date: Mon, 8 Dec 2025 08:04:35 +0000
-Subject: [PATCH] Setting working directory after fork means there is a race
- with pane_current_path (especially on platforms with systemd which have to
- take time to do some additional faffing around). To avoid this, change it
- before fork and back in the parent afterwards. GitHub issue 4719.
-
-(cherry picked from commit f58b8d0d6abb2477b584547a4e72cc362ecbbcdb)
-
-Conflicts:
- spawn.c
----
- spawn.c | 36 ++++++++++++++++++++++++------------
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/spawn.c b/spawn.c
-index 90cda757..964d0334 100644
---- a/spawn.c
-+++ b/spawn.c
-@@ -211,7 +211,9 @@ spawn_pane(struct spawn_context *sc, char **cause)
- struct environ *child;
- struct environ_entry *ee;
- char **argv, *cp, **argvp, *argv0, *cwd, *new_cwd;
-- const char *cmd, *tmp;
-+ char path[PATH_MAX];
-+ const char *cmd, *tmp, *home = find_home();
-+ const char *actual_cwd = NULL;
- int argc;
- u_int idx;
- struct termios now;
-@@ -366,6 +368,16 @@ spawn_pane(struct spawn_context *sc, char **cause)
- goto complete;
- }
-
-+ /* Store current working directory and change to new one. */
-+ if (getcwd(path, sizeof path) != NULL) {
-+ if (chdir(new_wp->cwd) == 0)
-+ actual_cwd = new_wp->cwd;
-+ else if (home != NULL && chdir(home) == 0)
-+ actual_cwd = home;
-+ else if (chdir("/") == 0)
-+ actual_cwd = "/";
-+ }
-+
- /* Fork the new process. */
- new_wp->pid = fdforkpty(ptm_fd, &new_wp->fd, new_wp->tty, NULL, &ws);
- if (new_wp->pid == -1) {
-@@ -381,8 +393,15 @@ spawn_pane(struct spawn_context *sc, char **cause)
- return (NULL);
- }
-
-- /* In the parent process, everything is done now. */
-+ /*
-+ * In the parent process, everything is done now. Change the working
-+ * directory back.
-+ */
- if (new_wp->pid != 0) {
-+ if (actual_cwd != NULL &&
-+ chdir(path) != 0 &&
-+ (home == NULL || chdir(home) != 0))
-+ chdir("/");
- goto complete;
- }
-
-@@ -397,17 +416,10 @@ spawn_pane(struct spawn_context *sc, char **cause)
- }
- #endif
- /*
-- * Child process. Change to the working directory or home if that
-- * fails.
-+ * Child process. Set PWD to the working directory.
- */
-- if (chdir(new_wp->cwd) == 0)
-- environ_set(child, "PWD", 0, "%s", new_wp->cwd);
-- else if ((tmp = find_home()) != NULL && chdir(tmp) == 0)
-- environ_set(child, "PWD", 0, "%s", tmp);
-- else if (chdir("/") == 0)
-- environ_set(child, "PWD", 0, "/");
-- else
-- fatal("chdir failed");
-+ if (actual_cwd != NULL)
-+ environ_set(child, "PWD", 0, "%s", actual_cwd);
-
- /*
- * Update terminal escape characters from the session if available and
---
-2.54.0
-
diff --git a/sources b/sources
index abf1f0e..03efc12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tmux-3.6b.tar.gz) = 0dee1a6548496e5398cda98a7740139749f98fbbb8c9c539f81b18805a560529e4d7fee2b823748ec51935a83836ca502724fa759139f8db9514229004558192
+SHA512 (tmux-3.7.tar.gz) = d444ff682f8f12980e84776db2e1d1b56e54378bd56640208eb169f8db4dea3567cd8a2452edfa7cf89d4bf5236cc27e14184497ecffea97337b80d8677967bf
diff --git a/tmux.spec b/tmux.spec
index b95d916..1004481 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -1,5 +1,5 @@
Name: tmux
-Version: 3.6b
+Version: 3.7
Release: %autorelease
Summary: A terminal multiplexer
License: ISC AND BSD-2-Clause AND BSD-3-Clause AND SSH-short AND LicenseRef-Fedora-Public-Domain
@@ -9,13 +9,10 @@ Source1: bash_completion_tmux.sh
Source2: tmux@.service
Source3: README.polkit
-# related to https://github.com/tmux/tmux/commit/f58b8d0d6abb2477b584547a4e72cc362ecbbcdb
-# this patch should be removed during next tmux upgrade since it's in the master branch
-Patch0: 0001-Setting-working-directory-after-fork-means-there-is-.patch
-
BuildRequires: byacc
BuildRequires: gcc
BuildRequires: systemd-devel
+BuildRequires: systemd-rpm-macros
BuildRequires: libutempter-devel
BuildRequires: make
BuildRequires: pkgconfig(libevent_core) >= 2
@@ -39,6 +36,7 @@ as GNU Screen.
%prep
%autosetup
+cp %{SOURCE3} .
%build
@@ -53,8 +51,6 @@ as GNU Screen.
install -Dpm 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/tmux
# Install the systemd file
install -Dpm 644 %{SOURCE2} %{buildroot}%{_unitdir}/tmux@.service
-# Install the polkit example file
-install -Dpm 644 %{SOURCE3} %{buildroot}%{_docdir}/tmux/README.polkit
%check
@@ -62,6 +58,7 @@ install -Dpm 644 %{SOURCE3} %{buildroot}%{_docdir}/tmux/README.polkit
%post
+%systemd_post tmux@.service
# Add login shell entries to /etc/shells only when installing the package
# for the first time:
if [ "$1" = 1 ]; then
@@ -74,7 +71,11 @@ if [ "$1" = 1 ]; then
fi
fi
+%preun
+%systemd_preun tmux@.service
+
%postun
+%systemd_postun_with_restart tmux@.service
# Remove the login shell lines from /etc/shells only when uninstalling:
if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ]; then
sed -i -e '\!^%{_bindir}/tmux$!d' -e '\!^/bin/tmux$!d' %{_sysconfdir}/shells
@@ -82,7 +83,7 @@ fi
%files
%license COPYING
-%doc CHANGES README* example_tmux.conf README.polkit
+%doc CHANGES README* example_tmux.conf
%{_bindir}/tmux
%{_mandir}/man1/tmux.1.*
%{_datadir}/bash-completion/completions/tmux
diff --git a/bash_completion_tmux.sh b/bash_completion_tmux.sh
new file mode 100644
index 0000000..74728b9
--- /dev/null
+++ b/bash_completion_tmux.sh
@@ -0,0 +1,105 @@
+# START tmux completion
+# This file is in the public domain
+# See: http://www.debian-administration.org/articles/317 for how to write more.
+# Usage: Put "source bash_completion_tmux.sh" into your .bashrc
+_tmux()
+{
+ local cur prev opts
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+ opts=" \
+ attach-session \
+ bind-key \
+ break-pane \
+ capture-pane \
+ choose-client \
+ choose-session \
+ choose-window \
+ clear-history \
+ clock-mode \
+ command-prompt \
+ confirm-before \
+ copy-buffer \
+ copy-mode \
+ delete-buffer \
+ detach-client \
+ display-message \
+ display-panes \
+ down-pane \
+ find-window \
+ has-session \
+ if-shell \
+ join-pane \
+ kill-pane \
+ kill-server \
+ kill-session \
+ kill-window \
+ last-window \
+ link-window \
+ list-buffers \
+ list-clients \
+ list-commands \
+ list-keys \
+ list-panes \
+ list-sessions \
+ list-windows \
+ load-buffer \
+ lock-client \
+ lock-server \
+ lock-session \
+ move-window \
+ new-session \
+ new-window \
+ next-layout \
+ next-window \
+ paste-buffer \
+ pipe-pane \
+ previous-layout \
+ previous-window \
+ refresh-client \
+ rename-session \
+ rename-window \
+ resize-pane \
+ respawn-window \
+ rotate-window \
+ run-shell \
+ save-buffer \
+ select-layout \
+ select-pane \
+ select-prompt \
+ select-window \
+ send-keys \
+ send-prefix \
+ server-info \
+ set-buffer \
+ set-environment \
+ set-option \
+ set-window-option \
+ show-buffer \
+ show-environment \
+ show-messages \
+ show-options \
+ show-window-options \
+ source-file \
+ split-window \
+ start-server \
+ suspend-client \
+ swap-pane \
+ swap-window \
+ switch-client \
+ unbind-key \
+ unlink-window \
+ up-pane"
+
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ return 0
+
+}
+complete -F _tmux tmux
+
+# END tmux completion
+
+
+
diff --git a/tmux.spec b/tmux.spec
index 23b7506..1004481 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -2,10 +2,10 @@ Name: tmux
Version: 3.7
Release: %autorelease
Summary: A terminal multiplexer
-
License: ISC AND BSD-2-Clause AND BSD-3-Clause AND SSH-short AND LicenseRef-Fedora-Public-Domain
URL: https://tmux.github.io/
Source0: https://github.com/tmux/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source1: bash_completion_tmux.sh
Source2: tmux@.service
Source3: README.polkit
@@ -46,6 +46,9 @@ cp %{SOURCE3} .
%install
%make_install
+
+# Install the bash completion file
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/tmux
# Install the systemd file
install -Dpm 644 %{SOURCE2} %{buildroot}%{_unitdir}/tmux@.service
@@ -83,6 +86,7 @@ fi
%doc CHANGES README* example_tmux.conf
%{_bindir}/tmux
%{_mandir}/man1/tmux.1.*
+%{_datadir}/bash-completion/completions/tmux
%{_unitdir}/tmux@.service
%changelog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [rpms/tmux] f43: Merge branch 'rawhide' into f43
@ 2026-06-28 20:31 Filipe Rosset
0 siblings, 0 replies; 2+ messages in thread
From: Filipe Rosset @ 2026-06-28 20:31 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/tmux
Branch : f43
Commit : 036efc56ef3b2111f3881490d1052a9c92b7c533
Author : Filipe Rosset <filiperosset@fedoraproject.org>
Date : 2026-06-28T17:29:23-03:00
Stats : +110/-6 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/tmux/c/036efc56ef3b2111f3881490d1052a9c92b7c533?branch=f43
Log:
Merge branch 'rawhide' into f43
---
diff --git a/tmux.spec b/tmux.spec
index 1004481..55a8c73 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -58,7 +58,6 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_unitdir}/tmux@.service
%post
-%systemd_post tmux@.service
# Add login shell entries to /etc/shells only when installing the package
# for the first time:
if [ "$1" = 1 ]; then
@@ -71,11 +70,7 @@ if [ "$1" = 1 ]; then
fi
fi
-%preun
-%systemd_preun tmux@.service
-
%postun
-%systemd_postun_with_restart tmux@.service
# Remove the login shell lines from /etc/shells only when uninstalling:
if [ "$1" = 0 ] && [ -f %{_sysconfdir}/shells ]; then
sed -i -e '\!^%{_bindir}/tmux$!d' -e '\!^/bin/tmux$!d' %{_sysconfdir}/shells
diff --git a/bash_completion_tmux.sh b/bash_completion_tmux.sh
new file mode 100644
index 0000000..74728b9
--- /dev/null
+++ b/bash_completion_tmux.sh
@@ -0,0 +1,105 @@
+# START tmux completion
+# This file is in the public domain
+# See: http://www.debian-administration.org/articles/317 for how to write more.
+# Usage: Put "source bash_completion_tmux.sh" into your .bashrc
+_tmux()
+{
+ local cur prev opts
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+ opts=" \
+ attach-session \
+ bind-key \
+ break-pane \
+ capture-pane \
+ choose-client \
+ choose-session \
+ choose-window \
+ clear-history \
+ clock-mode \
+ command-prompt \
+ confirm-before \
+ copy-buffer \
+ copy-mode \
+ delete-buffer \
+ detach-client \
+ display-message \
+ display-panes \
+ down-pane \
+ find-window \
+ has-session \
+ if-shell \
+ join-pane \
+ kill-pane \
+ kill-server \
+ kill-session \
+ kill-window \
+ last-window \
+ link-window \
+ list-buffers \
+ list-clients \
+ list-commands \
+ list-keys \
+ list-panes \
+ list-sessions \
+ list-windows \
+ load-buffer \
+ lock-client \
+ lock-server \
+ lock-session \
+ move-window \
+ new-session \
+ new-window \
+ next-layout \
+ next-window \
+ paste-buffer \
+ pipe-pane \
+ previous-layout \
+ previous-window \
+ refresh-client \
+ rename-session \
+ rename-window \
+ resize-pane \
+ respawn-window \
+ rotate-window \
+ run-shell \
+ save-buffer \
+ select-layout \
+ select-pane \
+ select-prompt \
+ select-window \
+ send-keys \
+ send-prefix \
+ server-info \
+ set-buffer \
+ set-environment \
+ set-option \
+ set-window-option \
+ show-buffer \
+ show-environment \
+ show-messages \
+ show-options \
+ show-window-options \
+ source-file \
+ split-window \
+ start-server \
+ suspend-client \
+ swap-pane \
+ swap-window \
+ switch-client \
+ unbind-key \
+ unlink-window \
+ up-pane"
+
+ COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+ return 0
+
+}
+complete -F _tmux tmux
+
+# END tmux completion
+
+
+
diff --git a/tmux.spec b/tmux.spec
index 2043694..55a8c73 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -2,10 +2,10 @@ Name: tmux
Version: 3.7
Release: %autorelease
Summary: A terminal multiplexer
-
License: ISC AND BSD-2-Clause AND BSD-3-Clause AND SSH-short AND LicenseRef-Fedora-Public-Domain
URL: https://tmux.github.io/
Source0: https://github.com/tmux/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source1: bash_completion_tmux.sh
Source2: tmux@.service
Source3: README.polkit
@@ -46,6 +46,9 @@ cp %{SOURCE3} .
%install
%make_install
+
+# Install the bash completion file
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/tmux
# Install the systemd file
install -Dpm 644 %{SOURCE2} %{buildroot}%{_unitdir}/tmux@.service
@@ -78,6 +81,7 @@ fi
%doc CHANGES README* example_tmux.conf
%{_bindir}/tmux
%{_mandir}/man1/tmux.1.*
+%{_datadir}/bash-completion/completions/tmux
%{_unitdir}/tmux@.service
%changelog
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-06-28 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-28 19:36 [rpms/tmux] f43: Merge branch 'rawhide' into f43 Filipe Rosset
2026-06-28 20:31 Filipe Rosset
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox