Date: Thursday, October 29, 2020 @ 19:14:56
Author: eworm
Revision: 736573
archrelease: copy trunk to community-x86_64
Added:
tmux/repos/community-x86_64/0001-OpenBSD-6.8-errata-003.patch
(from rev 736572, tmux/trunk/0001-OpenBSD-6.8-errata-003.patch)
tmux/repos/community-x86_64/PKGBUILD
(from rev 736572, tmux/trunk/PKGBUILD)
Deleted:
tmux/repos/community-x86_64/PKGBUILD
-----------------------------------+
0001-OpenBSD-6.8-errata-003.patch | 24 ++++++++++++
PKGBUILD | 68 ++++++++++++++++++++----------------
2 files changed, 62 insertions(+), 30 deletions(-)
Copied: tmux/repos/community-x86_64/0001-OpenBSD-6.8-errata-003.patch (from rev
736572, tmux/trunk/0001-OpenBSD-6.8-errata-003.patch)
===================================================================
--- 0001-OpenBSD-6.8-errata-003.patch (rev 0)
+++ 0001-OpenBSD-6.8-errata-003.patch 2020-10-29 19:14:56 UTC (rev 736573)
@@ -0,0 +1,24 @@
+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);
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-29 19:14:54 UTC (rev 736572)
+++ PKGBUILD 2020-10-29 19:14:56 UTC (rev 736573)
@@ -1,30 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: TDY <t...@gmx.com>
-# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
-
-pkgname=tmux
-pkgver=3.1_b
-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";)
-sha256sums=('d93f351d50af05a75fe6681085670c786d9504a5da2608e481c47cf5e1486db9')
-
-build() {
- cd "$srcdir/$pkgname-${pkgver/_/}"
-
- ./configure \
- --prefix=/usr \
- --enable-utempter
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-${pkgver/_/}"
-
- make install DESTDIR="$pkgdir"
- install -D -m0644 COPYING "$pkgdir/usr/share/licenses/tmux/LICENSE"
-}
Copied: tmux/repos/community-x86_64/PKGBUILD (from rev 736572,
tmux/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-29 19:14:56 UTC (rev 736573)
@@ -0,0 +1,38 @@
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: TDY <t...@gmx.com>
+# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
+
+pkgname=tmux
+pkgver=3.1_b
+pkgrel=2
+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')
+
+prepare() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+
+ patch -Np1 < ../0001-OpenBSD-6.8-errata-003.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+
+ ./configure \
+ --prefix=/usr \
+ --enable-utempter
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-${pkgver/_/}"
+
+ make install DESTDIR="$pkgdir"
+ install -D -m0644 COPYING "$pkgdir/usr/share/licenses/tmux/LICENSE"
+}
