Resolves: #2049170 - new upstream release
This commit is contained in:
Josef Řídký
parent
ddf4299046
commit
b55a1be91b
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ screen-4.0.3.tar.gz
|
||||
/screen-4.6.2.tar.gz
|
||||
/screen-4.7.0.tar.gz
|
||||
/screen-4.8.0.tar.gz
|
||||
/screen-4.9.0.tar.gz
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
diff -urNp a/ansi.c b/ansi.c
|
||||
--- a/ansi.c 2021-02-18 07:56:55.954674224 +0100
|
||||
+++ b/ansi.c 2021-02-18 08:04:25.005929307 +0100
|
||||
@@ -692,10 +692,6 @@ register int len;
|
||||
}
|
||||
curr->w_rend.font = 0;
|
||||
}
|
||||
-# ifdef DW_CHARS
|
||||
- if (curr->w_encoding == UTF8 && utf8_isdouble(c))
|
||||
- curr->w_mbcs = 0xff;
|
||||
-# endif
|
||||
if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
|
||||
{
|
||||
int ox, oy;
|
||||
@@ -730,6 +726,10 @@ register int len;
|
||||
}
|
||||
break;
|
||||
}
|
||||
+# ifdef DW_CHARS
|
||||
+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
|
||||
+ curr->w_mbcs = 0xff;
|
||||
+# endif
|
||||
font = curr->w_rend.font;
|
||||
# endif
|
||||
# ifdef DW_CHARS
|
||||
diff -urNp a/encoding.c b/encoding.c
|
||||
--- a/encoding.c 2021-02-18 07:56:55.949674177 +0100
|
||||
+++ b/encoding.c 2021-02-18 08:02:21.187750152 +0100
|
||||
@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *
|
||||
# ifdef UTF8
|
||||
static int recode_char __P((int, int, int));
|
||||
static int recode_char_to_encoding __P((int, int));
|
||||
-static void comb_tofront __P((int, int));
|
||||
+static void comb_tofront __P((int));
|
||||
# ifdef DW_CHARS
|
||||
static int recode_char_dw __P((int, int *, int, int));
|
||||
static int recode_char_dw_to_encoding __P((int, int *, int));
|
||||
@@ -1263,6 +1263,8 @@ int c;
|
||||
{0x30000, 0x3FFFD},
|
||||
};
|
||||
|
||||
+ if (c >= 0xdf00 && c <= 0xdfff)
|
||||
+ return 1; /* dw combining sequence */
|
||||
return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
|
||||
(cjkwidth &&
|
||||
bisearch(c, ambiguous,
|
||||
@@ -1330,11 +1332,12 @@ int c;
|
||||
}
|
||||
|
||||
static void
|
||||
-comb_tofront(root, i)
|
||||
-int root, i;
|
||||
+comb_tofront(i)
|
||||
+int i;
|
||||
{
|
||||
for (;;)
|
||||
{
|
||||
+ int root = i >= 0x700 ? 0x801 : 0x800;
|
||||
debug1("bring to front: %x\n", i);
|
||||
combchars[combchars[i]->prev]->next = combchars[i]->next;
|
||||
combchars[combchars[i]->next]->prev = combchars[i]->prev;
|
||||
@@ -1396,9 +1399,9 @@ struct mchar *mc;
|
||||
{
|
||||
/* full, recycle old entry */
|
||||
if (c1 >= 0xd800 && c1 < 0xe000)
|
||||
- comb_tofront(root, c1 - 0xd800);
|
||||
+ comb_tofront(c1 - 0xd800);
|
||||
i = combchars[root]->prev;
|
||||
- if (c1 == i + 0xd800)
|
||||
+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
|
||||
{
|
||||
/* completely full, can't recycle */
|
||||
debug("utf8_handle_comp: completely full!\n");
|
||||
@@ -1422,7 +1425,7 @@ struct mchar *mc;
|
||||
mc->font = (i >> 8) + 0xd8;
|
||||
mc->fontx = 0;
|
||||
debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
|
||||
- comb_tofront(root, i);
|
||||
+ comb_tofront(i);
|
||||
}
|
||||
|
||||
#else /* !UTF8 */
|
||||
@ -1,37 +0,0 @@
|
||||
From a96e68a70e362597c2ab49d3f9a60f4586a1ae5b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <vdolezal@redhat.com>
|
||||
Date: Fri, 21 Feb 2020 13:49:08 +0100
|
||||
Subject: [PATCH] Expand d_xtermosc array in struct display
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit c5db181 expands index range of "typ2" by one without expanding
|
||||
affected arrays. d_xtermosc in struct display is one of these.
|
||||
|
||||
Related: c5db181b6e017cfccb8d7842ce140e59294d9f62
|
||||
(ansi: add support for xterm OSC 11)
|
||||
Related: 68386dfb1fa33471372a8cd2e74686758a2f527b
|
||||
(Fix out of bounds access when setting w_xtermosc after OSC 49)
|
||||
|
||||
Signed-off-by: Václav Doležal <vdolezal@redhat.com>
|
||||
---
|
||||
display.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/display.h b/display.h
|
||||
index 459cc5d..4fc2061 100644
|
||||
--- a/display.h
|
||||
+++ b/display.h
|
||||
@@ -112,7 +112,7 @@ struct display
|
||||
int d_mousetrack; /* set when user wants to use mouse even when the window
|
||||
does not */
|
||||
#ifdef RXVT_OSC
|
||||
- int d_xtermosc[4]; /* osc used */
|
||||
+ int d_xtermosc[5]; /* osc used */
|
||||
#endif
|
||||
struct mchar d_lpchar; /* missing char */
|
||||
struct timeval d_status_time; /* time of status display */
|
||||
--
|
||||
2.20.1
|
||||
|
||||
12
screen-4.9.0-braille.patch
Normal file
12
screen-4.9.0-braille.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -urNp a/braille_tsi.c b/braille_tsi.c
|
||||
--- a/braille_tsi.c 2022-03-08 13:31:31.054957126 +0100
|
||||
+++ b/braille_tsi.c 2022-03-08 13:32:02.888173116 +0100
|
||||
@@ -49,7 +49,7 @@ static int tsi_line_type; /* indicates
|
||||
|
||||
static int display_status_tsi __P((void));
|
||||
static int write_line_tsi __P((char*, int, int));
|
||||
-static void buttonpress_tsi __P((structkey2rc*));
|
||||
+static void buttonpress_tsi __P((struct key2rc*));
|
||||
static void buttonpress_navigator_40 __P((void));
|
||||
static void buttonpress_powerbraille_40 __P((void));
|
||||
static void buttonpress_powerbraille_80 __P((void));
|
||||
10
screen.spec
10
screen.spec
@ -3,8 +3,8 @@
|
||||
|
||||
Summary: A screen manager that supports multiple logins on one terminal
|
||||
Name: screen
|
||||
Version: 4.8.0
|
||||
Release: 7%{?dist}
|
||||
Version: 4.9.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/screen
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
@ -22,8 +22,7 @@ Patch2: screen-4.3.1-screenrc.patch
|
||||
Patch3: screen-E3.patch
|
||||
Patch4: screen-4.3.1-suppress_remap.patch
|
||||
Patch5: screen-4.3.1-crypt.patch
|
||||
Patch6: screen-4.8.0-expand-d_xtermosc.patch
|
||||
Patch7: screen-4.8.0-CVE-2021-26937.patch
|
||||
Patch6: screen-4.9.0-braille.patch
|
||||
|
||||
%description
|
||||
The screen utility allows you to have multiple logins on just one
|
||||
@ -117,6 +116,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Mar 08 2022 Josef Ridky <jridky@redhat.com> - 4.9.0-1
|
||||
- New upstream release 4.9.0 (#2049170)
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (screen-4.8.0.tar.gz) = 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
|
||||
SHA512 (screen-4.9.0.tar.gz) = 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
|
||||
|
||||
Loading…
Reference in New Issue
Block a user