From nobody Sat Oct 19 08:27:43 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XVvp75BtHz5Zqj9; Sat, 19 Oct 2024 08:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XVvp74WwDz3wq3; Sat, 19 Oct 2024 08:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729326463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOhEYiwnYCxiolmUmqzB966E76pbfOnuQ7POAlfTL/I=; b=vBiN+0oLrxm4EhVae0tBGFIvONZW//hk44LhUPtZZ3sOwzbwgL+HaTK5N3Dfo+yclEXFNp AU3vXKmNPPatHTK9/qoQS88YZN0/T+BFFxa0FyI3kLzCjq230cbpBsSO8GiD5VBernFv+5 ri7SNgBwpC/+A4MrN1CwRLmXKKk/dViFiHouSYHJJgVocwFi+RBhnX4pWEuFEPkA7+mndj RRJqE+VMPIDvmTm8HnsWuQXl8QEnGc4kpCsaRr7plcAHEVRNQlxnHGwPC3Pz8TDk/fJBp3 LtCH/nCNj22amJR/bdQJB7nbJcXJHcZfS5BpY/93GOkwnM7xwnotCn8YDuGX9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729326463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOhEYiwnYCxiolmUmqzB966E76pbfOnuQ7POAlfTL/I=; b=aqOZo/Lgnzp032ZGmHI7mGaefx2shZdkBMn+7QY89AWLWp8+8XJ7yvDXlxpddKhYn3kisM qUjmwHiSZ8/CySqCXKIog+VnxpTiaIPugSenyAbV7hmJRgJIpByj+a27RKM2TLDevftu0A RPJolr0JqtUpGy6ERFE5ooSPO2Fv3tskpmEhTe19XJ+j6ZO04m/Ce1AZVDHvypB1ZJa8tw fa5CfO+HnMwHqZ5d9x2HqNDcUOfaotazqQYTMvc+Qnrq8OJriujGgfalld1Qv+Pd4M2Eau tMYpbcP1sB9VdcjzJeaVpt3h9UYon6KAs2AGK9IxHay3XGjEbLc91JC9n5OFZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729326463; a=rsa-sha256; cv=none; b=MRMDEr77azVhqQzuUXvB/e5yBQlaQrqEr/ZNdYFobnw4h2eSQ18Idu0n7csH68tFQCs4Hj qXnWgCFd10Xxg2HkawhzB3+uvIzzMVJvc+qqfiFUfkF4pT0+c8U4jbCFUXgxNx5/hdG/Iv OWDfMUFsmzJmAQlmhw+nlFnVt9L0ULH7BDd6zm0lgvbV0R7N8JpxhVh+EjoT03ZnuRnrQI n2AawDGidzMrKpuoqJdQF0hPTPkiWvXu3WhxM/x8ukA4RCx2g4mMOz6MSAiQmROa2EZDoc jznOiz7KDHPdaPVByTHionKyMcPs0jnU4LUpIiflJsuEq3EVG4Omz9sevLId4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XVvp73cHyz18f6; Sat, 19 Oct 2024 08:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49J8RhwW066519; Sat, 19 Oct 2024 08:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49J8RhPq066516; Sat, 19 Oct 2024 08:27:43 GMT (envelope-from git) Date: Sat, 19 Oct 2024 08:27:43 GMT Message-Id: <202410190827.49J8RhPq066516@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 7223af8a5b2b - main - sysutils/tmux: Update to 3.5a List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7223af8a5b2b3be705e1f481e45cd38d20082e69 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=7223af8a5b2b3be705e1f481e45cd38d20082e69 commit 7223af8a5b2b3be705e1f481e45cd38d20082e69 Author: Yasuhiro Kimura AuthorDate: 2024-02-14 00:31:47 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-10-19 08:26:45 +0000 sysutils/tmux: Update to 3.5a Update bash completion to its latest snapshot. ChangeLog: https://raw.githubusercontent.com/tmux/tmux/3.5a/CHANGES PR: 277041 Approved by: maintainer timeout --- sysutils/tmux/Makefile | 5 +- sysutils/tmux/distinfo | 10 ++-- sysutils/tmux/files/patch-e86752820993a0 | 54 ------------------- ...tch-to-fix-crash-due-to-change-to-ncurses.patch | 63 ---------------------- 4 files changed, 7 insertions(+), 125 deletions(-) diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile index 4ae211a218d3..9592aef810b5 100644 --- a/sysutils/tmux/Makefile +++ b/sysutils/tmux/Makefile @@ -1,6 +1,5 @@ PORTNAME= tmux -PORTVERSION= 3.3a -PORTREVISION= 3 +PORTVERSION= 3.5a CATEGORIES= sysutils MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -21,7 +20,7 @@ USES= cpe ncurses:port pkgconfig CPE_VENDOR= tmux_project USE_GITHUB= nodefault -GH_TUPLE= imomaliev:tmux-bash-completion:f5d5323:bash +GH_TUPLE= imomaliev:tmux-bash-completion:8da7f79:bash GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo index 37cd29fb5bdc..f3395690b524 100644 --- a/sysutils/tmux/distinfo +++ b/sysutils/tmux/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1657892731 -SHA256 (tmux-3.3a.tar.gz) = e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f -SIZE (tmux-3.3a.tar.gz) = 677448 -SHA256 (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 4e4f791c446e3cab1a02d39a30fbfd4cec6c7e3119365860a04c9de205eaa626 -SIZE (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 8726 +TIMESTAMP = 1728112504 +SHA256 (tmux-3.5a.tar.gz) = 16216bd0877170dfcc64157085ba9013610b12b082548c7c9542cc0103198951 +SIZE (tmux-3.5a.tar.gz) = 715619 +SHA256 (imomaliev-tmux-bash-completion-8da7f79_GH0.tar.gz) = 2ba28d9a0f0b419184229f234fcb20ed6d6f456b4ef592e4cd2eec79142e7502 +SIZE (imomaliev-tmux-bash-completion-8da7f79_GH0.tar.gz) = 9438 diff --git a/sysutils/tmux/files/patch-e86752820993a0 b/sysutils/tmux/files/patch-e86752820993a0 deleted file mode 100644 index e487fb42fada..000000000000 --- a/sysutils/tmux/files/patch-e86752820993a0 +++ /dev/null @@ -1,54 +0,0 @@ -Index: control.c -=================================================================== ---- control.c.orig 2022-04-25 08:25:13 UTC -+++ control.c -@@ -775,6 +775,9 @@ control_start(struct client *c) - - cs->read_event = bufferevent_new(c->fd, control_read_callback, - control_write_callback, control_error_callback, c); -+ if (cs->read_event == NULL) -+ fatalx("out of memory"); -+ - bufferevent_enable(cs->read_event, EV_READ); - - if (c->flags & CLIENT_CONTROLCONTROL) -@@ -782,6 +785,8 @@ control_start(struct client *c) - else { - cs->write_event = bufferevent_new(c->out_fd, NULL, - control_write_callback, control_error_callback, c); -+ if (cs->write_event == NULL) -+ fatalx("out of memory"); - } - bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW, - 0); ---- file.c.orig 2022-04-25 08:25:13 UTC -+++ file.c -@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmu - - cf->event = bufferevent_new(cf->fd, NULL, file_write_callback, - file_write_error_callback, cf); -+ if (cf->event == NULL) -+ fatalx("out of memory"); - bufferevent_enable(cf->event, EV_WRITE); - goto reply; - -@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmux - - cf->event = bufferevent_new(cf->fd, file_read_callback, NULL, - file_read_error_callback, cf); -+ if (cf->event == NULL) -+ fatalx("out of memory"); - bufferevent_enable(cf->event, EV_READ); - return; - ---- window.c.orig 2022-04-25 08:25:14 UTC -+++ window.c -@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp) - - wp->event = bufferevent_new(wp->fd, window_pane_read_callback, - NULL, window_pane_error_callback, wp); -+ if (wp->event == NULL) -+ fatalx("out of memory"); - wp->ictx = input_init(wp, wp->event, &wp->palette); - - bufferevent_enable(wp->event, EV_READ|EV_WRITE); diff --git a/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch b/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch deleted file mode 100644 index 00922273763c..000000000000 --- a/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git tty-term.c tty-term.c -index fdf0c4fa..873e1ce2 100644 ---- tty-term.c -+++ tty-term.c -@@ -762,33 +762,53 @@ tty_term_string(struct tty_term *term, enum tty_code_code code) - const char * - tty_term_string1(struct tty_term *term, enum tty_code_code code, int a) - { -- return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0)); -+ const char *x = tty_term_string(term, code), *s; -+ s = tiparm_s(1, 0, x, a); -+ if (s == NULL) -+ fatalx("could not expand %s", tty_term_codes[code].name); -+ return (s); - } - - const char * - tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b) - { -- return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0)); -+ const char *x = tty_term_string(term, code), *s; -+ s = tiparm_s(2, 0, x, a, b); -+ if (s == NULL) -+ fatalx("could not expand %s", tty_term_codes[code].name); -+ return (s); - } - - const char * - tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b, - int c) - { -- return (tparm((char *) tty_term_string(term, code), a, b, c, 0, 0, 0, 0, 0, 0)); -+ const char *x = tty_term_string(term, code), *s; -+ s = tiparm_s(3, 0, x, a, b, c); -+ if (s == NULL) -+ fatalx("could not expand %s", tty_term_codes[code].name); -+ return (s); - } - - const char * - tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a) - { -- return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0)); -+ const char *x = tty_term_string(term, code), *s; -+ s = tiparm_s(1, 1, x, a); -+ if (s == NULL) -+ fatalx("could not expand %s", tty_term_codes[code].name); -+ return (s); - } - - const char * - tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a, - const void *b) - { -- return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0)); -+ const char *x = tty_term_string(term, code), *s; -+ s = tiparm_s(2, 3, x, a, b); -+ if (s == NULL) -+ fatalx("could not expand %s", tty_term_codes[code].name); -+ return (s); - } - - int