Attachment 251462 Details for Bug 277041 – Updated patch file

[patch] Updated patch file

sysutils_tmux.patch (text/plain), 6.14 KB, created by Yasuhiro Kimura on 2024-06-15 04:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2024-06-15 04:57:21 UTC

Size: 6.14 KB

patch

obsolete

>From 24261effc58795306520b0b6774644bc1ecff8c7 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Wed, 14 Feb 2024 09:31:47 +0900
>Subject: [PATCH] sysutils/tmux: Update to 3.4
>
>ChangeLog:	https://raw.githubusercontent.com/tmux/tmux/3.4/CHANGES
>---
> sysutils/tmux/Makefile                        |  3 +-
> sysutils/tmux/distinfo                        |  6 +-
> sysutils/tmux/files/patch-e86752820993a0      | 54 ----------------
> ...o-fix-crash-due-to-change-to-ncurses.patch | 63 -------------------
> 4 files changed, 4 insertions(+), 122 deletions(-)
> delete mode 100644 sysutils/tmux/files/patch-e86752820993a0
> delete mode 100644 sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch
>
>diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
>index 4ae211a218d3..07ec67d8936a 100644
>--- a/sysutils/tmux/Makefile
>+++ b/sysutils/tmux/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	tmux
>-PORTVERSION=	3.3a
>-PORTREVISION=	3
>+PORTVERSION=	3.4
> CATEGORIES=	sysutils
> MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>diff --git a/sysutils/tmux/distinfo b/sysutils/tmux/distinfo
>index 37cd29fb5bdc..f204395e3039 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
>+TIMESTAMP = 1707870623
>+SHA256 (tmux-3.4.tar.gz) = 551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa
>+SIZE (tmux-3.4.tar.gz) = 707213
> SHA256 (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 4e4f791c446e3cab1a02d39a30fbfd4cec6c7e3119365860a04c9de205eaa626
> SIZE (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 8726
>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
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 277041: 248451 | 251462 | 253846 | 253975 | 254012