diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/platform-quirks.diff | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/upstream-3823fa2c57.diff | 3 | ||||
| -rw-r--r-- | debian/patches/upstream-424f13fe13.diff | 3 | ||||
| -rw-r--r-- | debian/patches/upstream-692ce59bce.diff | 23 |
7 files changed, 42 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index 0f5cf73..fdf7597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +tmux (3.4-6) unstable; urgency=medium + + [ Aurelien Jarno ] + * Drop kfreebsd-* specific build-depends, the ports have been removed. + + [ Romain Francoise ] + * Drop kFreeBSD-specific parts of debian/patches/platform-quirks.diff. + * Cherry-pick commit 692ce59bce to fix wrong escaping of '$'. + * Add more patch metadata to upstream patches. + + -- Romain Francoise <rfrancoise@debian.org> Sun, 09 Jun 2024 13:08:36 +0200 + tmux (3.4-5) unstable; urgency=medium * Cherry-pick more upstream fixes: diff --git a/debian/control b/debian/control index 8dd6653..01fed4f 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: bison, libncurses-dev (>> 6.5), libsystemd-dev [linux-any], libutempter-dev, - libutil-freebsd-dev [kfreebsd-any], pkgconf Standards-Version: 4.7.0 Rules-Requires-Root: no diff --git a/debian/patches/platform-quirks.diff b/debian/patches/platform-quirks.diff index e46fe56..6fdf025 100644 --- a/debian/patches/platform-quirks.diff +++ b/debian/patches/platform-quirks.diff @@ -1,35 +1,12 @@ Description: Platform-specific fixes * Define PATH_MAX, MAX_IOV for Hurd. - * Add workaround for broken GNU/kFreeBSD system headers. Author: Karl Ferdinand Ebert <kfebert@gmail.com> Author: Romain Francoise <rfrancoise@debian.org> -Author: James Clarke <jrtc27@debian.org> Bug-Debian: http://bugs.debian.org/609333 Forwarded: not-needed --- a/compat.h +++ b/compat.h -@@ -21,6 +21,20 @@ - #include <sys/ioctl.h> - #include <sys/uio.h> - -+/* -+ * Shouldn't be needed, but GNU/kFreeBSD headers are currently slightly broken. -+ * The glibc limits.h eventually includes the FreeBSD limits-related headers, -+ * which don't define a TTY_NAME_MAX. However, anything (in)directly including -+ * the glibc sys/param.h will include the glibc bits/param.h, which defines -+ * TTY_NAME_MAX as SPECNAMELEN, i.e. 63, which differs from our fallback of 32. -+ * Thus, without this hack, different source files can (and do) end up with -+ * different values for TTY_NAME_MAX, which among other things affects the -+ * layout of struct window_pane due to the tty buffer. -+ */ -+#ifdef __FreeBSD_kernel__ -+#include <sys/param.h> -+#endif -+ - #include <fnmatch.h> - #include <limits.h> - #include <stdio.h> @@ -289,6 +303,14 @@ void explicit_bzero(void *, size_t); int getdtablecount(void); #endif diff --git a/debian/patches/series b/debian/patches/series index 801328d..d315ed5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ upstream-6c0067c103.diff upstream-aa17f0e0c1.diff upstream-3823fa2c57.diff upstream-424f13fe13.diff +upstream-692ce59bce.diff diff --git a/debian/patches/upstream-3823fa2c57.diff b/debian/patches/upstream-3823fa2c57.diff index 09f6dc2..b3713b8 100644 --- a/debian/patches/upstream-3823fa2c57.diff +++ b/debian/patches/upstream-3823fa2c57.diff @@ -1,10 +1,13 @@ commit 3823fa2c577d440649a84af660e4d3b0c095d248 Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Tue Apr 30 12:38:58 2024 +0100 +Forwarded: not-needed Send SIGHUP since some programs ignore SIGTERM, from Eduardo Grajeda in GitHub issue 3958. +Origin: upstream, https://github.com/tmux/tmux/commit/3823fa2c577d440649a84af660e4d3b0c095d248 + diff --git a/compat/systemd.c b/compat/systemd.c index 063474e3dd..bde372ccab 100644 --- a/compat/systemd.c diff --git a/debian/patches/upstream-424f13fe13.diff b/debian/patches/upstream-424f13fe13.diff index 8a9fa24..729820a 100644 --- a/debian/patches/upstream-424f13fe13.diff +++ b/debian/patches/upstream-424f13fe13.diff @@ -1,10 +1,13 @@ commit 424f13fe13036e75b1c80e7751b81529f4cd8e15 Author: Nicholas Marriott <nicholas.marriott@gmail.com> Date: Wed Apr 10 07:15:21 2024 +0000 +Forwarded: not-needed Do not get muddled and crash if focusing a pane that is exiting, reported by Saul Nogueras in GitHub issue 3776. +Origin: upstream, https://github.com/tmux/tmux/commit/424f13fe13036e75b1c80e7751b81529f4cd8e15 + diff --git a/window.c b/window.c index 43c272bc8e..d53c606e07 100644 --- a/window.c diff --git a/debian/patches/upstream-692ce59bce.diff b/debian/patches/upstream-692ce59bce.diff new file mode 100644 index 0000000..89d4748 --- /dev/null +++ b/debian/patches/upstream-692ce59bce.diff @@ -0,0 +1,23 @@ +commit 692ce59bcef5fcbbe60485bada35126ad9b87d59 +Author: Nicholas Marriott <nicholas.marriott@gmail.com> +Date: Fri May 24 12:41:24 2024 +0000 +Forwarded: not-needed + + Do not escape $ unless DQ is set, that is the only case where we need to + escape it. + +Origin: upstream, https://github.com/tmux/tmux/commit/692ce59bcef5fcbbe60485bada35126ad9b87d59 + +diff --git a/utf8.c b/utf8.c +index 0abb787534..03ab7e9304 100644 +--- a/utf8.c ++++ b/utf8.c +@@ -517,7 +517,7 @@ utf8_strvis(char *dst, const char *src, size_t len, int flag) + /* Not a complete, valid UTF-8 character. */ + src -= ud.have; + } +- if (src[0] == '$' && src < end - 1) { ++ if ((flag & VIS_DQ) && src[0] == '$' && src < end - 1) { + if (isalpha((u_char)src[1]) || + src[1] == '_' || + src[1] == '{') |