From 523cd44fd0c7564452717d1c4033c815d9cbe13a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 25 Dec 2019 15:13:10 -0600
Subject: [PATCH] tmux: add memory-leak patch

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 srcpkgs/python3-iwlib/template         |  2 +-
 srcpkgs/tmux/patches/memory-leak.patch | 47 ++++++++++++++++++++++++++
 srcpkgs/tmux/template                  |  3 +-
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tmux/patches/memory-leak.patch

diff --git a/srcpkgs/python3-iwlib/template b/srcpkgs/python3-iwlib/template
index c1b85d9e415..6bb40607984 100644
--- a/srcpkgs/python3-iwlib/template
+++ b/srcpkgs/python3-iwlib/template
@@ -4,6 +4,7 @@ version=1.7.0
 revision=2
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
+make_use_env=yes
 pycompile_module="iwlib"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel wireless_tools-devel libffi-devel"
@@ -14,7 +15,6 @@ license="GPL-2.0-only"
 homepage="https://github.com/nathan-hoad/python-iwlib"
 distfiles="${PYPI_SITE}/i/iwlib/iwlib-${version}.tar.gz"
 checksum=a805f6597a70ee3001aba8f039fb7b2dcb75dc15c4e7852f5594fd6379196da1
-nocross=https://build.voidlinux.org/builders/aarch64-musl_builder/builds/11458/steps/shell_3/logs/stdio
 
 do_check() {
 	python3 test/test_imports.py
diff --git a/srcpkgs/tmux/patches/memory-leak.patch b/srcpkgs/tmux/patches/memory-leak.patch
new file mode 100644
index 00000000000..9b29c5e6bf9
--- /dev/null
+++ b/srcpkgs/tmux/patches/memory-leak.patch
@@ -0,0 +1,47 @@
+From 68d59a16cec91d2c2747c8c2862560e89f8f2d31 Mon Sep 17 00:00:00 2001
+From: nicm <nicm>
+Date: Mon, 14 Oct 2019 08:38:07 +0000
+Subject: [PATCH] Memory leaks, from Igor Wong in GitHub issue 1934.
+
+---
+ cmd-parse.y | 1 +
+ options.c   | 1 +
+ tmux.c      | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/cmd-parse.y b/cmd-parse.y
+index 0cd7c6bf6..2c924010c 100644
+--- cmd-parse.y
++++ cmd-parse.y
+@@ -696,6 +696,7 @@ cmd_parse_build_commands(struct cmd_parse_commands *cmds,
+ 			pr.status = CMD_PARSE_ERROR;
+ 			pr.error = cmd_parse_get_error(pi->file, line, cause);
+ 			free(cause);
++			cmd_list_free(cmdlist);
+ 			goto out;
+ 		}
+ 		cmd_list_append(cmdlist, add);
+diff --git a/options.c b/options.c
+index 1be9f8cd7..f683c566e 100644
+--- options.c
++++ options.c
+@@ -296,6 +296,7 @@ options_remove(struct options_entry *o)
+ 	else
+ 		options_value_free(o, &o->value);
+ 	RB_REMOVE(options_tree, &oo->tree, o);
++	free((void *)o->name);
+ 	free(o);
+ }
+ 
+diff --git a/tmux.c b/tmux.c
+index c3fe3ee6f..fe2647f56 100644
+--- tmux.c
++++ tmux.c
+@@ -130,6 +130,7 @@ make_label(const char *label, char **cause)
+ 		free(base);
+ 		goto fail;
+ 	}
++	free(base);
+ 
+ 	if (mkdir(resolved, S_IRWXU) != 0 && errno != EEXIST)
+ 		goto fail;
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 159b3cfa90a..efa0132d197 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,8 +1,9 @@
 # Template file for 'tmux'
 pkgname=tmux
 version=3.0a
-revision=1
+revision=2
 build_style=gnu-configure
+hostmakedepends="byacc"
 makedepends="libevent-devel ncurses-devel"
 short_desc="Terminal Multiplexer"
 maintainer="Nathan Owens <ndowens04@gmail.com>"