diff --git a/backport-CVE-2022-47016.patch b/backport-CVE-2022-47016.patch deleted file mode 100644 index a98ef1847654d10b89b5d39fa387fe4249e481db..0000000000000000000000000000000000000000 --- a/backport-CVE-2022-47016.patch +++ /dev/null @@ -1,70 +0,0 @@ -From e86752820993a00e3d28350cbe46878ba95d9012 Mon Sep 17 00:00:00 2001 -From: nicm -Date: Wed, 24 Aug 2022 07:22:30 +0000 -Subject: [PATCH] Check for NULL returns from bufferevent_new. - ---- - control.c | 4 ++++ - file.c | 4 ++++ - window.c | 2 ++ - 3 files changed, 10 insertions(+) - -diff --git a/control.c b/control.c -index 73286e0..6183a00 100644 ---- a/control.c -+++ b/control.c -@@ -775,6 +775,8 @@ 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 +784,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); -diff --git a/file.c b/file.c -index b2f155f..04a907b 100644 ---- a/file.c -+++ b/file.c -@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer, - - 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 tmuxpeer *peer, - - 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; - -diff --git a/window.c b/window.c -index c0cd9bd..294a1f0 100644 ---- a/window.c -+++ b/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); --- -2.33.0 diff --git a/tmux-3.3a.tar.gz b/tmux-3.3a.tar.gz deleted file mode 100644 index c5221a1c8b3014f4ac24e8f3bab7c7ebe1410b02..0000000000000000000000000000000000000000 Binary files a/tmux-3.3a.tar.gz and /dev/null differ diff --git a/tmux-3.4.tar.gz b/tmux-3.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6c26a923f8bae08201ca599d33eca58b80d5906d Binary files /dev/null and b/tmux-3.4.tar.gz differ diff --git a/tmux.spec b/tmux.spec index 66efb5c70ba7e70e21383ade2b4fe6665970505a..f2c6afe0fce4d98420b99b6312d20ea67b47b183 100644 --- a/tmux.spec +++ b/tmux.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: tmux -Version: 3.3a -Release: 2 +Version: 3.4 +Release: 1 Summary: A terminal multiplexer License: ISC and BSD @@ -10,9 +10,7 @@ URL: https://tmux.github.io/ Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: bash_completion_tmux.sh -Patch6000: backport-CVE-2022-47016.patch - -BuildRequires: gcc libevent-devel ncurses-devel libutempter-devel +BuildRequires: gcc libevent-devel ncurses-devel libutempter-devel byacc systemd-devel %description %{name} is a terminal multiplexer. It lets you switch easily between several @@ -25,7 +23,7 @@ and reattach them to a different terminal. %autosetup %build -%configure +%configure --enable-sixel --enable-systemd --enable-utempter %make_build @@ -64,6 +62,9 @@ fi %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Feb 29 2024 wangqia - 3.4-1 +- Update to version 3.4 + * Sat Feb 04 2023 zhouwenpei - 3.3a-2 - fix CVE-2022-47016