diff -Nru tmux-3.1a/CHANGES tmux-3.1b/CHANGES --- tmux-3.1a/CHANGES 2020-04-29 20:01:18.000000000 +0000 +++ tmux-3.1b/CHANGES 2020-05-04 08:06:52.000000000 +0000 @@ -1,3 +1,9 @@ +CHANGES FROM 3.1a TO 3.1b + +* Fix build on systems without sys/queue.h. + +* Fix crash when allow-rename is on and an empty name is set. + CHANGES FROM 3.1 TO 3.1a * Do not close stdout prematurely in control mode since it is needed to print diff -Nru tmux-3.1a/configure tmux-3.1b/configure --- tmux-3.1a/configure 2020-04-29 20:01:55.000000000 +0000 +++ tmux-3.1b/configure 2020-05-04 08:08:33.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tmux 3.1a. +# Generated by GNU Autoconf 2.69 for tmux 3.1b. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='tmux' PACKAGE_TARNAME='tmux' -PACKAGE_VERSION='3.1a' -PACKAGE_STRING='tmux 3.1a' +PACKAGE_VERSION='3.1b' +PACKAGE_STRING='tmux 3.1b' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1333,7 +1333,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tmux 3.1a to adapt to many kinds of systems. +\`configure' configures tmux 3.1b to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1403,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tmux 3.1a:";; + short | recursive ) echo "Configuration of tmux 3.1b:";; esac cat <<\_ACEOF @@ -1524,7 +1524,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tmux configure 3.1a +tmux configure 3.1b generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1935,7 +1935,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tmux $as_me 3.1a, which was +It was created by tmux $as_me 3.1b, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2801,7 +2801,7 @@ # Define the identity of the package. PACKAGE='tmux' - VERSION='3.1a' + VERSION='3.1b' cat >>confdefs.h <<_ACEOF @@ -7806,7 +7806,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tmux $as_me 3.1a, which was +This file was extended by tmux $as_me 3.1b, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7863,7 +7863,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -tmux config.status 3.1a +tmux config.status 3.1b configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru tmux-3.1a/configure.ac tmux-3.1b/configure.ac --- tmux-3.1a/configure.ac 2020-04-29 20:01:18.000000000 +0000 +++ tmux-3.1b/configure.ac 2020-05-04 08:06:23.000000000 +0000 @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.1a) +AC_INIT([tmux], 3.1b) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) diff -Nru tmux-3.1a/debian/changelog tmux-3.1b/debian/changelog --- tmux-3.1a/debian/changelog 2020-05-02 12:37:43.000000000 +0000 +++ tmux-3.1b/debian/changelog 2020-05-04 17:18:57.000000000 +0000 @@ -1,3 +1,10 @@ +tmux (3.1b-1) unstable; urgency=medium + + * New upstream bugfix release. + * Clarify 3.1~rc1-1 NEWS entry about protocol change (closes: #959698). + + -- Romain Francoise Mon, 04 May 2020 19:18:57 +0200 + tmux (3.1a-1) unstable; urgency=medium * New upstream bugfix release. diff -Nru tmux-3.1a/debian/NEWS tmux-3.1b/debian/NEWS --- tmux-3.1a/debian/NEWS 2020-05-02 12:35:08.000000000 +0000 +++ tmux-3.1b/debian/NEWS 2020-05-04 17:16:00.000000000 +0000 @@ -1,7 +1,11 @@ tmux (3.1~rc1-1) experimental; urgency=medium - The server protocol was changed in an incompatible manner, we recommend - that you close any open tmux sessions before proceeding with the upgrade. + Please restart tmux entirely after upgrading to 3.1: an old server and + a new client will not be fully compatible with each other and the new + client may hang. + + Note: if necessary the old client can be used via /proc/pid/exe to + talk to the old server, e.g. `/proc/$(pgrep "tmux: server")/exe attach'. -- Romain Francoise Tue, 11 Feb 2020 21:15:08 +0100 diff -Nru tmux-3.1a/debian/patches/series tmux-3.1b/debian/patches/series --- tmux-3.1a/debian/patches/series 2020-05-02 12:37:09.000000000 +0000 +++ tmux-3.1b/debian/patches/series 2020-05-04 16:54:48.000000000 +0000 @@ -1,2 +1 @@ platform-quirks.diff -upstream-6a33a12798.diff diff -Nru tmux-3.1a/debian/patches/upstream-6a33a12798.diff tmux-3.1b/debian/patches/upstream-6a33a12798.diff --- tmux-3.1a/debian/patches/upstream-6a33a12798.diff 2020-05-02 12:37:00.000000000 +0000 +++ tmux-3.1b/debian/patches/upstream-6a33a12798.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -commit 6a33a12798b2afeee6fb7bba74d86d628137921e -Author: Nicholas Marriott -Date: Thu Apr 30 15:20:08 2020 +0100 - - Do not remove the automatic-rename option from the global set, only from - the window (it must stay in the global set or tmux will crash). GitHub - issue 2188. - -diff --git a/input.c b/input.c -index 82d2b398e2..e794be2a0b 100644 ---- a/input.c -+++ b/input.c -@@ -2304,7 +2304,7 @@ input_exit_rename(struct input_ctx *ictx) - return; - - if (ictx->input_len == 0) { -- oe = options_get(wp->window->options, "automatic-rename"); -+ oe = options_get_only(wp->window->options, "automatic-rename"); - if (oe != NULL) - options_remove(oe); - return; diff -Nru tmux-3.1a/file.c tmux-3.1b/file.c --- tmux-3.1a/file.c 2020-04-14 13:10:35.000000000 +0000 +++ tmux-3.1b/file.c 2020-05-04 08:06:29.000000000 +0000 @@ -17,7 +17,6 @@ */ #include -#include #include #include diff -Nru tmux-3.1a/input.c tmux-3.1b/input.c --- tmux-3.1a/input.c 2020-04-29 20:01:18.000000000 +0000 +++ tmux-3.1b/input.c 2020-05-04 08:06:23.000000000 +0000 @@ -2304,7 +2304,7 @@ return; if (ictx->input_len == 0) { - oe = options_get(wp->window->options, "automatic-rename"); + oe = options_get_only(wp->window->options, "automatic-rename"); if (oe != NULL) options_remove(oe); return;