From 7838bdabeac6ee9f46d81cf65de084cb35c23aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 25 Apr 2020 21:59:25 +0700 Subject: [PATCH] tmux: update to 3.1. Change maintainer from Nathan Owens to me. He/She left for other projects. And I'm using tmux for every day. --- srcpkgs/tmux/patches/memory-leak.patch | 47 -------------------------- srcpkgs/tmux/template | 12 ++++--- 2 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/tmux/patches/memory-leak.patch diff --git a/srcpkgs/tmux/patches/memory-leak.patch b/srcpkgs/tmux/patches/memory-leak.patch deleted file mode 100644 index 9b29c5e6bf9..00000000000 --- a/srcpkgs/tmux/patches/memory-leak.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 68d59a16cec91d2c2747c8c2862560e89f8f2d31 Mon Sep 17 00:00:00 2001 -From: 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 efa0132d197..f00cc91dd57 100644 --- a/srcpkgs/tmux/template +++ b/srcpkgs/tmux/template @@ -1,17 +1,21 @@ # Template file for 'tmux' pkgname=tmux -version=3.0a -revision=2 +version=3.1 +revision=1 build_style=gnu-configure hostmakedepends="byacc" makedepends="libevent-devel ncurses-devel" short_desc="Terminal Multiplexer" -maintainer="Nathan Owens " +maintainer="Đoàn Trần Công Danh " license="ISC" homepage="https://tmux.github.io" changelog="https://raw.githubusercontent.com/tmux/tmux/master/CHANGES" distfiles="https://github.com/tmux/tmux/releases/download/${version}/tmux-${version}.tar.gz" -checksum=4ad1df28b4afa969e59c08061b45082fdc49ff512f30fc8e43217d7b0e5f8db9 +checksum=979bf38db2c36193de49149aaea5c540d18e01ccc27cf76e2aff5606bd186722 + +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" musl-legacy-compat" +fi post_install() { vlicense COPYING