[arch-commits] Commit in tmux/trunk (0001-OpenBSD-6.8-errata-003.patch PKGBUILD)

[Christian Hesse]

    Date: Friday, October 30, 2020 @ 12:18:03
  Author: eworm
Revision: 736701

upgpkg: tmux 3.1_c-1: new upstream release

(The only change is the fix we had in 3.1_b-2.)

Modified:
  tmux/trunk/PKGBUILD
Deleted:
  tmux/trunk/0001-OpenBSD-6.8-errata-003.patch

-----------------------------------+
 0001-OpenBSD-6.8-errata-003.patch |   24 ------------------------
 PKGBUILD                          |   16 ++++------------
 2 files changed, 4 insertions(+), 36 deletions(-)

Deleted: 0001-OpenBSD-6.8-errata-003.patch
===================================================================
--- 0001-OpenBSD-6.8-errata-003.patch	2020-10-30 11:42:22 UTC (rev 736700)
+++ 0001-OpenBSD-6.8-errata-003.patch	2020-10-30 12:18:03 UTC (rev 736701)
@@ -1,24 +0,0 @@
-tmux has a stack overflow in CSI parsing.
-
-OpenBSD 6.8 errata 003, October 29, 2020:
-
-https://ftp.openbsd.org/pub/OpenBSD/patches/6.8/common/003_tmux.patch.sig
-
-diff -u -p -u -r1.183 input.c
---- tmux/input.c	19 Aug 2020 06:37:23 -0000
-+++ tmux/input.c	29 Oct 2020 15:34:14 -0000
-@@ -1976,8 +1976,13 @@ input_csi_dispatch_sgr_colon(struct inpu
- 				free(copy);
- 				return;
- 			}
--		} else
-+		} else {
- 			n++;
-+			if (n == nitems(p)) {
-+				free(copy);
-+				return;
-+			}
-+		}
- 		log_debug("%s: %u = %d", __func__, n - 1, p[n - 1]);
- 	}
- 	free(copy);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-30 11:42:22 UTC (rev 736700)
+++ PKGBUILD	2020-10-30 12:18:03 UTC (rev 736701)
@@ -3,24 +3,16 @@
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 
 pkgname=tmux
-pkgver=3.1_b
-pkgrel=2
+pkgver=3.1_c
+pkgrel=1
 pkgdesc='A terminal multiplexer'
 url='https://github.com/tmux/tmux/wiki'
 arch=('x86_64')
 license=('BSD')
 depends=('ncurses' 'libevent' 'libutempter')
-source=("https://github.com/tmux/tmux/releases/download/${pkgver/_/}/tmux-${pkgver/_/}.tar.gz"
-        '0001-OpenBSD-6.8-errata-003.patch')
-sha256sums=('d93f351d50af05a75fe6681085670c786d9504a5da2608e481c47cf5e1486db9'
-            '3bae2afa48f3832f577f9ade513993d84738d594a1dd193fd22d80d0864d8a97')
+source=("https://github.com/tmux/tmux/releases/download/${pkgver/_/}/tmux-${pkgver/_/}.tar.gz")
+sha256sums=('918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386')
 
-prepare() {
-	cd "$srcdir/$pkgname-${pkgver/_/}"
-
-	patch -Np1 < ../0001-OpenBSD-6.8-errata-003.patch
-}
-
 build() {
 	cd "$srcdir/$pkgname-${pkgver/_/}"